Update hyperparams and docs to insertionOp

README.md

@@ -59,11 +59,11 @@ which gives:
 ### API
 
 What follows is the API reference for running the numpy interface.
-Note that most parameters here
-have been tuned with ~1000 trials over several example
-equations, so you likely don't need to tune them yourself.
+You likely don't need to tune the hyperparameters yourself,
+but if you would like, you can use `hyperopt.py` as an example.
 However, you should adjust `threads`, `niterations`,
-`binary_operators`, `unary_operators`, and `maxsize` to your requirements.
+`binary_operators`, `unary_operators`, and `maxsize`
+to your requirements.
 
 The program will output a pandas DataFrame containing the equations,
 mean square error, and complexity. It will also dump to a csv

eureqa.jl

@@ -739,7 +739,6 @@ function fullRun(niterations::Integer;
         # Spawn threads to run indepdent evolutions, then gather them
         @inbounds Threads.@threads for i=1:nthreads
             allPops[i] = run(allPops[i], ncyclesperiteration, annealing, verbosity=verbosity)
-            topn = npop
             bestSubPops[i] = bestSubPop(allPops[i], topn=topn)
             for j=1:bestSubPops[i].n
                 bestSubPops[i].members[j].tree = simplifyTree(bestSubPops[i].members[j].tree)

eureqa.py

@@ -6,21 +6,21 @@ import numpy as np
 import pandas as pd
 
 # Dumped from hyperparam optimization
-default_alpha =                    3.861222
-default_fractionReplaced =         0.057940
-default_fractionReplacedHof =      0.206182
-default_npop =                   124.000000
-default_weightAddNode =            1.599672
-default_weightInsertNode =         1.599672
-default_weightDeleteNode =         0.049554
-default_weightMutateConstant =     5.295328
-default_weightMutateOperator =     0.465999
-default_weightRandomize =          0.184765
-default_weightSimplify =           0.149432
-default_weightDoNothing =          1.000000
-default_result =                   0.028084
-default_topn =                           10
-default_parsimony =                    1e-3
+default_alpha =                    5
+default_fractionReplaced =       0.1
+default_fractionReplacedHof =    0.1
+default_npop =                   200
+default_weightAddNode =            1
+default_weightInsertNode =         1
+default_weightDeleteNode =         1
+default_weightMutateConstant =    10
+default_weightMutateOperator =     1
+default_weightRandomize =          1
+default_weightSimplify =           1
+default_weightDoNothing =          1
+default_result =                   1
+default_topn =                    10
+default_parsimony =              0.0
 
 
 def eureqa(X=None, y=None, threads=4,
@@ -33,7 +33,7 @@ def eureqa(X=None, y=None, threads=4,
             fractionReplaced=default_fractionReplaced,
             fractionReplacedHof=default_fractionReplacedHof,
             npop=int(default_npop),
-            parsimony=1e-3,
+            parsimony=default_parsimony,
             migration=True,
             hofMigration=True,
             shouldOptimizeConstants=True,

operators.jl

@@ -1,6 +1,6 @@
 # Define allowed operators. Any julia operator can also be used.
-plus(x::Float32, y::Float32)::Float32 = x+y
-mult(x::Float32, y::Float32)::Float32 = x*y
+plus(x::Float32, y::Float32)::Float32 = x+y #Do not change the name of this operator.
+mult(x::Float32, y::Float32)::Float32 = x*y #Do not change the name of this operator.
 pow(x::Float32, y::Float32)::Float32 = sign(x)*abs(x)^y
 div(x::Float32, y::Float32)::Float32 = x/y
 loga(x::Float32)::Float32 = log(abs(x) + 1)