preparing for version 0.2

Author: headmyshoulder

CMakeLists.txt

@@ -60,6 +60,6 @@ else ()
     message ( STATUS "Google C++ Testing Framework not found in \"${GTEST_ROOT}\" tests will be disabled !" )
   endif ()
 
-  message ( STATUS "    get googlemock/googletest by: svn checkout http://googlemock.googlecode.com/svn/tags/release-1.7.0/ \"${THIRDPARTY_ROOT}/gmock\"" )
+  message ( STATUS "get googlemock/googletest by: svn checkout http://googlemock.googlecode.com/svn/tags/release-1.7.0/ \"${THIRDPARTY_ROOT}/gmock\"" )
 
 endif ()

doc/tutorial_artificial_ant.qbk

@@ -1,8 +1,7 @@
 [section Artificial ant]
 [import ../examples/artificial_ant/nodes.hpp]
 [import ../examples/artificial_ant/simulation.hpp]
-[import ../examples/artificial_ant/main.cpp]
-[import ../examples/artificial_ant/detail/artificial_ant_tests.cpp]
+[import ../examples/artificial_ant/artificial_ant.cpp]
 [import ../examples/artificial_ant/board.hpp]
 [import ../examples/artificial_ant/santa_fe_trail.hpp]
 

examples/CMakeLists.txt

@@ -1,5 +1,5 @@
 # Date: 2013-01-25
 # Author: Karsten Ahnert ([email protected])
 
-#add_subdirectory ( symb_reg )
+add_subdirectory ( symb_reg )
 add_subdirectory ( artificial_ant )

examples/artificial_ant/CMakeLists.txt

@@ -1,5 +1,6 @@
 # Date: 2014-07-18
 # Author: Gerard Choinka ([email protected])
 
-add_executable ( artificial_ant main.cpp )
-add_subdirectory ( detail )
+add_executable ( artificial_ant artificial_ant.cpp )
+
+# add_subdirectory ( detail )

examples/artificial_ant/main.cpp …amples/artificial_ant/artificial_ant.cppexamples/artificial_ant/main.cpp renamed to examples/artificial_ant/artificial_ant.cpp examples/artificial_ant/main.cpp renamed to examples/artificial_ant/artificial_ant.cpp

@@ -29,13 +29,26 @@
 #include <chrono>
 
 
-template<typename T>
-std::string tree_to_string(T const & t)
+
+
+//[ant_move_test
+bool ant_move_test()
 {
-    std::ostringstream  oss;
-    oss << gpcxx::simple(t) ;
-    return oss.str();
-}
+    size_t const board_size_x { 32 };
+    size_t const board_size_y { 32 };
+    ant_example::board  const the_board { board_size_x , board_size_y };
+    ant_example::ant an_ant { the_board.pos_2d_to_1d( { 0, 0 } ), ant_example::east };
+    
+    
+    an_ant.move(the_board);
+    
+    bool position_is_valid      = an_ant.pos() == the_board.pos_2d_to_1d( { 1, 0 } );
+    bool step_count_is_valid    = an_ant.steps_done() == 1;
+    
+    
+    return position_is_valid && step_count_is_valid ;
+} 
+//]
 
 
 int main( int argc , char *argv[] )
@@ -100,20 +113,6 @@ int main( int argc , char *argv[] )
         init_tree_generator( individum );
     //]
 
-   /*
-    auto tree_hasher = [](tree_type const & t){ return std::hash<std::string>{}(tree_to_string(t));};
-
-    
-    std::unordered_set<std::size_t> test ;
-    
-    for(tree_type const t : population)
-    {
-        test.insert(tree_hasher(t));
-        std::cout << tree_hasher(t) << "\t" << tree_to_string(t) << std::endl;
-    }
-    std::cout << test.size() << std::endl;
-    if(true) return 1;
-    */
      //[evolver_definition
     using evolver_type = gpcxx::static_pipeline< population_type , fitness_type , rng_type > ;
     evolver_type evolver( number_elite , mutation_rate , crossover_rate , reproduction_rate , rng );
@@ -171,7 +170,6 @@ int main( int argc , char *argv[] )
     auto fittest_individual_position = std::distance( fitness.begin(), std::min_element( fitness.begin(), fitness.end() ) ); 
     tree_type const & fittest_individual = population[fittest_individual_position];
 
-//     std::cout << std::hash<std::string>{}(tree_to_string(fittest_individual)) << std::endl;
     // cat artificial_ant_fittest_individual.dot | dot -Tsvg | display -
     std::ofstream("artificial_ant_fittest_individual.dot") << gpcxx::graphviz( fittest_individual , false );
 

examples/artificial_ant/detail/artificial_ant_tests.cpp

@@ -18,24 +18,7 @@
 
 char const newl = '\n';
 
-//[ant_move_test
-bool ant_move_test()
-{
-    size_t const board_size_x { 32 };
-    size_t const board_size_y { 32 };
-    ant_example::board  const the_board { board_size_x , board_size_y };
-    ant_example::ant an_ant { the_board.pos_2d_to_1d( { 0, 0 } ), ant_example::east };
-    
-    
-    an_ant.move(the_board);
-    
-    bool position_is_valid      = an_ant.pos() == the_board.pos_2d_to_1d( { 1, 0 } );
-    bool step_count_is_valid    = an_ant.steps_done() == 1;
-    
-    
-    return position_is_valid && step_count_is_valid ;
-} 
-//]
+
 
 void  paper_tree()
 {

examples/symb_reg/symb_reg.cpp

@@ -59,7 +59,8 @@ int main( int argc , char *argv[] )
 {
     //[ create_training_data
     using rng_type = std::mt19937;
-    rng_type rng;    
+    rng_type rng;
+    
     gpcxx::regression_training_data< double , 3 > c;
     gpcxx::generate_regression_test_data( c , 1024 , rng , []( double x1 , double x2 , double x3 )
             { return  x1 * x1 * x1 + 1.0 / 10.0 * x2 * x2 - 3.0 / 4.0 * x3 + 1.0 ; } );
@@ -129,7 +130,6 @@ int main( int argc , char *argv[] )
 
     fitness_type fitness( population_size , 0.0 );
     population_type population( population_size );
-    rng_type rng;
     //]
 
     //[ define_evolution

include/gpcxx/config_version.hpp

@@ -14,7 +14,7 @@
 
 #define GPCXX_VERSION_MAJOR 0
 #define GPCXX_VERSION_MINOR 1
-#define GPCXX_VERSION_PATCH 178
-#define GPCXX_VERSION_SHA1 gd69f
+#define GPCXX_VERSION_PATCH 186
+#define GPCXX_VERSION_SHA1 gb7f0
 
 #endif // GPCXX_CONFIG_VERSION_HPP_DEFINED