pyclasset added

Author: peter-ch

setup.py

@@ -58,7 +58,7 @@ def getExtensions():
 
     extra = ['-march=native',
              '-mtune=native',
-             '-g'
+             '-g',
              ]
 
     if platform == 'darwin':
@@ -121,14 +121,17 @@ def getExtensions():
         #            'libboost_serialization-mgw48-mt-1_58'],
         # include_dirs = ['C:/MinGW/include', 'C:/Users/Peter/Desktop/boost_1_58_0'],
         # library_dirs = ['C:/MinGW/lib', 'C:/Users/Peter/Desktop/boost_1_58_0/stage/lib'],
-        extra.extend(['-DUSE_BOOST_PYTHON', '-DUSE_BOOST_RANDOM',
+        extra.extend(['-DUSE_BOOST_PYTHON', '-DUSE_BOOST_RANDOM', #'-O0',
                       #'-DVDEBUG',
                       ])
-        extensionsList.append(Extension('MultiNEAT._MultiNEAT',
-                                        sources,
-                                        libraries=libs,
-                                        extra_compile_args=extra)
-                              )
+        exx = Extension('MultiNEAT._MultiNEAT',
+                        sources,
+                        libraries=libs,
+                        extra_compile_args=extra)
+        print(dir(exx))
+        print(exx)
+        print(exx.extra_compile_args)
+        extensionsList.append(exx)
     else:
         raise AttributeError('Unknown tool: {}'.format(build_sys))
 

src/Genes.h

@@ -173,6 +173,33 @@ namespace NEAT
                     py::object itp = bs::get<py::object>(it->second.m_Details);
                     t = itp(); // details is a function that returns a random instance of the trait
                 }
+
+                if (it->second.type == "pyclassset")
+                {
+                    // this time m_Details is a (list, probs) tuple
+                    // the list is a list of classes that get instantiated
+                    py::object tup = bs::get<py::object>(it->second.m_Details);
+                    py::list classlist = py::extract<py::list>(tup[0]);
+                    py::list probs = py::extract<py::list>(tup[1]);
+                    std::vector<double> dprobs;
+
+                    // get the probs
+                    int ln = py::len(probs);
+                    if ((ln == 0) || (py::len(classlist) == 0))
+                    {
+                        throw std::runtime_error("Empty class or probs list");
+                    }
+
+                    for(int i=0; i<ln; i++)
+                    {
+                        dprobs.push_back(py::extract<double>(probs[i]));
+                    }
+
+                    // instantiate random class
+                    int idx = a_RNG.Roulette(dprobs);
+                    py::object itp = py::extract<py::object>(classlist[idx]);
+                    t = itp();
+                }
 #endif
 
                 Trait tr;
@@ -399,7 +426,7 @@ namespace NEAT
                             did_mutate = true;
                         }
 #ifdef USE_BOOST_PYTHON
-                        else if (it->second.type == "pyobject")
+                        else if ((it->second.type == "pyobject") || (it->second.type == "pyclassset"))
                         {
                             m_Traits[it->first].value = bs::get<py::object>(m_Traits[it->first].value).attr("mutate")();
                             did_mutate = true;
@@ -562,7 +589,11 @@ namespace NEAT
         ////////////////
         LinkGene()
         {
-
+            m_FromNeuronID = 0;
+            m_ToNeuronID = 0;
+            m_InnovationID = 0;
+            m_Weight = 0;
+            m_IsRecurrent = false;
         }
 
         LinkGene(int a_InID, int a_OutID, int a_InnovID, double a_Wgt, bool a_Recurrent = false)

src/Genome.cpp

@@ -129,6 +129,7 @@ namespace NEAT
     }
 
     // New constructor that creates a fully-connected CTRNN
+    /*
     Genome::Genome(int a_ID,
                    int a_NumInputs,
                    int a_NumHidden, // ignored for seed type == 0, specifies number of hidden units if seed type == 1
@@ -242,13 +243,14 @@ namespace NEAT
         
         m_initial_num_neurons = NumNeurons();
         m_initial_num_links = NumLinks();
-    }
+    }*/
 
     Genome::Genome(int a_ID,
                    int a_NumInputs,
                    int a_NumHidden, // ignored for seed_type == 0, specifies number of hidden units if seed_type == 1
                    int a_NumOutputs,
-                   bool a_FS_NEAT, ActivationFunction a_OutputActType,
+                   bool a_FS_NEAT,
+                   ActivationFunction a_OutputActType,
                    ActivationFunction a_HiddenActType,
                    int a_SeedType,
                    const Parameters &a_Parameters,
@@ -506,6 +508,11 @@ namespace NEAT
                 }
             }
         }
+
+        if (a_FS_NEAT && (a_FS_NEAT_links==1))
+        {
+            throw std::runtime_error("Known bug - don't use FS-NEAT with just 1 link and 1/1/1 genome");
+        }
 
         // Also initialize the Genome's traits
         m_GenomeGene.InitTraits(a_Parameters.GenomeTraits, t_RNG);

src/Genome.h

@@ -186,8 +186,8 @@ namespace NEAT
         Genome(std::ifstream &a_DataFile);
 
         // This creates a CTRNN fully-connected genome
-        Genome(int a_ID, int a_NumInputs, int a_NumHidden, int a_NumOutputs,
-               ActivationFunction a_OutputActType, ActivationFunction a_HiddenActType, const Parameters &a_Parameters);
+        //Genome(int a_ID, int a_NumInputs, int a_NumHidden, int a_NumOutputs,
+         //      ActivationFunction a_OutputActType, ActivationFunction a_HiddenActType, const Parameters &a_Parameters);
 
         // This creates a standart minimal genome - perceptron-like structure
         Genome(int a_ID,

src/Parameters.h

@@ -654,6 +654,11 @@ class Parameters
             py::object itp = py::extract<py::object>(trait_params["details"]);
             t.m_Details = itp;
         }
+        else if (t.type == "pyclassset")
+        {
+            py::object itp = py::extract<py::object>(trait_params["details"]);
+            t.m_Details = itp;
+        }
 
         return t;
     }
@@ -740,6 +745,11 @@ class Parameters
             t["type"] = "pyobject";
             dt = bs::get<py::object>(pms.m_Details);
         }
+        if (pms.type == "pyclassset")
+        {
+            t["type"] = "pyclassset";
+            dt = bs::get<py::object>(pms.m_Details);
+        }
 
         t["details"] = dt;
 

src/PythonBindings.cpp

@@ -250,10 +250,6 @@ BOOST_PYTHON_MODULE(_MultiNEAT)
     class_<Genome, Genome*>("Genome", init<>())
 
             .def(init<char*>())
-            .def(init<unsigned int, unsigned int, unsigned int, unsigned int,
-                    ActivationFunction, ActivationFunction, Parameters>())
-            //.def(init<unsigned int, unsigned int, unsigned int, unsigned int,
-            //        bool, ActivationFunction, ActivationFunction, int, Parameters, unsigned int>())
             .def(init<unsigned int, unsigned int, unsigned int, unsigned int,
                     bool, ActivationFunction, ActivationFunction, int, Parameters, unsigned int, unsigned int>())
 

src/Traits.h

@@ -183,7 +183,6 @@ namespace NEAT
         }
     };
 
-
     class TraitParameters
     {
     public: