updated include dependencies

eo/contrib/mathsym/eo_interface/eoSym.h

@@ -19,8 +19,8 @@
 #define EOSYM_H_
 
 #include <EO.h>
-#include <Sym.h>
-#include <FunDef.h>
+#include <sym/Sym.h>
+#include <fun/FunDef.h>
 
 
 template <class Fitness>

eo/contrib/mathsym/eo_interface/eoSymCrossover.cpp

@@ -21,6 +21,9 @@
 
 #include <eoSymCrossover.h>
 #include <utils/eoRNG.h>
+#include <vector>
+
+using namespace std;
 
 bool subtree_quad(Sym& a, Sym& b, NodeSelector& select) {
     NodeSelector::NodeSelection sel_a = select.select_node(a);
@@ -75,4 +78,46 @@ bool homologous_bin(Sym& a, const Sym& b) {
     return org != a;
 }
 
+void set_size_levels(Sym sym, vector<unsigned>& l, vector<unsigned>& s, unsigned level = 1) {
+    l.push_back(level);
+    s.push_back(sym.size());
+    
+    for (unsigned i = 0; i < sym.args().size(); ++i) {
+        set_size_levels(sym.args()[i], l, s, level+1);
+    }
+}
+
+
+bool size_level_xover(Sym& a, const Sym& b) {
+    
+    Sym org = a;
+        
+    vector<unsigned> levela;
+    vector<unsigned> sizesa;
+    vector<unsigned> levelb;
+    vector<unsigned> sizesb;
+
+    set_size_levels(a, levela, sizesa);
+    set_size_levels(b, levelb, sizesb);
+
+    unsigned p0;
+    unsigned p1;
+    
+    for (unsigned tries = 0;; ++tries) {
+        p0 = rng.random(a.size());
+        p1 = rng.random(b.size());
+        
+        if (tries < 5 && (sizesa[p0] != sizesb[p1] && levela[p0] != levelb[p1])) {
+            continue;   
+        }
+
+        break;
+    }
+
+    a = insert_subtree(a, p0, get_subtree(b, p1));
+
+    return org != a;
+    
+}
+
 

eo/contrib/mathsym/eo_interface/eoSymCrossover.h

@@ -60,5 +60,14 @@ class eoBinHomologousCrossover : public eoBinOp<EoType> {
 };
 
 
+extern bool size_level_xover(Sym& a, const Sym& b);
+template <class EoType>
+class eoSizeLevelCrossover : public eoBinOp<EoType> {
+    public:
+	bool operator()(EoType& a, const EoType& b) {
+	    return size_level_xover(a,b);
+	}
+};
+
 #endif
 

eo/contrib/mathsym/eo_interface/eoSymInit.h

@@ -19,7 +19,7 @@
 #define EOSYMINIT_H
 
 #include <eoInit.h>
-#include <TreeBuilder.h>
+#include <gen/TreeBuilder.h>
 
 /** Default initializer, Koza style */
 template <class EoType>

eo/contrib/mathsym/eo_interface/eoSymMutate.cpp

@@ -63,11 +63,10 @@ bool mutate_constants(Sym& sym, double stdev) {
     }
     
     for (unsigned i = 0; i < values.size(); ++i) {
-	values[i] += rng.normal() * stdev;
+	values[i] += rng.normal() * stdev / values.size();
     }
     
     sym = set_constants(sym, values);
-
     return true;
 }
 

eo/contrib/mathsym/eo_interface/eoSymMutate.h

@@ -18,8 +18,8 @@
 #ifndef SYMMUTATE_H
 #define SYMMUTATE_H
 
-#include <TreeBuilder.h>
-#include <NodeSelector.h>
+#include <gen/TreeBuilder.h>
+#include <gen/NodeSelector.h>
 
 #include <eoSym.h>
 #include <eoOp.h>