Removed the dependency of boost::random. Now Boost is not needed to u…

…se the library.
peter-ch · Oct 1, 2014 · a74a8a8 · a74a8a8
1 parent 0f451d4
commit a74a8a8
Show file tree

Hide file tree

Showing 29 changed files with 131 additions and 79 deletions.
diff --git a/DEPENDS b/DEPENDS
@@ -1,8 +1,9 @@
-* Boost 1.49 and above with Boost.Python and Boost.Serialization 
-* Python 2.7 (with headers and libs)
-* ProgressBar (Python package)
-* NumPy (Python package)
-* Matplotlib (Python package)
-* OpenCV 2.3 and above (with Python bindings)
+* Boost 1.49 and above with Boost.Python and Boost.Serialization (optional)
+* Python 2.7 (with headers and libs) (optional)
+* ProgressBar (Python package) (optional)
+* NumPy (Python package) (optional)
+* Matplotlib (Python package) (optional)
+* OpenCV 2.3 and above (with Python bindings) (optional)
+* Cython (if you want Python bindings)
 
 
diff --git a/MultiNEAT.project b/MultiNEAT.project
@@ -29,31 +29,31 @@
   <Description/>
   <Dependencies/>
   <VirtualDirectory Name="src">
-    <File Name="lib/Assert.h"/>
-    <File Name="lib/Genes.h"/>
-    <File Name="lib/Genome.cpp"/>
-    <File Name="lib/Genome.h"/>
-    <File Name="lib/Innovation.cpp"/>
-    <File Name="lib/Innovation.h"/>
-    <File Name="lib/Main.cpp"/>
-    <File Name="lib/NeuralNetwork.cpp"/>
-    <File Name="lib/NeuralNetwork.h"/>
-    <File Name="lib/Parameters.cpp"/>
-    <File Name="lib/Parameters.h"/>
-    <File Name="lib/PhenotypeBehavior.cpp"/>
-    <File Name="lib/PhenotypeBehavior.h"/>
-    <File Name="lib/Population.cpp"/>
-    <File Name="lib/Population.h"/>
-    <File Name="lib/PythonBindings.cpp"/>
-    <File Name="lib/PythonBindings.h"/>
-    <File Name="lib/Random.cpp"/>
-    <File Name="lib/Random.h"/>
-    <File Name="lib/Species.cpp"/>
-    <File Name="lib/Species.h"/>
-    <File Name="lib/Substrate.cpp"/>
-    <File Name="lib/Substrate.h"/>
-    <File Name="lib/Utils.cpp"/>
-    <File Name="lib/Utils.h"/>
+    <File Name="src/Assert.h"/>
+    <File Name="src/Genes.h"/>
+    <File Name="src/Genome.cpp"/>
+    <File Name="src/Genome.h"/>
+    <File Name="src/Innovation.cpp"/>
+    <File Name="src/Innovation.h"/>
+    <File Name="src/Main.cpp"/>
+    <File Name="src/NeuralNetwork.cpp"/>
+    <File Name="src/NeuralNetwork.h"/>
+    <File Name="src/Parameters.cpp"/>
+    <File Name="src/Parameters.h"/>
+    <File Name="src/PhenotypeBehavior.cpp"/>
+    <File Name="src/PhenotypeBehavior.h"/>
+    <File Name="src/Population.cpp"/>
+    <File Name="src/Population.h"/>
+    <File Name="src/PythonBindings.cpp"/>
+    <File Name="src/PythonBindings.h"/>
+    <File Name="src/Random.cpp"/>
+    <File Name="src/Random.h"/>
+    <File Name="src/Species.cpp"/>
+    <File Name="src/Species.h"/>
+    <File Name="src/Substrate.cpp"/>
+    <File Name="src/Substrate.h"/>
+    <File Name="src/Utils.cpp"/>
+    <File Name="src/Utils.h"/>
   </VirtualDirectory>
   <Settings Type="Executable">
     <GlobalSettings>

