MilesCranmer commited on
Commit
d3f2b30
1 Parent(s): 77fefbc

Speed back up by only looking at subpops

Browse files
Files changed (2) hide show
  1. benchmarktimes.txt +1 -0
  2. paralleleureqa.jl +5 -7
benchmarktimes.txt CHANGED
@@ -2,3 +2,4 @@ The median time is TrialEstimate(3.136 s)
2
  The median time is TrialEstimate(435.125 ms)
3
  The median time is TrialEstimate(422.519 ms) with annealing, TrialEstimate(361.631 ms) without
4
  The median time is TrialEstimate(985.015 ms) with annealing, TrialEstimate(857.946 ms) without
 
 
2
  The median time is TrialEstimate(435.125 ms)
3
  The median time is TrialEstimate(422.519 ms) with annealing, TrialEstimate(361.631 ms) without
4
  The median time is TrialEstimate(985.015 ms) with annealing, TrialEstimate(857.946 ms) without
5
+ The median time is TrialEstimate(690.542 ms) with annealing, TrialEstimate(581.777 ms) without
paralleleureqa.jl CHANGED
@@ -40,13 +40,11 @@ function fullRun(niterations::Integer;
40
  bestPops = deepcopy(Population([member for pop in allPops for member in bestSubPop(pop).members]))
41
 
42
  #Update hall of fame
43
- for pop in allPops
44
- for member in pop.members
45
- size = countNodes(member.tree)
46
- if member.score < hallOfFame.members[size].score
47
- hallOfFame.members[size] = deepcopy(member)
48
- hallOfFame.exists[size] = true
49
- end
50
  end
51
  end
52
 
 
40
  bestPops = deepcopy(Population([member for pop in allPops for member in bestSubPop(pop).members]))
41
 
42
  #Update hall of fame
43
+ for member in bestPops.members
44
+ size = countNodes(member.tree)
45
+ if member.score < hallOfFame.members[size].score
46
+ hallOfFame.members[size] = deepcopy(member)
47
+ hallOfFame.exists[size] = true
 
 
48
  end
49
  end
50