MilesCranmer commited on
Commit
258a1b4
1 Parent(s): 931a410

Consider all members of population for hall of fame

Browse files
Files changed (2) hide show
  1. eureqa.jl +8 -5
  2. eureqa.py +1 -1
eureqa.jl CHANGED
@@ -753,14 +753,17 @@ function fullRun(niterations::Integer;
753
  bestPops = deepcopy(Population([member for pop in bestSubPops for member in pop.members]))
754
 
755
  #Update hall of fame
756
- for member in bestPops.members
757
- size = countNodes(member.tree)
758
- if member.score < hallOfFame.members[size].score
759
- hallOfFame.members[size] = deepcopy(member)
760
- hallOfFame.exists[size] = true
 
 
761
  end
762
  end
763
 
 
764
  dominating = PopMember[]
765
  open(hofFile, "w") do io
766
  debug(verbosity, "Hall of Fame:")
 
753
  bestPops = deepcopy(Population([member for pop in bestSubPops for member in pop.members]))
754
 
755
  #Update hall of fame
756
+ for pop in allPops
757
+ for member in pop.members
758
+ size = countNodes(member.tree)
759
+ if member.score < hallOfFame.members[size].score
760
+ hallOfFame.members[size] = deepcopy(member)
761
+ hallOfFame.exists[size] = true
762
+ end
763
  end
764
  end
765
 
766
+ # Dominating pareto curve - must be better than all simpler equations
767
  dominating = PopMember[]
768
  open(hofFile, "w") do io
769
  debug(verbosity, "Hall of Fame:")
eureqa.py CHANGED
@@ -16,7 +16,7 @@ default_weightDeleteNode = 1
16
  default_weightMutateConstant = 10
17
  default_weightMutateOperator = 1
18
  default_weightRandomize = 1
19
- default_weightSimplify = 0.1
20
  default_weightDoNothing = 1
21
  default_result = 1
22
  default_topn = 10
 
16
  default_weightMutateConstant = 10
17
  default_weightMutateOperator = 1
18
  default_weightRandomize = 1
19
+ default_weightSimplify = 1
20
  default_weightDoNothing = 1
21
  default_result = 1
22
  default_topn = 10