Merge 622c1b9 into 3565353

MilesCranmer · Jul 28, 2023 · 55a8910 · 55a8910
2 parents 3565353 + 622c1b9
commit 55a8910
Show file tree

Hide file tree

Showing 6 changed files with 351 additions and 41 deletions.
diff --git a/docs/gen_param_docs.py b/docs/gen_param_docs.py
@@ -53,7 +53,7 @@ def str_param_groups(param_groupings, params, cur_heading=2):
 if __name__ == "__main__":
     # This is the path to the param_groupings.yml file
     # relative to the current file.
-    path = "param_groupings.yml"
+    path = "../pysr/param_groupings.yml"
     with open(path, "r") as f:
         param_groupings = safe_load(f)
 

diff --git a/pysr/julia_helpers.py b/pysr/julia_helpers.py
@@ -259,15 +259,15 @@ def init_julia(julia_project=None, quiet=False, julia_kwargs=None, return_aux=Fa
 
 def _add_sr_to_julia_project(Main, io_arg):
     Main.eval("using Pkg")
+    Main.eval("Pkg.Registry.update()")
     Main.sr_spec = Main.PackageSpec(
         name="SymbolicRegression",
         url="https://github.com/MilesCranmer/SymbolicRegression.jl",
         rev="v" + __symbolic_regression_jl_version__,
     )
     Main.clustermanagers_spec = Main.PackageSpec(
         name="ClusterManagers",
-        url="https://github.com/JuliaParallel/ClusterManagers.jl",
-        rev="14e7302f068794099344d5d93f71979aaf4fbeb3",
+        version="0.4",
     )
     Main.eval(f"Pkg.add([sr_spec, clustermanagers_spec], {io_arg})")
 

diff --git a/docs/param_groupings.yml → pysr/param_groupings.yml b/docs/param_groupings.yml → pysr/param_groupings.yml
@@ -13,6 +13,7 @@
     - loss
     - full_objective
     - model_selection
+    - dimensional_constraint_penalty
   - Working with Complexities:
     - parsimony
     - constraints
@@ -72,12 +73,14 @@
   - fast_cycle
   - turbo
   - enable_autodiff
+- Determinism:
   - random_state
   - deterministic
   - warm_start
 - Monitoring:
   - verbosity
   - update_verbosity
+  - print_precision
   - progress
 - Environment:
   - temp_equation_file