Implement mass-metallicity relations

.github/workflows/CI.yml

@@ -33,7 +33,7 @@ jobs:
           - x64
         include:
           - os: macos-latest
-            arch: x64
+            arch: aarch64
             version: '1'
           - os: windows-latest
             arch: x64
@@ -85,7 +85,8 @@ jobs:
           julia --project=docs --color=yes -e '
             using Pkg
             Pkg.develop(PackageSpec(path=pwd()))
-            Pkg.instantiate()'
+            Pkg.instantiate()
+            Pkg.build()'
         env:
           PYTHON: ${{ steps.cpython3.outputs.python-path }}
       - name: Run doctests
@@ -101,5 +102,6 @@ jobs:
       - name: Make and deploy docs
         run: julia --project=docs --color=yes docs/make.jl
         env:
+          PYTHON: ${{ steps.cpython3.outputs.python-path }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}

Project.toml

@@ -1,9 +1,10 @@
 name = "StarFormationHistories"
 uuid = "774d3ad4-2d55-48fa-ab42-467705ebff24"
 authors = ["cgarling <[email protected]>"]
-version = "0.1.1"
+version = "0.2.0"
 
 [deps]
+Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 DynamicHMC = "bbc10e6e-7c05-544b-b16e-64fede858acb"
 Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
@@ -16,7 +17,9 @@ LogDensityProblems = "6fdf6af0-433a-55f7-b3ed-c6c6e0b8df7c"
 LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890"
 MCMCChains = "c7f686f2-ff18-58e9-bc7b-31028e88f75d"
 Optim = "429524aa-4258-5aef-a3af-852621145aeb"
+PDMats = "90014a1f-27ba-587c-ab20-58faa44d9150"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
 QuadGK = "1fd47b50-473d-5c70-9696-f719f8f3bcdc"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Roots = "f2b01f46-fcfa-551c-844a-d8ac1e96c665"
@@ -35,6 +38,7 @@ DataFramesExt = "DataFrames"
 TypedTablesExt = "TypedTables"
 
 [compat]
+Compat = "4.13" # for allequal(f, itr)
 DataFrames = "1"
 DelimitedFiles = "<0.0.1, 1"
 Distributions = "0.25"
@@ -51,7 +55,9 @@ LogDensityProblems = "1, 2"
 LoopVectorization = "0.12"
 MCMCChains = "6"
 Optim = "1.7" # Inverse Hessian estimate from BFGS
+PDMats = "0.11.15" # Removed StridedArray restriction
 Printf = "<0.0.1, 1"
+ProgressMeter = "1"
 QuadGK = "2"
 Random = "<0.0.1, 1"
 Roots = "2"
@@ -80,8 +86,9 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
+StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 TypedTables = "9d95f2ec-7b3d-5a63-8d20-e2491e220bb9"
 
 [targets]
-test = ["DataFrames", "DelimitedFiles", "Distributions", "Documenter", "DynamicHMC", "InitialMassFunctions", "LinearAlgebra", "MCMCChains", "QuadGK", "Random", "SafeTestsets", "StableRNGs", "StaticArrays", "Test", "TypedTables"]
+test = ["DataFrames", "DelimitedFiles", "Distributions", "Documenter", "DynamicHMC", "InitialMassFunctions", "LinearAlgebra", "MCMCChains", "QuadGK", "Random", "SafeTestsets", "StableRNGs", "StaticArrays", "StatsBase", "Test", "TypedTables"]

README.md

@@ -1,6 +1,6 @@
 # StarFormationHistories.jl
 
-[![Build Status](https://github.com/cgarling/StarFormationHistories.jl/workflows/CI/badge.svg)](https://github.com/cgarling/InitialMassFunctions.jl/actions)
+[![Build Status](https://github.com/cgarling/StarFormationHistories.jl/workflows/CI/badge.svg)](https://github.com/cgarling/StarFormationHistories.jl/actions)
 [![](https://img.shields.io/badge/docs-stable-blue.svg)](https://cgarling.github.io/StarFormationHistories.jl/stable/)
 [![](https://img.shields.io/badge/docs-dev-blue.svg)](https://cgarling.github.io/StarFormationHistories.jl/dev/)
 [![codecov](https://codecov.io/github/cgarling/StarFormationHistories.jl/graph/badge.svg?token=L69R23H29M)](https://codecov.io/github/cgarling/StarFormationHistories.jl)
@@ -33,7 +33,7 @@ Below we additionally show example templates for different combinations of stell
 
 ## SFH Fitting
 
-Once templates have been generated for a reasonable set of isochrones, they can be used to estimate the SFH of an observed population by modelling the observed Hess diagram as a linear combination of the templates. The coefficients on the linear combination are simply the desired star formation rates. While this can work, and we provide fitting methods that support this use, this approach is crude as it does not guarantee that the solution has a physically realistic age-metallicity relation (AMR). We additionally define a few parametric AMRs that apply constraints during the fitting process to alleviate this issue. We plan to expand the set of AMR models in the future.
+Once templates have been generated for a reasonable set of isochrones, they can be used to estimate the SFH of an observed population by modelling the observed Hess diagram as a linear combination of the templates. The coefficients on the linear combination are simply the desired star formation rates. While this can work, and we provide fitting methods that support this use, this approach is crude as it does not guarantee that the solution has a physically realistic age-metallicity relation (AMR). We additionally define an API for describing general AMR models as well as mass-metallicity models (MZRs) for constraining the metallicity evolution of the population. We provide a few parametric AMRs and MZRs and describe how to define custom models.
 
 ## Acknowledgements
 Support for this work was provided by the Owens Family Foundation and by NASA through grant HST-AR-17560 from the Space Telescope Science Institute, which is operated by AURA, Inc., under NASA contract NAS5-26555.

docs/Project.toml

@@ -8,6 +8,7 @@ Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
 DelimitedFiles = "1"

docs/make.jl

@@ -42,9 +42,14 @@ makedocs(
                  ["fitting/fitting_intro.md",
                   "fitting/unconstrained.md",
                   "Constrained Metallicity Evolution" => 
-                      ["fitting/linear_amr.md",
-                       "fitting/log_amr.md",
-                       "fitting/fixed_amr.md"],
+                      ["fitting/hierarchical/overview.md",
+                       "AMRs" =>
+                           ["fitting/hierarchical/linear_amr.md",
+                            "fitting/hierarchical/log_amr.md",
+                            "fitting/hierarchical/fixed_amr.md"],
+                       "MZRs" =>
+                           ["fitting/hierarchical/MZR/MZR.md"],
+                       "fitting/hierarchical/dispersion_models.md"],
                   "Internals" => ["fitting/internals.md",
                                   "fitting/kernels.md"]],
              "examples.md",