Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: MilesCranmer/SymbolicRegression.jl
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a7281ae0e6973a0cff61288f5c6cbba3a838b89e
Choose a base ref
..
head repository: MilesCranmer/SymbolicRegression.jl
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bda097ee6ab7144567990530c86aca58b24c94c8
Choose a head ref
Showing with 6 additions and 5 deletions.
  1. +6 −5 src/SymbolicRegression.jl
11 changes: 6 additions & 5 deletions src/SymbolicRegression.jl
Original file line number Diff line number Diff line change
@@ -714,6 +714,12 @@ function _equation_search(
end
push!(allPops[j], new_pop)
end
total_cycles = options.populations * niterations
cycles_remaining = [total_cycles for j in 1:nout]
curmaxsizes = [
get_cur_maxsize(; options, total_cycles, cycles_remaining=cycles_remaining[j]) for
j in 1:nout
]
# 2. Start the cycle on every process:
for j in 1:nout, i in 1:(options.populations)
dataset = datasets[j]
@@ -752,11 +758,6 @@ function _equation_search(

verbosity > 0 && @info "Started!"
start_time = time()
total_cycles = options.populations * niterations
cycles_remaining = [total_cycles for j in 1:nout]
curmaxsizes = [
get_cur_maxsize(; options, total_cycles, cycles_remaining[j]) for j in 1:nout
]
if progress
#TODO: need to iterate this on the max cycles remaining!
sum_cycle_remaining = sum(cycles_remaining)