[WIP] Trying to merge kra568/dev

src/examples/CMakeLists.txt

@@ -2,53 +2,53 @@
 # EXAMPLES #
 ############
 
-#ADD_EXECUTABLE(seminar seminar.cpp)
-#TARGET_LINK_LIBRARIES(seminar PUBLIC lib4neuro)
+ADD_EXECUTABLE(seminar seminar.cpp)
+TARGET_LINK_LIBRARIES(seminar PUBLIC lib4neuro)
 
 ADD_EXECUTABLE(dev_sandbox dev_sandbox.cpp)
 TARGET_LINK_LIBRARIES(dev_sandbox PUBLIC lib4neuro)
 
-#ADD_EXECUTABLE(net_test_1 net_test_1.cpp)
-#TARGET_LINK_LIBRARIES(net_test_1 PUBLIC lib4neuro)
+ADD_EXECUTABLE(net_test_1 net_test_1.cpp)
+TARGET_LINK_LIBRARIES(net_test_1 PUBLIC lib4neuro)
 
-#ADD_EXECUTABLE(net_test_2 net_test_2.cpp)
-#TARGET_LINK_LIBRARIES(net_test_2 PUBLIC lib4neuro)
+ADD_EXECUTABLE(net_test_2 net_test_2.cpp)
+TARGET_LINK_LIBRARIES(net_test_2 PUBLIC lib4neuro)
 
-#ADD_EXECUTABLE(net_test_3 net_test_3.cpp)
-#TARGET_LINK_LIBRARIES(net_test_3 PUBLIC lib4neuro)
+ADD_EXECUTABLE(net_test_3 net_test_3.cpp)
+TARGET_LINK_LIBRARIES(net_test_3 PUBLIC lib4neuro)
 
-#ADD_EXECUTABLE(net_test_ode_1 net_test_ode_1.cpp)
-#TARGET_LINK_LIBRARIES(net_test_ode_1 PUBLIC lib4neuro)
+ADD_EXECUTABLE(net_test_ode_1 net_test_ode_1.cpp)
+TARGET_LINK_LIBRARIES(net_test_ode_1 PUBLIC lib4neuro)
 
-#ADD_EXECUTABLE(net_test_pde_1 net_test_pde_1.cpp)
-#TARGET_LINK_LIBRARIES(net_test_pde_1 PUBLIC lib4neuro)
+ADD_EXECUTABLE(net_test_pde_1 net_test_pde_1.cpp)
+TARGET_LINK_LIBRARIES(net_test_pde_1 PUBLIC lib4neuro)
 
-#ADD_EXECUTABLE(network_serialization network_serialization.cpp)
-#TARGET_LINK_LIBRARIES(network_serialization PUBLIC lib4neuro)
+ADD_EXECUTABLE(network_serialization network_serialization.cpp)
+TARGET_LINK_LIBRARIES(network_serialization PUBLIC lib4neuro)
 
-#ADD_EXECUTABLE(test_harmonic_oscilator net_test_harmonic_oscilator.cpp)
-#TARGET_LINK_LIBRARIES(test_harmonic_oscilator PUBLIC lib4neuro)
+ADD_EXECUTABLE(test_harmonic_oscilator net_test_harmonic_oscilator.cpp)
+TARGET_LINK_LIBRARIES(test_harmonic_oscilator PUBLIC lib4neuro)
 
-#ADD_EXECUTABLE(x2_fitting x2_fitting.cpp)
-#TARGET_LINK_LIBRARIES(x2_fitting PUBLIC lib4neuro)
+ADD_EXECUTABLE(x2_fitting x2_fitting.cpp)
+TARGET_LINK_LIBRARIES(x2_fitting PUBLIC lib4neuro)
 
-#ADD_EXECUTABLE(acsf acsf.cpp)
-#TARGET_LINK_LIBRARIES(acsf PUBLIC lib4neuro)
+ADD_EXECUTABLE(acsf acsf.cpp)
+TARGET_LINK_LIBRARIES(acsf PUBLIC lib4neuro)
 
 SET(EXAMPLES_OUTPUT_DIR ${PROJECT_BINARY_DIR}/examples)
 
 SET_TARGET_PROPERTIES(
     dev_sandbox
-    #net_test_1
-    #net_test_2
-    #net_test_3
-    #net_test_ode_1
-    #net_test_pde_1
-    #network_serialization
-    #test_harmonic_oscilator
-    #seminar
-    #x2_fitting
-    #acsf
+    net_test_1
+    net_test_2
+    net_test_3
+    net_test_ode_1
+    net_test_pde_1
+    network_serialization
+    test_harmonic_oscilator
+    seminar
+    x2_fitting
+    acsf
 
     PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY $<1:${EXAMPLES_OUTPUT_DIR}>

src/examples/acsf.cpp

@@ -4,7 +4,7 @@
 
 #define ARMA_ALLOW_FAKE_GCC
 
-#include <4neuro_public.h>
+#include <4neuro.h>
 
 void optimize_via_particle_swarm(l4n::NeuralNetwork& net,
                                  l4n::ErrorFunction& ef) {

src/examples/net_test_2.cpp

@@ -5,7 +5,7 @@
 
 #include <vector>
 
-#include <4neuro_public.h>
+#include <4neuro.h>
 
 void optimize_via_particle_swarm(l4n::NeuralNetwork& net,
                                  l4n::ErrorFunction& ef) {

src/examples/net_test_3.cpp

@@ -11,7 +11,7 @@
 #include <assert.h>
 #include <ctime>
 
-#include <4neuro_public.h>
+#include <4neuro.h>
 
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/random/uniform_int_distribution.hpp>

src/examples/net_test_harmonic_oscilator.cpp

@@ -11,7 +11,7 @@
 #include <iostream>
 #include <fstream>
 
-#include <4neuro_public.h>
+#include <4neuro.h>
 
 void export_solution(size_t n_test_points,
                      double te,

src/examples/net_test_ode_1.cpp

@@ -19,7 +19,7 @@
 #include <random>
 #include <iostream>
 #include <chrono>
-#include <4neuro_public.h>
+#include <4neuro.h>
 
 void optimize_via_particle_swarm(l4n::DESolver& solver,
                                  l4n::MultiIndex& alpha,

src/examples/net_test_pde_1.cpp

@@ -22,7 +22,7 @@
 #include <iostream>
 #include <fstream>
 
-#include <4neuro_public.h>
+#include <4neuro.h>
 
 void optimize_via_particle_swarm(l4n::DESolver& solver,
                                  l4n::MultiIndex& alpha,

src/examples/network_serialization.cpp

@@ -7,7 +7,7 @@
  */
 
 #include <vector>
-#include <4neuro_public.h>
+#include <4neuro.h>
 
 int main() {
     std::cout << "Running lib4neuro Serialization example   1" << std::endl;

src/examples/seminar.cpp

@@ -9,7 +9,7 @@
 #include <iostream>
 #include <fstream>
 
-#include <4neuro_public.h>
+#include <4neuro.h>
 
 int main() {
 

src/examples/x2_fitting.cpp

 #include <iostream>
 
-#include <4neuro_public.h>
+#include <4neuro.h>
 
 void optimize_via_particle_swarm(l4n::NeuralNetwork& net,
                                  l4n::ErrorFunction& ef) {