diff --git a/MultiNEAT.workspace b/MultiNEAT.workspace
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CodeLite_Workspace Name="MultiNEAT" Database="">
+  <Project Name="MultiNEAT" Path="MultiNEAT.project" Active="Yes"/>
+  <BuildMatrix>
+    <WorkspaceConfiguration Name="Debug" Selected="yes">
+      <Project Name="MultiNEAT" ConfigName="Debug"/>
+    </WorkspaceConfiguration>
+    <WorkspaceConfiguration Name="Release" Selected="no">
+      <Project Name="MultiNEAT" ConfigName="Release"/>
+    </WorkspaceConfiguration>
+  </BuildMatrix>
+</CodeLite_Workspace>
diff --git a/setup.py b/setup.py
@@ -5,18 +5,18 @@
 setup(name='MultiNEAT',
       version='0.1',
       py_modules=['MultiNEAT'],
-      ext_modules=[Extension('_MultiNEAT', ['lib/Genome.cpp',
-                                            'lib/Innovation.cpp',
-                                            'lib/NeuralNetwork.cpp',
-                                            'lib/Parameters.cpp',
-                                            'lib/PhenotypeBehavior.cpp',
-                                            'lib/Population.cpp',
-                                            'lib/PythonBindings.cpp',
-                                            'lib/Random.cpp',
-                                            'lib/Species.cpp',
-                                            'lib/Substrate.cpp',
-                                            'lib/Utils.cpp'],
+      ext_modules=[Extension('_MultiNEAT', ['src/Genome.cpp',
+                                            'src/Innovation.cpp',
+                                            'src/NeuralNetwork.cpp',
+                                            'src/Parameters.cpp',
+                                            'src/PhenotypeBehavior.cpp',
+                                            'src/Population.cpp',
+                                            'src/PythonBindings.cpp',
+                                            'src/Random.cpp',
+                                            'src/Species.cpp',
+                                            'src/Substrate.cpp',
+                                            'src/Utils.cpp'],
                              libraries=['boost_python',
-                                        'boost_serialization'], 
+                                        'boost_serialization'],
                              extra_compile_args=['-O3', '-march=native'])
                    ])
diff --git a/lib/Assert.h → src/Assert.h b/lib/Assert.h → src/Assert.h
diff --git a/lib/Genes.h → src/Genes.h b/lib/Genes.h → src/Genes.h
diff --git a/lib/Genome.cpp → src/Genome.cpp b/lib/Genome.cpp → src/Genome.cpp
diff --git a/lib/Genome.h → src/Genome.h b/lib/Genome.h → src/Genome.h
diff --git a/lib/Innovation.cpp → src/Innovation.cpp b/lib/Innovation.cpp → src/Innovation.cpp
diff --git a/lib/Innovation.h → src/Innovation.h b/lib/Innovation.h → src/Innovation.h
diff --git a/lib/Main.cpp → src/Main.cpp b/lib/Main.cpp → src/Main.cpp
@@ -18,6 +18,9 @@ double test(Genome& g)
 
 int main()
 {
+    srand(time(0));
+    std::cout << (double)(rand() % 10000000) / 10000000.0 << "\n";
+    /*
 	Parameters params;
 	params.PopulationSize = 1000;
 	RNG rng;
@@ -41,6 +44,7 @@ int main()
         pop.Tick(g);
     }
 	//pop.Epoch();
+     */
 
     /*for(int i=0; i < pop.m_Species.size(); i++)
         for(int j=0; j < pop.m_Species[i].m_Individuals.size(); j++)

diff --git a/lib/NeuralNetwork.cpp → src/NeuralNetwork.cpp b/lib/NeuralNetwork.cpp → src/NeuralNetwork.cpp
diff --git a/lib/NeuralNetwork.h → src/NeuralNetwork.h b/lib/NeuralNetwork.h → src/NeuralNetwork.h
diff --git a/lib/Parameters.cpp → src/Parameters.cpp b/lib/Parameters.cpp → src/Parameters.cpp
diff --git a/lib/Parameters.h → src/Parameters.h b/lib/Parameters.h → src/Parameters.h
diff --git a/lib/PhenotypeBehavior.cpp → src/PhenotypeBehavior.cpp b/lib/PhenotypeBehavior.cpp → src/PhenotypeBehavior.cpp
diff --git a/lib/PhenotypeBehavior.h → src/PhenotypeBehavior.h b/lib/PhenotypeBehavior.h → src/PhenotypeBehavior.h
diff --git a/lib/Population.cpp → src/Population.cpp b/lib/Population.cpp → src/Population.cpp
diff --git a/lib/Population.h → src/Population.h b/lib/Population.h → src/Population.h
diff --git a/lib/PythonBindings.cpp → src/PythonBindings.cpp b/lib/PythonBindings.cpp → src/PythonBindings.cpp
diff --git a/lib/PythonBindings.h → src/PythonBindings.h b/lib/PythonBindings.h → src/PythonBindings.h
diff --git a/lib/Random.cpp → src/Random.cpp b/lib/Random.cpp → src/Random.cpp
@@ -41,84 +41,127 @@ namespace NEAT
 // Seeds the random number generator with this value
 void RNG::Seed(int a_Seed)
 {
+#ifdef USE_BOOST_RANDOM
     gen.seed(a_Seed);
+#else
+    srand(a_Seed);
+#endif
 }
 
 void RNG::TimeSeed()
 {
-    gen.seed(time(0));
+    Seed(time(0));
 }
 
 // Returns randomly either 1 or -1
 int RNG::RandPosNeg()
 {
 #ifdef USE_BOOST_RANDOM
     boost::random::uniform_int_distribution<> dist(0, 1);
-#elif USE_CPP11_RANDOM
-    std::uniform_int_distribution<int> dist(0,1);
-#endif
     int choice = dist(gen);
+#else
+    int choice = rand() % 2;
+#endif
     if (choice == 0)
         return -1;
     else
         return 1;
 }
 
 // Returns a random integer between X and Y
-// in case of ( 0 .. 1 ) returns 0
 int RNG::RandInt(int aX, int aY)
 {
 #ifdef USE_BOOST_RANDOM
     boost::random::uniform_int_distribution<> dist(aX, aY);
-#elif USE_CPP11_RANDOM
-    std::uniform_int_distribution<int> dist(0,1);
-#endif
     return dist(gen);
+#else
+    return aX + (rand() % (aY - aX + 1));
+#endif
+
 }
 
 // Returns a random number from a uniform distribution in the range of [0 .. 1]
 double RNG::RandFloat()
 {
 #ifdef USE_BOOST_RANDOM
     boost::random::uniform_01<> dist;
-#elif USE_CPP11_RANDOM
-    std::uniform_real_distribution<double> dist(0.0, 1.0);
-#endif
     return dist(gen);
+#else 
+    return (double)(rand() % 10000000) / 10000000.0;
+#endif
 }
 
 // Returns a random number from a uniform distribution in the range of [-1 .. 1]
 double RNG::RandFloatClamped()
 {
-#ifdef USE_BOOST_RANDOM
     return (RandFloat() - RandFloat());
-#elif USE_CPP11_RANDOM
-    std::uniform_real_distribution<double> dist(-1.0, 1.0);
-    return dist(gen);
-#endif
 }
 
 // Returns a random number from a gaussian (normal) distribution in the range of [-1 .. 1]
 double RNG::RandGaussClamped()
 {
 #ifdef USE_BOOST_RANDOM
     boost::random::normal_distribution<> dist;
-#elif USE_CPP11_RANDOM
-    std::normal_distribution<double> dist(0.0, 1.0);
-#endif
     double pick = dist(gen);
     Clamp(pick, -1, 1);
     return pick;
+#else 
+    static int t_iset=0;
+    static double t_gset;
+    double t_fac,t_rsq,t_v1,t_v2;
+
+    if (t_iset==0)
+    {
+        do
+        {
+            t_v1=2.0f*(RandFloat())-1.0f;
+            t_v2=2.0f*(RandFloat())-1.0f;
+            t_rsq=t_v1*t_v1+t_v2*t_v2;
+        }
+        while (t_rsq>=1.0f || t_rsq==0.0f);
+
+        t_fac=sqrt(-2.0f*log(t_rsq)/t_rsq);
+        t_gset=t_v1*t_fac;
+        t_iset=1;
+
+        double t_tmp = t_v2*t_fac;
+
+        Clamp(t_tmp, -1.0, 1.0);
+        return t_tmp;
+    }
+    else
+    {
+        t_iset=0;
+        double t_tmp = t_gset;
+        Clamp(t_tmp, -1.0, 1.0);
+        return t_tmp;
+    }
+#endif
 }
 
 int RNG::Roulette(std::vector<double>& a_probs)
 {
 #ifdef USE_BOOST_RANDOM
     boost::random::discrete_distribution<> d_dist(a_probs);
-#elif USE_CPP11_RANDOM
-    std::discrete_distribution<int> dist(a_probs);
-#endif
     return d_dist(gen);
+#else
+    double t_marble = 0, t_spin = 0, t_total_score = 0;
+    for(unsigned int i=0; i<a_probs.size(); i++)
+    {
+        t_total_score += a_probs[i];
+    }
+    t_marble = RandFloat() * t_total_score;
+
+    int t_chosen = 0;
+    t_spin = a_probs[t_chosen];
+    while(t_spin < t_marble)
+    {
+        t_chosen++;
+        t_spin += a_probs[t_chosen];
+    }
+
+    return t_chosen;
+#endif
 }
 
 

diff --git a/lib/Random.h → src/Random.h b/lib/Random.h → src/Random.h
@@ -30,31 +30,23 @@
 // Description: Declarations for a class dealing with random numbers.
 ///////////////////////////////////////////////////////////////////////////////
 
-#define USE_BOOST_RANDOM
 #ifdef USE_BOOST_RANDOM
-
-#include <boost/random.hpp>
-
-#elif USE_CPP11_RANDOM
-
-#include <random>
-
+    #include <boost/random.hpp>
+#else
+    #include <stdlib.h>
 #endif
 
+#include <vector>
+#include <limits>
+
 namespace NEAT
 {
 
 class RNG
 {
 
 #ifdef USE_BOOST_RANDOM
-
     boost::random::mt19937 gen;
-
-#elif USE_CPP11_RANDOM
-
-    std::default_random_engine gen;
-
 #endif
 
 public:

diff --git a/lib/Species.cpp → src/Species.cpp b/lib/Species.cpp → src/Species.cpp
diff --git a/lib/Species.h → src/Species.h b/lib/Species.h → src/Species.h
diff --git a/lib/Substrate.cpp → src/Substrate.cpp b/lib/Substrate.cpp → src/Substrate.cpp
diff --git a/lib/Substrate.h → src/Substrate.h b/lib/Substrate.h → src/Substrate.h
diff --git a/lib/Utils.cpp → src/Utils.cpp b/lib/Utils.cpp → src/Utils.cpp
diff --git a/lib/Utils.h → src/Utils.h b/lib/Utils.h → src/Utils.h