From c68eaab8794d69c9c455a571567209cdad50343c Mon Sep 17 00:00:00 2001
From: Martin Beseda <martin.beseda@vsb.cz>
Date: Mon, 23 Sep 2019 13:55:58 +0200
Subject: [PATCH] [WIP] Trying to merge kra568/dev
---
src/examples/CMakeLists.txt | 60 ++++++++++----------
src/examples/acsf.cpp | 2 +-
src/examples/net_test_2.cpp | 2 +-
src/examples/net_test_3.cpp | 2 +-
src/examples/net_test_harmonic_oscilator.cpp | 2 +-
src/examples/net_test_ode_1.cpp | 2 +-
src/examples/net_test_pde_1.cpp | 2 +-
src/examples/network_serialization.cpp | 2 +-
src/examples/seminar.cpp | 2 +-
src/examples/x2_fitting.cpp | 2 +-
10 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
index 8dc0822c..d1095e07 100644
--- a/src/examples/CMakeLists.txt
+++ b/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}>
diff --git a/src/examples/acsf.cpp b/src/examples/acsf.cpp
index 6b91dca3..0d1a1645 100644
--- a/src/examples/acsf.cpp
+++ b/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) {
diff --git a/src/examples/net_test_2.cpp b/src/examples/net_test_2.cpp
index 8aff983b..1608c73b 100644
--- a/src/examples/net_test_2.cpp
+++ b/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) {
diff --git a/src/examples/net_test_3.cpp b/src/examples/net_test_3.cpp
index bb95542d..d9bc6a7f 100644
--- a/src/examples/net_test_3.cpp
+++ b/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>
diff --git a/src/examples/net_test_harmonic_oscilator.cpp b/src/examples/net_test_harmonic_oscilator.cpp
index abd94990..7f64ab58 100644
--- a/src/examples/net_test_harmonic_oscilator.cpp
+++ b/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,
diff --git a/src/examples/net_test_ode_1.cpp b/src/examples/net_test_ode_1.cpp
index 25d50bd2..e27c429e 100644
--- a/src/examples/net_test_ode_1.cpp
+++ b/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,
diff --git a/src/examples/net_test_pde_1.cpp b/src/examples/net_test_pde_1.cpp
index c2441062..01f9931a 100644
--- a/src/examples/net_test_pde_1.cpp
+++ b/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,
diff --git a/src/examples/network_serialization.cpp b/src/examples/network_serialization.cpp
index 0a22c005..9afe0766 100644
--- a/src/examples/network_serialization.cpp
+++ b/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;
diff --git a/src/examples/seminar.cpp b/src/examples/seminar.cpp
index 735f11c9..b19a86af 100644
--- a/src/examples/seminar.cpp
+++ b/src/examples/seminar.cpp
@@ -9,7 +9,7 @@
#include <iostream>
#include <fstream>
-#include <4neuro_public.h>
+#include <4neuro.h>
int main() {
diff --git a/src/examples/x2_fitting.cpp b/src/examples/x2_fitting.cpp
index 1484ec3c..17cd3e71 100644
--- a/src/examples/x2_fitting.cpp
+++ b/src/examples/x2_fitting.cpp
@@ -1,6 +1,6 @@
#include <iostream>
-#include <4neuro_public.h>
+#include <4neuro.h>
void optimize_via_particle_swarm(l4n::NeuralNetwork& net,
l4n::ErrorFunction& ef) {
--
GitLab