MilesCranmer commited on
Commit
44cbe0b
·
1 Parent(s): 3ce75fd

Fix number of iterations

Browse files
Files changed (3) hide show
  1. README.md +0 -1
  2. julia/sr.jl +2 -2
  3. setup.py +1 -1
README.md CHANGED
@@ -233,7 +233,6 @@ pd.DataFrame, Results dataframe, giving complexity, MSE, and equations
233
  # TODO
234
 
235
  - [x] Async threading, and have a server of equations. So that threads aren't waiting for others to finish.
236
- - This is a huge bottleneck right now.
237
  - [x] Print out speed of equation evaluation over time. Measure time it takes per cycle
238
  - [x] Add ability to pass an operator as an anonymous function string. E.g., `binary_operators=["g(x, y) = x+y"]`.
239
  - [x] Add error bar capability (thanks Johannes Buchner for suggestion)
 
233
  # TODO
234
 
235
  - [x] Async threading, and have a server of equations. So that threads aren't waiting for others to finish.
 
236
  - [x] Print out speed of equation evaluation over time. Measure time it takes per cycle
237
  - [x] Add ability to pass an operator as an anonymous function string. E.g., `binary_operators=["g(x, y) = x+y"]`.
238
  - [x] Add error bar capability (thanks Johannes Buchner for suggestion)
julia/sr.jl CHANGED
@@ -761,7 +761,7 @@ function fullRun(niterations::Integer;
761
  allPops[i] = @spawnat :any run(fetch(allPops[i]), ncyclesperiteration, verbosity=verbosity)
762
  end
763
  println("Started!")
764
- cycles_complete = nprocs * 10
765
 
766
  last_print_time = time()
767
  num_equations = 0.0
@@ -845,7 +845,7 @@ function fullRun(niterations::Integer;
845
  if elapsed > print_every_n_seconds
846
  # Dominating pareto curve - must be better than all simpler equations
847
  debug(verbosity, "\n")
848
- debug(verbosity, "Cycles per second: $(num_equations/elapsed)")
849
  debug(verbosity, "Hall of Fame:")
850
  debug(verbosity, "-----------------------------------------")
851
  debug(verbosity, "Complexity \t MSE \t Equation")
 
761
  allPops[i] = @spawnat :any run(fetch(allPops[i]), ncyclesperiteration, verbosity=verbosity)
762
  end
763
  println("Started!")
764
+ cycles_complete = nprocs * niterations
765
 
766
  last_print_time = time()
767
  num_equations = 0.0
 
845
  if elapsed > print_every_n_seconds
846
  # Dominating pareto curve - must be better than all simpler equations
847
  debug(verbosity, "\n")
848
+ debug(verbosity, "Cycles per second: $(round(num_equations/elapsed, sigdigits=3))")
849
  debug(verbosity, "Hall of Fame:")
850
  debug(verbosity, "-----------------------------------------")
851
  debug(verbosity, "Complexity \t MSE \t Equation")
setup.py CHANGED
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
5
 
6
  setuptools.setup(
7
  name="pysr", # Replace with your own username
8
- version="0.3.2",
9
  author="Miles Cranmer",
10
  author_email="[email protected]",
11
  description="Simple and efficient symbolic regression",
 
5
 
6
  setuptools.setup(
7
  name="pysr", # Replace with your own username
8
+ version="0.3.3",
9
  author="Miles Cranmer",
10
  author_email="[email protected]",
11
  description="Simple and efficient symbolic regression",