diff --git a/include/4neuro.h b/include/4neuro.h index 1dee0f40421e3300a90e029fcafe3e059c342ef4..89e56c646542234de0e467403a63127c5b1f225c 100644 --- a/include/4neuro.h +++ b/include/4neuro.h @@ -4,12 +4,7 @@ //TODO make only public interface visible -#include "../src/constants.h" -#include "../src/message.h" -#include "../src/settings.h" -#include "../src/exceptions.h" #include "../src/mpi_wrapper.h" - #include "../src/DataSet/DataSet.h" #include "../src/Network/NeuralNetwork.h" #include "../src/Network/NeuralNetworkSum.h" diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt index d1095e07a2a886f1a0d4bd284affd9f24c618999..b1aa192b1631e61981b2b75d9c6639d6633c8a61 100644 --- a/src/examples/CMakeLists.txt +++ b/src/examples/CMakeLists.txt @@ -57,11 +57,11 @@ SET_TARGET_PROPERTIES( INCLUDE_DIRECTORIES ${ROOT_DIR}/include ) -#TARGET_INCLUDE_DIRECTORIES( -# net_test_3 -# PRIVATE -# ${Boost_INCLUDE_DIRS} -#) +TARGET_INCLUDE_DIRECTORIES( + net_test_3 + PRIVATE + ${Boost_INCLUDE_DIRS} +) TARGET_INCLUDE_DIRECTORIES( dev_sandbox diff --git a/src/examples/dev_sandbox.cpp b/src/examples/dev_sandbox.cpp index 00dd1e018fe885d90e009d587ab3b69ae6a08975..e53879f17a6f34bdb18df814d5cf5e882528f9ed 100644 --- a/src/examples/dev_sandbox.cpp +++ b/src/examples/dev_sandbox.cpp @@ -75,7 +75,7 @@ double optimize_via_gradient_descent(l4n::NeuralNetwork& net, /* ERROR CALCULATION */ double err = ef.eval(nullptr); - COUT_INFO("Run finished! Error of the network[Gradient descent]: " << err ); + std::cout << "Run finished! Error of the network[Gradient descent]: " << err << std::endl; /* Just for validation test purposes - NOT necessary for the example to work! */ return err; @@ -179,7 +179,7 @@ int main() { l4n::XYZReader reader("../../data/HE4+T0_000050.xyz", true); reader.read(); - COUT_INFO( "Finished reading data" ); + std::cout << ( "Finished reading data" ); std::shared_ptr<l4n::DataSet> ds = reader.get_acsf_data_set( elements ); // ds->print_data(); diff --git a/src/examples/net_test_1.cpp b/src/examples/net_test_1.cpp index a5b30049adcaa72885a15099236f50b7989bcd2a..a4f8d2caff7bc07b2a858cf9e45ad7f116f6bc3a 100644 --- a/src/examples/net_test_1.cpp +++ b/src/examples/net_test_1.cpp @@ -5,7 +5,7 @@ #include <vector> #include <iostream> -#include <4neuro_public.h> +#include <4neuro.h> void optimize_via_particle_swarm(l4n::NeuralNetwork& net, l4n::ErrorFunction& ef) {