diff --git a/4neuro.cbp b/4neuro.cbp
deleted file mode 100644
index e65b5b8dec003f1a7ab15833db8da72e5c0ed383..0000000000000000000000000000000000000000
--- a/4neuro.cbp
+++ /dev/null
@@ -1,820 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CodeBlocks_project_file>
- <FileVersion major="1" minor="6"/>
- <Project>
- <Option title="4neuro"/>
- <Option makefile_is_custom="1"/>
- <Option compiler="gcc"/>
- <Option virtualFolders="CMake Files\;CMake Files\src\;"/>
- <Build>
- <Target title="all">
- <Option working_dir="/home/fluffymoo/4NEURO_BIATCH/4Neuro"/>
- <Option type="4"/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/Makefile" VERBOSE=1 all"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="rebuild_cache">
- <Option working_dir="/home/fluffymoo/4NEURO_BIATCH/4Neuro"/>
- <Option type="4"/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/Makefile" VERBOSE=1 rebuild_cache"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="edit_cache">
- <Option working_dir="/home/fluffymoo/4NEURO_BIATCH/4Neuro"/>
- <Option type="4"/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/Makefile" VERBOSE=1 edit_cache"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="connection_weight_test">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/connection_weight_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 connection_weight_test"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="connection_weight_test/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/connection_weight_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 connection_weight_test/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="net_test_2">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/net_test_2" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 net_test_2"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="net_test_2/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/net_test_2" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 net_test_2/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="neuron_test">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/neuron_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 neuron_test"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="neuron_test/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/neuron_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 neuron_test/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="net_test_1">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/net_test_1" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 net_test_1"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="net_test_1/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/net_test_1" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 net_test_1/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="4neuro">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/lib/lib4neuro.so" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build"/>
- <Option object_output="./"/>
- <Option type="3"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 4neuro"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="4neuro/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/lib/lib4neuro.so" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build"/>
- <Option object_output="./"/>
- <Option type="3"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 4neuro/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="net_test_3">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/net_test_3" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 net_test_3"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="net_test_3/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/net_test_3" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 net_test_3/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="test_cases">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/test_cases" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 test_cases"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="test_cases/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/test_cases" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 test_cases/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="binary_neuron_test">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/binary_neuron_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 binary_neuron_test"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="binary_neuron_test/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/binary_neuron_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 binary_neuron_test/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="connection_weight_identity_test">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/connection_weight_identity_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 connection_weight_identity_test"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="connection_weight_identity_test/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/connection_weight_identity_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 connection_weight_identity_test/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="boost_unit_test">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/lib/libboost_unit_test.so" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build"/>
- <Option object_output="./"/>
- <Option type="3"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 boost_unit_test"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="boost_unit_test/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/lib/libboost_unit_test.so" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build"/>
- <Option object_output="./"/>
- <Option type="3"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 boost_unit_test/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="dataset_test">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/dataset_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 dataset_test"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="dataset_test/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/dataset_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 dataset_test/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="neuron_serialization_example">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/neuron_serialization_example" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 neuron_serialization_example"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="neuron_serialization_example/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/neuron_serialization_example" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 neuron_serialization_example/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="particle_swarm_test">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/particle_swarm_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 particle_swarm_test"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="particle_swarm_test/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/particle_swarm_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 particle_swarm_test/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="net_test_ode_1">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/net_test_ode_1" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 net_test_ode_1"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="net_test_ode_1/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/net_test_ode_1" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 net_test_ode_1/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="logistic_neuron_test">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/logistic_neuron_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 logistic_neuron_test"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="logistic_neuron_test/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/logistic_neuron_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 logistic_neuron_test/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="tanh_neuron_test">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/tanh_neuron_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 tanh_neuron_test"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="tanh_neuron_test/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/tanh_neuron_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 tanh_neuron_test/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="connection_test">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/connection_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 connection_test"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="connection_test/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/connection_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 connection_test/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="neural_network_test">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/neural_network_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 neural_network_test"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="neural_network_test/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/neural_network_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 neural_network_test/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="errorfunction_test">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/errorfunction_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 errorfunction_test"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="errorfunction_test/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/errorfunction_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 errorfunction_test/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="linear_neuron_test">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/linear_neuron_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 linear_neuron_test"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="linear_neuron_test/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/linear_neuron_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 linear_neuron_test/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="particle_test">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/particle_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 particle_test"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="particle_test/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/particle_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 particle_test/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="NeuralNetworkSum_test">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/NeuralNetworkSum_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 NeuralNetworkSum_test"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- <Target title="NeuralNetworkSum_test/fast">
- <Option output="/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/bin/unit-tests/NeuralNetworkSum_test" prefix_auto="0" extension_auto="0"/>
- <Option working_dir="bin/unit-tests"/>
- <Option object_output="./"/>
- <Option type="1"/>
- <Option compiler="gcc"/>
- <Compiler/>
- <MakeCommands>
- <Build command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 NeuralNetworkSum_test/fast"/>
- <CompileFile command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 "$file""/>
- <Clean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- <DistClean command="/usr/bin/make -f "/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/Makefile" VERBOSE=1 clean"/>
- </MakeCommands>
- </Target>
- </Build>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/DataSet/DataSet.cpp">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/DataSet/DataSet.h">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/ErrorFunction/ErrorFunctions.cpp">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/ErrorFunction/ErrorFunctions.h">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/LearningMethods/ParticleSwarm.cpp">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/LearningMethods/ParticleSwarm.h">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/NetConnection/Connection.cpp">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/NetConnection/Connection.h">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/NetConnection/ConnectionWeight.cpp">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/NetConnection/ConnectionWeight.h">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/NetConnection/ConnectionWeightIdentity.cpp">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/NetConnection/ConnectionWeightIdentity.h">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Network/NeuralNetwork.cpp">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Network/NeuralNetwork.h">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Network/NeuralNetworkSum.cpp">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Network/NeuralNetworkSum.h">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Neuron/Neuron.cpp">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Neuron/Neuron.h">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Neuron/NeuronBinary.cpp">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Neuron/NeuronBinary.h">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Neuron/NeuronLinear.cpp">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Neuron/NeuronLinear.h">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Neuron/NeuronLogistic.cpp">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Neuron/NeuronLogistic.h">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Neuron/NeuronNeuralNet.cpp">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Neuron/NeuronNeuralNet.h">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Neuron/NeuronTanh.cpp">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Neuron/NeuronTanh.h">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Solvers/DESolver.cpp">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/Solvers/DESolver.h">
- <Option target="4neuro"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/main.cpp">
- <Option target="test_cases"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/net_test_1.cpp">
- <Option target="net_test_1"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/net_test_2.cpp">
- <Option target="net_test_2"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/net_test_3.cpp">
- <Option target="net_test_3"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/net_test_ode_1.cpp">
- <Option target="net_test_ode_1"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/neuron_serialization_example.cpp">
- <Option target="neuron_serialization_example"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/settings.h">
- <Option target="net_test_1"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/tests/ConnectionWeightIdentity_test.cpp">
- <Option target="connection_weight_identity_test"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/tests/ConnectionWeight_test.cpp">
- <Option target="connection_weight_test"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/tests/Connection_test.cpp">
- <Option target="connection_test"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/tests/DataSet_test.cpp">
- <Option target="dataset_test"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/tests/ErrorFunctions_test.cpp">
- <Option target="errorfunction_test"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/tests/NeuralNetworkSum_test.cpp">
- <Option target="NeuralNetworkSum_test"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/tests/NeuralNetwork_test.cpp">
- <Option target="neural_network_test"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/tests/NeuronBinary_test.cpp">
- <Option target="binary_neuron_test"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/tests/NeuronLinear_test.cpp">
- <Option target="linear_neuron_test"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/tests/NeuronLogistic_test.cpp">
- <Option target="logistic_neuron_test"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/tests/NeuronTanh.cpp">
- <Option target="tanh_neuron_test"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/tests/ParticleSwarm_test.cpp">
- <Option target="particle_swarm_test"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/tests/Particle_test.cpp">
- <Option target="particle_test"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/tests/boost_test_lib_dummy.cpp">
- <Option target="boost_unit_test"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/tests/neuron_test.cpp">
- <Option target="neuron_test"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/CMakeLists.txt">
- <Option virtualFolder="CMake Files\"/>
- </Unit>
- <Unit filename="/home/fluffymoo/4NEURO_BIATCH/4Neuro/src/CMakeLists.txt">
- <Option virtualFolder="CMake Files\src\"/>
- </Unit>
- </Project>
-</CodeBlocks_project_file>
diff --git a/CMakeCache.txt b/CMakeCache.txt
deleted file mode 100644
index dfd3924ee743d5cb578050de5cdd4463e64590a9..0000000000000000000000000000000000000000
--- a/CMakeCache.txt
+++ /dev/null
@@ -1,346 +0,0 @@
-# This is the CMakeCache file.
-# For build in directory: /home/fluffymoo/4NEURO_BIATCH/4Neuro
-# It was generated by CMake: /home/fluffymoo/.local/share/JetBrains/Toolbox/apps/CLion/ch-0/182.3684.76/bin/cmake/linux/bin/cmake
-# You can edit this file to change values found and used by cmake.
-# If you do not want to change any of the values, simply exit the editor.
-# If you do want to change a value, simply edit, save, and exit the editor.
-# The syntax for the file is as follows:
-# KEY:TYPE=VALUE
-# KEY is the name of a variable in the cache.
-# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!.
-# VALUE is the current value for the KEY.
-
-########################
-# EXTERNAL cache entries
-########################
-
-//Value Computed by CMake
-4neuro_BINARY_DIR:STATIC=/home/fluffymoo/4NEURO_BIATCH/4Neuro
-
-//Dependencies for the target
-4neuro_LIB_DEPENDS:STATIC=general;boost_serialization;
-
-//Value Computed by CMake
-4neuro_SOURCE_DIR:STATIC=/home/fluffymoo/4NEURO_BIATCH/4Neuro
-
-//Path to a program.
-CMAKE_AR:FILEPATH=/usr/bin/ar
-
-//Choose the type of build, options are: None Debug Release RelWithDebInfo
-// MinSizeRel ...
-CMAKE_BUILD_TYPE:STRING=Debug
-
-//Enable/Disable color output during build.
-CMAKE_COLOR_MAKEFILE:BOOL=ON
-
-//CXX compiler
-CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/c++
-
-//A wrapper around 'ar' adding the appropriate '--plugin' option
-// for the GCC compiler
-CMAKE_CXX_COMPILER_AR:FILEPATH=/usr/bin/gcc-ar-7
-
-//A wrapper around 'ranlib' adding the appropriate '--plugin' option
-// for the GCC compiler
-CMAKE_CXX_COMPILER_RANLIB:FILEPATH=/usr/bin/gcc-ranlib-7
-
-//Flags used by the compiler during all build types.
-CMAKE_CXX_FLAGS:STRING=
-
-//Flags used by the compiler during debug builds.
-CMAKE_CXX_FLAGS_DEBUG:STRING=-g
-
-//Flags used by the compiler during release builds for minimum
-// size.
-CMAKE_CXX_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
-
-//Flags used by the compiler during release builds.
-CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
-
-//Flags used by the compiler during release builds with debug info.
-CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG
-
-//C compiler
-CMAKE_C_COMPILER:FILEPATH=/usr/bin/cc
-
-//A wrapper around 'ar' adding the appropriate '--plugin' option
-// for the GCC compiler
-CMAKE_C_COMPILER_AR:FILEPATH=/usr/bin/gcc-ar-7
-
-//A wrapper around 'ranlib' adding the appropriate '--plugin' option
-// for the GCC compiler
-CMAKE_C_COMPILER_RANLIB:FILEPATH=/usr/bin/gcc-ranlib-7
-
-//Flags used by the compiler during all build types.
-CMAKE_C_FLAGS:STRING=
-
-//Flags used by the compiler during debug builds.
-CMAKE_C_FLAGS_DEBUG:STRING=-g
-
-//Flags used by the compiler during release builds for minimum
-// size.
-CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
-
-//Flags used by the compiler during release builds.
-CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
-
-//Flags used by the compiler during release builds with debug info.
-CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG
-
-//Flags used by the linker.
-CMAKE_EXE_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Enable/Disable output of compile commands during generation.
-CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF
-
-//Install path prefix, prepended onto install directories.
-CMAKE_INSTALL_PREFIX:PATH=/usr/local
-
-//Path to a program.
-CMAKE_LINKER:FILEPATH=/usr/bin/ld
-
-//Path to a program.
-CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make
-
-//Flags used by the linker during the creation of modules.
-CMAKE_MODULE_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Path to a program.
-CMAKE_NM:FILEPATH=/usr/bin/nm
-
-//Path to a program.
-CMAKE_OBJCOPY:FILEPATH=/usr/bin/objcopy
-
-//Path to a program.
-CMAKE_OBJDUMP:FILEPATH=/usr/bin/objdump
-
-//Value Computed by CMake
-CMAKE_PROJECT_NAME:STATIC=4neuro
-
-//Path to a program.
-CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib
-
-//Flags used by the linker during the creation of dll's.
-CMAKE_SHARED_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//If set, runtime paths are not added when installing shared libraries,
-// but are added when building.
-CMAKE_SKIP_INSTALL_RPATH:BOOL=NO
-
-//If set, runtime paths are not added when using shared libraries.
-CMAKE_SKIP_RPATH:BOOL=NO
-
-//Flags used by the linker during the creation of static libraries.
-CMAKE_STATIC_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_STATIC_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Path to a program.
-CMAKE_STRIP:FILEPATH=/usr/bin/strip
-
-//If this value is on, makefiles will be generated without the
-// .SILENT directive, and all commands will be echoed to the console
-// during the make. This is useful for debugging only. With Visual
-// Studio IDE projects all commands are done without /nologo.
-CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
-
-//No help, variable specified on the command line.
-WITH_TIME_PROFILING:STRING=
-
-//Dependencies for the target
-data_set_LIB_DEPENDS:STATIC=general;boost_serialization;
-
-//Dependencies for the target
-error_functions_LIB_DEPENDS:STATIC=general;data_set;
-
-
-########################
-# INTERNAL cache entries
-########################
-
-//ADVANCED property for variable: CMAKE_AR
-CMAKE_AR-ADVANCED:INTERNAL=1
-//This is the directory where this CMakeCache.txt was created
-CMAKE_CACHEFILE_DIR:INTERNAL=/home/fluffymoo/4NEURO_BIATCH/4Neuro
-//Major version of cmake used to create the current loaded cache
-CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
-//Minor version of cmake used to create the current loaded cache
-CMAKE_CACHE_MINOR_VERSION:INTERNAL=12
-//Patch version of cmake used to create the current loaded cache
-CMAKE_CACHE_PATCH_VERSION:INTERNAL=0
-//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
-CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
-//Path to CMake executable.
-CMAKE_COMMAND:INTERNAL=/home/fluffymoo/.local/share/JetBrains/Toolbox/apps/CLion/ch-0/182.3684.76/bin/cmake/linux/bin/cmake
-//Path to cpack program executable.
-CMAKE_CPACK_COMMAND:INTERNAL=/home/fluffymoo/.local/share/JetBrains/Toolbox/apps/CLion/ch-0/182.3684.76/bin/cmake/linux/bin/cpack
-//Path to ctest program executable.
-CMAKE_CTEST_COMMAND:INTERNAL=/home/fluffymoo/.local/share/JetBrains/Toolbox/apps/CLion/ch-0/182.3684.76/bin/cmake/linux/bin/ctest
-//ADVANCED property for variable: CMAKE_CXX_COMPILER
-CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_COMPILER_AR
-CMAKE_CXX_COMPILER_AR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_COMPILER_RANLIB
-CMAKE_CXX_COMPILER_RANLIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS
-CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG
-CMAKE_CXX_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_MINSIZEREL
-CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELEASE
-CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO
-CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_COMPILER
-CMAKE_C_COMPILER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_COMPILER_AR
-CMAKE_C_COMPILER_AR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_COMPILER_RANLIB
-CMAKE_C_COMPILER_RANLIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS
-CMAKE_C_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG
-CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_MINSIZEREL
-CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_RELEASE
-CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_RELWITHDEBINFO
-CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Path to cache edit program executable.
-CMAKE_EDIT_COMMAND:INTERNAL=/home/fluffymoo/.local/share/JetBrains/Toolbox/apps/CLion/ch-0/182.3684.12/bin/cmake/linux/bin/ccmake
-//Executable file format
-CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS
-CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG
-CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE
-CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS
-CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1
-//Name of external makefile project generator.
-CMAKE_EXTRA_GENERATOR:INTERNAL=
-//Name of generator.
-CMAKE_GENERATOR:INTERNAL=Unix Makefiles
-//Generator instance identifier.
-CMAKE_GENERATOR_INSTANCE:INTERNAL=
-//Name of generator platform.
-CMAKE_GENERATOR_PLATFORM:INTERNAL=
-//Name of generator toolset.
-CMAKE_GENERATOR_TOOLSET:INTERNAL=
-//Source directory with the top level CMakeLists.txt file for this
-// project
-CMAKE_HOME_DIRECTORY:INTERNAL=/home/fluffymoo/4NEURO_BIATCH/4Neuro
-//Install .so files without execute permission.
-CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1
-//ADVANCED property for variable: CMAKE_LINKER
-CMAKE_LINKER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MAKE_PROGRAM
-CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS
-CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG
-CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL
-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE
-CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_NM
-CMAKE_NM-ADVANCED:INTERNAL=1
-//number of local generators
-CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=2
-//ADVANCED property for variable: CMAKE_OBJCOPY
-CMAKE_OBJCOPY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_OBJDUMP
-CMAKE_OBJDUMP-ADVANCED:INTERNAL=1
-//Platform information initialized
-CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_RANLIB
-CMAKE_RANLIB-ADVANCED:INTERNAL=1
-//Path to CMake installation.
-CMAKE_ROOT:INTERNAL=/home/fluffymoo/.local/share/JetBrains/Toolbox/apps/CLion/ch-0/182.3684.76/bin/cmake/linux/share/cmake-3.12
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
-CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG
-CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL
-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE
-CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SKIP_INSTALL_RPATH
-CMAKE_SKIP_INSTALL_RPATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SKIP_RPATH
-CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS
-CMAKE_STATIC_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_DEBUG
-CMAKE_STATIC_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL
-CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELEASE
-CMAKE_STATIC_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STRIP
-CMAKE_STRIP-ADVANCED:INTERNAL=1
-//uname command
-CMAKE_UNAME:INTERNAL=/bin/uname
-//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
-CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
-
diff --git a/Makefile b/Makefile
index d7f48d0315ac755dfbd7bee20b663879a1325670..dedecaaabdcd73463ac3a45fdfc75308e193b297 100644
--- a/Makefile
+++ b/Makefile
@@ -111,134 +111,82 @@ depend:
.PHONY : depend
#=============================================================================
-# Target rules for targets named connection_weight_test
-
-# Build rule for target.
-connection_weight_test: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 connection_weight_test
-.PHONY : connection_weight_test
-
-# fast build rule for target.
-connection_weight_test/fast:
- $(MAKE) -f build/CMakeFiles/connection_weight_test.dir/build.make build/CMakeFiles/connection_weight_test.dir/build
-.PHONY : connection_weight_test/fast
-
-#=============================================================================
-# Target rules for targets named net_test_2
-
-# Build rule for target.
-net_test_2: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 net_test_2
-.PHONY : net_test_2
-
-# fast build rule for target.
-net_test_2/fast:
- $(MAKE) -f build/CMakeFiles/net_test_2.dir/build.make build/CMakeFiles/net_test_2.dir/build
-.PHONY : net_test_2/fast
-
-#=============================================================================
-# Target rules for targets named neuron_test
-
-# Build rule for target.
-neuron_test: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 neuron_test
-.PHONY : neuron_test
-
-# fast build rule for target.
-neuron_test/fast:
- $(MAKE) -f build/CMakeFiles/neuron_test.dir/build.make build/CMakeFiles/neuron_test.dir/build
-.PHONY : neuron_test/fast
-
-#=============================================================================
-# Target rules for targets named net_test_1
-
-# Build rule for target.
-net_test_1: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 net_test_1
-.PHONY : net_test_1
-
-# fast build rule for target.
-net_test_1/fast:
- $(MAKE) -f build/CMakeFiles/net_test_1.dir/build.make build/CMakeFiles/net_test_1.dir/build
-.PHONY : net_test_1/fast
-
-#=============================================================================
-# Target rules for targets named 4neuro
+# Target rules for targets named NeuralNetworkSum_test
# Build rule for target.
-4neuro: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 4neuro
-.PHONY : 4neuro
+NeuralNetworkSum_test: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 NeuralNetworkSum_test
+.PHONY : NeuralNetworkSum_test
# fast build rule for target.
-4neuro/fast:
- $(MAKE) -f build/CMakeFiles/4neuro.dir/build.make build/CMakeFiles/4neuro.dir/build
-.PHONY : 4neuro/fast
+NeuralNetworkSum_test/fast:
+ $(MAKE) -f build/CMakeFiles/NeuralNetworkSum_test.dir/build.make build/CMakeFiles/NeuralNetworkSum_test.dir/build
+.PHONY : NeuralNetworkSum_test/fast
#=============================================================================
-# Target rules for targets named net_test_3
+# Target rules for targets named particle_test
# Build rule for target.
-net_test_3: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 net_test_3
-.PHONY : net_test_3
+particle_test: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 particle_test
+.PHONY : particle_test
# fast build rule for target.
-net_test_3/fast:
- $(MAKE) -f build/CMakeFiles/net_test_3.dir/build.make build/CMakeFiles/net_test_3.dir/build
-.PHONY : net_test_3/fast
+particle_test/fast:
+ $(MAKE) -f build/CMakeFiles/particle_test.dir/build.make build/CMakeFiles/particle_test.dir/build
+.PHONY : particle_test/fast
#=============================================================================
-# Target rules for targets named test_cases
+# Target rules for targets named errorfunction_test
# Build rule for target.
-test_cases: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 test_cases
-.PHONY : test_cases
+errorfunction_test: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 errorfunction_test
+.PHONY : errorfunction_test
# fast build rule for target.
-test_cases/fast:
- $(MAKE) -f build/CMakeFiles/test_cases.dir/build.make build/CMakeFiles/test_cases.dir/build
-.PHONY : test_cases/fast
+errorfunction_test/fast:
+ $(MAKE) -f build/CMakeFiles/errorfunction_test.dir/build.make build/CMakeFiles/errorfunction_test.dir/build
+.PHONY : errorfunction_test/fast
#=============================================================================
-# Target rules for targets named binary_neuron_test
+# Target rules for targets named neural_network_test
# Build rule for target.
-binary_neuron_test: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 binary_neuron_test
-.PHONY : binary_neuron_test
+neural_network_test: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 neural_network_test
+.PHONY : neural_network_test
# fast build rule for target.
-binary_neuron_test/fast:
- $(MAKE) -f build/CMakeFiles/binary_neuron_test.dir/build.make build/CMakeFiles/binary_neuron_test.dir/build
-.PHONY : binary_neuron_test/fast
+neural_network_test/fast:
+ $(MAKE) -f build/CMakeFiles/neural_network_test.dir/build.make build/CMakeFiles/neural_network_test.dir/build
+.PHONY : neural_network_test/fast
#=============================================================================
-# Target rules for targets named connection_weight_identity_test
+# Target rules for targets named logistic_neuron_test
# Build rule for target.
-connection_weight_identity_test: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 connection_weight_identity_test
-.PHONY : connection_weight_identity_test
+logistic_neuron_test: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 logistic_neuron_test
+.PHONY : logistic_neuron_test
# fast build rule for target.
-connection_weight_identity_test/fast:
- $(MAKE) -f build/CMakeFiles/connection_weight_identity_test.dir/build.make build/CMakeFiles/connection_weight_identity_test.dir/build
-.PHONY : connection_weight_identity_test/fast
+logistic_neuron_test/fast:
+ $(MAKE) -f build/CMakeFiles/logistic_neuron_test.dir/build.make build/CMakeFiles/logistic_neuron_test.dir/build
+.PHONY : logistic_neuron_test/fast
#=============================================================================
-# Target rules for targets named boost_unit_test
+# Target rules for targets named particle_swarm_test
# Build rule for target.
-boost_unit_test: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 boost_unit_test
-.PHONY : boost_unit_test
+particle_swarm_test: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 particle_swarm_test
+.PHONY : particle_swarm_test
# fast build rule for target.
-boost_unit_test/fast:
- $(MAKE) -f build/CMakeFiles/boost_unit_test.dir/build.make build/CMakeFiles/boost_unit_test.dir/build
-.PHONY : boost_unit_test/fast
+particle_swarm_test/fast:
+ $(MAKE) -f build/CMakeFiles/particle_swarm_test.dir/build.make build/CMakeFiles/particle_swarm_test.dir/build
+.PHONY : particle_swarm_test/fast
#=============================================================================
# Target rules for targets named dataset_test
@@ -267,17 +215,30 @@ neuron_serialization_example/fast:
.PHONY : neuron_serialization_example/fast
#=============================================================================
-# Target rules for targets named particle_swarm_test
+# Target rules for targets named boost_unit_test
# Build rule for target.
-particle_swarm_test: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 particle_swarm_test
-.PHONY : particle_swarm_test
+boost_unit_test: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 boost_unit_test
+.PHONY : boost_unit_test
# fast build rule for target.
-particle_swarm_test/fast:
- $(MAKE) -f build/CMakeFiles/particle_swarm_test.dir/build.make build/CMakeFiles/particle_swarm_test.dir/build
-.PHONY : particle_swarm_test/fast
+boost_unit_test/fast:
+ $(MAKE) -f build/CMakeFiles/boost_unit_test.dir/build.make build/CMakeFiles/boost_unit_test.dir/build
+.PHONY : boost_unit_test/fast
+
+#=============================================================================
+# Target rules for targets named connection_weight_identity_test
+
+# Build rule for target.
+connection_weight_identity_test: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 connection_weight_identity_test
+.PHONY : connection_weight_identity_test
+
+# fast build rule for target.
+connection_weight_identity_test/fast:
+ $(MAKE) -f build/CMakeFiles/connection_weight_identity_test.dir/build.make build/CMakeFiles/connection_weight_identity_test.dir/build
+.PHONY : connection_weight_identity_test/fast
#=============================================================================
# Target rules for targets named net_test_ode_1
@@ -293,108 +254,121 @@ net_test_ode_1/fast:
.PHONY : net_test_ode_1/fast
#=============================================================================
-# Target rules for targets named logistic_neuron_test
+# Target rules for targets named binary_neuron_test
# Build rule for target.
-logistic_neuron_test: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 logistic_neuron_test
-.PHONY : logistic_neuron_test
+binary_neuron_test: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 binary_neuron_test
+.PHONY : binary_neuron_test
# fast build rule for target.
-logistic_neuron_test/fast:
- $(MAKE) -f build/CMakeFiles/logistic_neuron_test.dir/build.make build/CMakeFiles/logistic_neuron_test.dir/build
-.PHONY : logistic_neuron_test/fast
+binary_neuron_test/fast:
+ $(MAKE) -f build/CMakeFiles/binary_neuron_test.dir/build.make build/CMakeFiles/binary_neuron_test.dir/build
+.PHONY : binary_neuron_test/fast
#=============================================================================
-# Target rules for targets named tanh_neuron_test
+# Target rules for targets named test_cases
# Build rule for target.
-tanh_neuron_test: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 tanh_neuron_test
-.PHONY : tanh_neuron_test
+test_cases: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 test_cases
+.PHONY : test_cases
# fast build rule for target.
-tanh_neuron_test/fast:
- $(MAKE) -f build/CMakeFiles/tanh_neuron_test.dir/build.make build/CMakeFiles/tanh_neuron_test.dir/build
-.PHONY : tanh_neuron_test/fast
+test_cases/fast:
+ $(MAKE) -f build/CMakeFiles/test_cases.dir/build.make build/CMakeFiles/test_cases.dir/build
+.PHONY : test_cases/fast
#=============================================================================
-# Target rules for targets named connection_test
+# Target rules for targets named net_test_3
# Build rule for target.
-connection_test: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 connection_test
-.PHONY : connection_test
+net_test_3: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 net_test_3
+.PHONY : net_test_3
# fast build rule for target.
-connection_test/fast:
- $(MAKE) -f build/CMakeFiles/connection_test.dir/build.make build/CMakeFiles/connection_test.dir/build
-.PHONY : connection_test/fast
+net_test_3/fast:
+ $(MAKE) -f build/CMakeFiles/net_test_3.dir/build.make build/CMakeFiles/net_test_3.dir/build
+.PHONY : net_test_3/fast
#=============================================================================
-# Target rules for targets named neural_network_test
+# Target rules for targets named 4neuro
# Build rule for target.
-neural_network_test: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 neural_network_test
-.PHONY : neural_network_test
+4neuro: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 4neuro
+.PHONY : 4neuro
# fast build rule for target.
-neural_network_test/fast:
- $(MAKE) -f build/CMakeFiles/neural_network_test.dir/build.make build/CMakeFiles/neural_network_test.dir/build
-.PHONY : neural_network_test/fast
+4neuro/fast:
+ $(MAKE) -f build/CMakeFiles/4neuro.dir/build.make build/CMakeFiles/4neuro.dir/build
+.PHONY : 4neuro/fast
#=============================================================================
-# Target rules for targets named errorfunction_test
+# Target rules for targets named net_test_1
# Build rule for target.
-errorfunction_test: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 errorfunction_test
-.PHONY : errorfunction_test
+net_test_1: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 net_test_1
+.PHONY : net_test_1
# fast build rule for target.
-errorfunction_test/fast:
- $(MAKE) -f build/CMakeFiles/errorfunction_test.dir/build.make build/CMakeFiles/errorfunction_test.dir/build
-.PHONY : errorfunction_test/fast
+net_test_1/fast:
+ $(MAKE) -f build/CMakeFiles/net_test_1.dir/build.make build/CMakeFiles/net_test_1.dir/build
+.PHONY : net_test_1/fast
#=============================================================================
-# Target rules for targets named linear_neuron_test
+# Target rules for targets named neuron_test
# Build rule for target.
-linear_neuron_test: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 linear_neuron_test
-.PHONY : linear_neuron_test
+neuron_test: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 neuron_test
+.PHONY : neuron_test
# fast build rule for target.
-linear_neuron_test/fast:
- $(MAKE) -f build/CMakeFiles/linear_neuron_test.dir/build.make build/CMakeFiles/linear_neuron_test.dir/build
-.PHONY : linear_neuron_test/fast
+neuron_test/fast:
+ $(MAKE) -f build/CMakeFiles/neuron_test.dir/build.make build/CMakeFiles/neuron_test.dir/build
+.PHONY : neuron_test/fast
#=============================================================================
-# Target rules for targets named particle_test
+# Target rules for targets named net_test_2
# Build rule for target.
-particle_test: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 particle_test
-.PHONY : particle_test
+net_test_2: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 net_test_2
+.PHONY : net_test_2
# fast build rule for target.
-particle_test/fast:
- $(MAKE) -f build/CMakeFiles/particle_test.dir/build.make build/CMakeFiles/particle_test.dir/build
-.PHONY : particle_test/fast
+net_test_2/fast:
+ $(MAKE) -f build/CMakeFiles/net_test_2.dir/build.make build/CMakeFiles/net_test_2.dir/build
+.PHONY : net_test_2/fast
#=============================================================================
-# Target rules for targets named NeuralNetworkSum_test
+# Target rules for targets named connection_weight_test
# Build rule for target.
-NeuralNetworkSum_test: cmake_check_build_system
- $(MAKE) -f CMakeFiles/Makefile2 NeuralNetworkSum_test
-.PHONY : NeuralNetworkSum_test
+connection_weight_test: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 connection_weight_test
+.PHONY : connection_weight_test
# fast build rule for target.
-NeuralNetworkSum_test/fast:
- $(MAKE) -f build/CMakeFiles/NeuralNetworkSum_test.dir/build.make build/CMakeFiles/NeuralNetworkSum_test.dir/build
-.PHONY : NeuralNetworkSum_test/fast
+connection_weight_test/fast:
+ $(MAKE) -f build/CMakeFiles/connection_weight_test.dir/build.make build/CMakeFiles/connection_weight_test.dir/build
+.PHONY : connection_weight_test/fast
+
+#=============================================================================
+# Target rules for targets named linear_neuron_test
+
+# Build rule for target.
+linear_neuron_test: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 linear_neuron_test
+.PHONY : linear_neuron_test
+
+# fast build rule for target.
+linear_neuron_test/fast:
+ $(MAKE) -f build/CMakeFiles/linear_neuron_test.dir/build.make build/CMakeFiles/linear_neuron_test.dir/build
+.PHONY : linear_neuron_test/fast
# Help Target
help:
@@ -404,28 +378,26 @@ help:
@echo "... depend"
@echo "... rebuild_cache"
@echo "... edit_cache"
- @echo "... connection_weight_test"
- @echo "... net_test_2"
- @echo "... neuron_test"
- @echo "... net_test_1"
- @echo "... 4neuro"
- @echo "... net_test_3"
- @echo "... test_cases"
- @echo "... binary_neuron_test"
- @echo "... connection_weight_identity_test"
- @echo "... boost_unit_test"
+ @echo "... NeuralNetworkSum_test"
+ @echo "... particle_test"
+ @echo "... errorfunction_test"
+ @echo "... neural_network_test"
+ @echo "... logistic_neuron_test"
+ @echo "... particle_swarm_test"
@echo "... dataset_test"
@echo "... neuron_serialization_example"
- @echo "... particle_swarm_test"
+ @echo "... boost_unit_test"
+ @echo "... connection_weight_identity_test"
@echo "... net_test_ode_1"
- @echo "... logistic_neuron_test"
- @echo "... tanh_neuron_test"
- @echo "... connection_test"
- @echo "... neural_network_test"
- @echo "... errorfunction_test"
+ @echo "... binary_neuron_test"
+ @echo "... test_cases"
+ @echo "... net_test_3"
+ @echo "... 4neuro"
+ @echo "... net_test_1"
+ @echo "... neuron_test"
+ @echo "... net_test_2"
+ @echo "... connection_weight_test"
@echo "... linear_neuron_test"
- @echo "... particle_test"
- @echo "... NeuralNetworkSum_test"
.PHONY : help
diff --git a/build.sh b/build.sh
index 1f086b5ffe944cf10d5ecd6c81967e03fede9384..ccf7c9ea7a03acef699b2e3f514c9d0b2fb9d82d 100755
--- a/build.sh
+++ b/build.sh
@@ -69,7 +69,7 @@ case `uname -s` in
esac
#-------------------------------------------------------------------------
-rm -rf build;
+rm -rf build CMakeCache.txt;
cmake -G "${MAKEFILE_TYPE}" -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWITH_TIME_PROFILING:BOOLEAN=${WITH_TIME_PROFILING} .
make VERBOSE=1 && echo "Build complete." || exit -1;
#make install;
diff --git a/cmake_install.cmake b/cmake_install.cmake
deleted file mode 100644
index a2e2c224adeffd3be3cdb9ad2c5cb373853ec8f4..0000000000000000000000000000000000000000
--- a/cmake_install.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-# Install script for directory: /home/fluffymoo/4NEURO_BIATCH/4Neuro
-
-# Set the install prefix
-if(NOT DEFINED CMAKE_INSTALL_PREFIX)
- set(CMAKE_INSTALL_PREFIX "/usr/local")
-endif()
-string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-
-# Set the install configuration name.
-if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
- if(BUILD_TYPE)
- string(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
- CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
- else()
- set(CMAKE_INSTALL_CONFIG_NAME "Debug")
- endif()
- message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
-endif()
-
-# Set the component getting installed.
-if(NOT CMAKE_INSTALL_COMPONENT)
- if(COMPONENT)
- message(STATUS "Install component: \"${COMPONENT}\"")
- set(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
- else()
- set(CMAKE_INSTALL_COMPONENT)
- endif()
-endif()
-
-# Install shared libraries without execute permission?
-if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
- set(CMAKE_INSTALL_SO_NO_EXE "1")
-endif()
-
-# Is this installation the result of a crosscompile?
-if(NOT DEFINED CMAKE_CROSSCOMPILING)
- set(CMAKE_CROSSCOMPILING "FALSE")
-endif()
-
-if(NOT CMAKE_INSTALL_LOCAL_ONLY)
- # Include the install script for each subdirectory.
- include("/home/fluffymoo/4NEURO_BIATCH/4Neuro/build/cmake_install.cmake")
-
-endif()
-
-if(CMAKE_INSTALL_COMPONENT)
- set(CMAKE_INSTALL_MANIFEST "install_manifest_${CMAKE_INSTALL_COMPONENT}.txt")
-else()
- set(CMAKE_INSTALL_MANIFEST "install_manifest.txt")
-endif()
-
-string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT
- "${CMAKE_INSTALL_MANIFEST_FILES}")
-file(WRITE "/home/fluffymoo/4NEURO_BIATCH/4Neuro/${CMAKE_INSTALL_MANIFEST}"
- "${CMAKE_INSTALL_MANIFEST_CONTENT}")
diff --git a/src/DataSet/DataSet.cpp b/src/DataSet/DataSet.cpp
index d759ac169ea057ae1dfc8bcb3ba4c0726e6cced9..a4a11a3c079204364476b4695228b5508c117dff 100644
--- a/src/DataSet/DataSet.cpp
+++ b/src/DataSet/DataSet.cpp
@@ -30,6 +30,16 @@ DataSet::DataSet(std::vector<std::pair<std::vector<double>, std::vector<double>>
//TODO check the complete data set for input/output dimensions
}
+DataSet::DataSet(double lower_bound, double upper_bound, unsigned int size, double output) {
+ std::vector<std::pair<std::vector<double>, std::vector<double>>> new_data_vec;
+ this->data = new_data_vec;
+ this->n_elements = size;
+ this->input_dim = 1;
+ this->output_dim = 1;
+
+ this->add_isotropic_data(lower_bound, upper_bound, size, output);
+}
+
void DataSet::add_data_pair(std::vector<double> inputs, std::vector<double> outputs) {
if(inputs.size() != this->input_dim) {
throw InvalidDimension("Bad input dimension.");
@@ -41,6 +51,23 @@ void DataSet::add_data_pair(std::vector<double> inputs, std::vector<double> outp
this->data.emplace_back(std::make_pair(inputs, outputs));
}
+void DataSet::add_isotropic_data(double lower_bound, double upper_bound, unsigned int size, double output) {
+ if(this->input_dim != 1 || this->output_dim != 1) {
+ throw InvalidDimension("Cannot add data with dimensionality 1:1 when the data set "
+ "is of different dimensionality!");
+ }
+
+ double frac = (upper_bound - lower_bound) / (size - 1);
+ std::vector<double> inp, out;
+
+ out = {output};
+
+ for(unsigned int i = 0; i < size; ++i){
+ inp = {frac*i};
+ this->data.emplace_back(std::make_pair(inp, out));
+ }
+}
+
std::vector<std::pair<std::vector<double>, std::vector<double>>>* DataSet::get_data() {
return &(this->data);
}
diff --git a/src/DataSet/DataSet.h b/src/DataSet/DataSet.h
index 8fd1d585d8ffb535d3c75c0c6dcae3bfb05416d9..0cfbbea01396183f7873dc4d523492c908163142 100644
--- a/src/DataSet/DataSet.h
+++ b/src/DataSet/DataSet.h
@@ -149,6 +149,22 @@ public:
*/
DataSet(std::vector<std::pair<std::vector<double>, std::vector<double>>>* data_ptr);
+ /**
+ * Creates a new data set with input values equidistantly positioned
+ * over the certain interval and the output value
+ * being constant
+ *
+ * Both input and output are 1-dimensional
+ *
+ * @todo add bounds as vectors for multi-dimensional data-sets
+ *
+ * @param lower_bound Lower bound of the input data interval
+ * @param upper_bound Upper bound of the input data interval
+ * @param size Number of input-output pairs generated
+ * @param output Constant output value
+ */
+ DataSet(double lower_bound, double upper_bound, unsigned int size, double output);
+
/**
* Getter for number of elements
* @return Number of elements in the data set
@@ -181,6 +197,23 @@ public:
*/
void add_data_pair(std::vector<double> inputs, std::vector<double> outputs);
+ //TODO expand method to generate multiple data types - chebyshev etc.
+ /**
+ * Adds a new data with input values equidistantly positioned
+ * over the certain interval and the output value
+ * being constant
+ *
+ * Both input and output are 1-dimensional
+ *
+ * @param lower_bound Lower bound of the input data interval
+ * @param upper_bound Upper bound of the input data interval
+ * @param size Number of input-output pairs generated
+ * @param output Constant output value
+ */
+ void add_isotropic_data(double lower_bound, double upper_bound, unsigned int size, double output);
+
+ //TODO Chebyshev - ch. interpolation points, i-th point = cos(i*alpha) from 0 to pi
+
/**
* Prints the data set
*/
diff --git a/src/LearningMethods/ParticleSwarm.cpp b/src/LearningMethods/ParticleSwarm.cpp
index 8d9702c22964db8e7df5cee6a5e2a5ade5997ee4..2a6b2f8bdbcf96f380f6e4783cbbffdc999decae 100644
--- a/src/LearningMethods/ParticleSwarm.cpp
+++ b/src/LearningMethods/ParticleSwarm.cpp
@@ -5,9 +5,6 @@
* @date 2.7.18 -
*/
-#include <cmath>
-#include <set>
-#include <stdexcept>
#include "ParticleSwarm.h"
#include "../ErrorFunction/ErrorFunctions.h"
@@ -35,6 +32,7 @@ Particle::Particle(ErrorFunction* ef, double *domain_bounds) {
// this->r2 = (rand() % 100001) / (double) 100000;
this->r1 = 1.0;
this->r2 = 1.0;
+ this->r3 = 1.0;
this->optimal_coordinate = new double[this->coordinate_dim];
@@ -72,20 +70,24 @@ double* Particle::get_coordinate() {
return this->coordinate;
}
+double Particle::get_current_value() {
+ return this->current_val;
+}
+
double Particle::get_optimal_value() {
return this->optimal_value;
}
-void Particle::get_optimal_coordinate(double *ref_coordinate) {
+void Particle::get_optimal_coordinate(std::vector<double> &ref_coordinate) {
for( unsigned int i = 0; i < this->coordinate_dim; ++i ){
ref_coordinate[i] = this->optimal_coordinate[i];
}
}
-double Particle::change_coordinate(double w, double c1, double c2, double *glob_min_coord, double penalty_coef) {
+double Particle::change_coordinate(double w, double c1, double c2, std::vector<double> glob_min_coord, std::vector<std::vector<double>> global_min_vec, double penalty_coef) {
/**
- * v = w * v + c1r1(p_min_loc - x) + c2r2(p_min_glob - x)
+ * v = w * v + c1r1(p_min_loc - x) + c2r2(p_min_glob - x) + c3r3(random_global_min - x)
* x = x + v
*/
@@ -93,8 +95,22 @@ double Particle::change_coordinate(double w, double c1, double c2, double *glob_
double output;
bool in_domain;
double compensation_coef = 1;
+
+ /* Choose random global minima */
+ std::vector<double> random_global_best(this->coordinate_dim);
+ std::random_device rand_dev;
+ std::mt19937 engine{rand_dev()};
+ std::uniform_int_distribution<int> dist(0, global_min_vec.size() - 1);
+ random_global_best = global_min_vec[dist(engine)];
+
+ // TODO use std::sample to choose random vector
+ //std::sample(global_min_vec.begin(), global_min_vec.end(), std::back_inserter(random_global_best), 1, std::mt19937{std::random_device{}()});
+
for(unsigned int i = 0; i < this->coordinate_dim; ++i){
- vel_mem = w * this->velocity[i] + c1 * this->r1 * (this->optimal_coordinate[i] - this->coordinate[i]) + c2 * this->r2 * (glob_min_coord[i] - this->coordinate[i]);
+ vel_mem = w * this->velocity[i]
+ + c1 * this->r1 * (this->optimal_coordinate[i] - this->coordinate[i])
+ + c2 * this->r2 * (glob_min_coord[i] - this->coordinate[i])
+ + (c1+c2)/2 * this->r3 * (random_global_best[i] - this->coordinate[i]);
do{
if (this->coordinate[i] + vel_mem > this->domain_bounds[2 * i + 1]) {
@@ -118,6 +134,7 @@ double Particle::change_coordinate(double w, double c1, double c2, double *glob_
}
vel_mem = this->ef->eval(this->coordinate);
+ this->current_val = vel_mem;
if(vel_mem < this->optimal_value){
this->optimal_value = vel_mem;
@@ -149,6 +166,8 @@ ParticleSwarm::ParticleSwarm(ErrorFunction* ef, double *domain_bounds,
this->c2 = c2;
+ this->c3 = (c1 + c2)/2.0;
+
this->w = w;
this->n_particles = n_particles;
@@ -191,7 +210,8 @@ void ParticleSwarm::optimize( double gamma, double epsilon, double delta) {
unsigned int outer_it = 0;
Particle *particle;
- double *p_min_glob = new double[this->func_dim];
+ std::vector<double> p_min_glob(this->func_dim);
+ std::vector<std::vector<double>> global_best_vec;
double optimal_value = 0.0;
std::set<Particle*> cluster; //!< Particles in a cluster
@@ -213,9 +233,16 @@ void ParticleSwarm::optimize( double gamma, double epsilon, double delta) {
// Clustering algorithm - termination condition //
//////////////////////////////////////////////////
particle = this->determine_optimal_coordinate_and_value(p_min_glob, optimal_value);
+
+ if(std::find(global_best_vec.begin(), global_best_vec.end(), p_min_glob) == global_best_vec.end()) {
+ global_best_vec.emplace_back(p_min_glob); // TODO rewrite as std::set
+ }
+
cluster.insert(particle);
- for(unsigned int i=0; i < 5; i++) {
+ //for(unsigned int i=0; i < 5; i++) {
+ /* Zero AVG coordinates */
+ std::fill(coords, coords+this->func_dim, 0);
/* Looking for a centroid */
for (auto it : cluster) {
@@ -231,7 +258,7 @@ void ParticleSwarm::optimize( double gamma, double epsilon, double delta) {
for(unsigned int pi=0; pi < this->n_particles; pi++) {
particle = this->particle_swarm[pi];
- tmp_velocity = particle->change_coordinate( this->w, this->c1, this->c2, p_min_glob);
+ tmp_velocity = particle->change_coordinate( this->w, this->c1, this->c2, p_min_glob, global_best_vec);
if(tmp_velocity > max_velocity) {
prev_max_velocity = max_velocity;
@@ -249,20 +276,28 @@ void ParticleSwarm::optimize( double gamma, double epsilon, double delta) {
cluster.insert(particle);
}
}
- }
+ //}
prev_max_vel_step = max_vel_step;
max_vel_step = max_velocity - prev_max_velocity;
+ //TODO only in verbose mode
+ euclidean_dist /= this->n_particles;
+ //printf("Iteration %d, avg euclidean distance: %f, cluster percent: %f, f-value: %f\n", outer_it, euclidean_dist,
+// double(cluster.size())/this->n_particles, optimal_value);
+
+// for(unsigned int i=0; i < this->n_particles; i++) {
+// printf("Particle %d (%f): \n", i, this->particle_swarm[i]->get_current_value());
+// for(unsigned int j=0; j < this->func_dim; j++) {
+// printf("\t%f\n", this->particle_swarm[i]->get_coordinate()[j]);
+// }
+// }
+
/* Check if the particles are near to each other AND the maximal velocity is less than 'gamma' */
if(double(cluster.size())/this->n_particles > delta && std::abs(prev_max_vel_step/max_vel_step) > gamma) {
break;
}
- //TODO only in verbose mode
- euclidean_dist /= this->n_particles*5.;
- printf("Iteration %d, avg euclidean distance: %f\n", outer_it, euclidean_dist);
-
outer_it++;
// this->w *= 0.99;
}
@@ -283,11 +318,11 @@ void ParticleSwarm::optimize( double gamma, double epsilon, double delta) {
}
}
- delete [] p_min_glob;
+ //delete [] p_min_glob; // TODO
delete [] coords;
}
-Particle* ParticleSwarm::determine_optimal_coordinate_and_value(double *coord, double &val) {
+Particle* ParticleSwarm::determine_optimal_coordinate_and_value(std::vector<double> &coord, double &val) {
Particle* p;
diff --git a/src/LearningMethods/ParticleSwarm.h b/src/LearningMethods/ParticleSwarm.h
index 765b3d379651152d9cab50fcfde86da2eebe908c..f98258a00140632504834856eb71755fd293a2a9 100644
--- a/src/LearningMethods/ParticleSwarm.h
+++ b/src/LearningMethods/ParticleSwarm.h
@@ -8,8 +8,14 @@
#ifndef INC_4NEURO_PARTICLESWARM_H
#define INC_4NEURO_PARTICLESWARM_H
-#include "stdlib.h"
-#include "time.h"
+#include <cstdlib>
+#include <ctime>
+#include <cmath>
+#include <set>
+#include <stdexcept>
+#include <random>
+#include <iterator>
+#include <algorithm>
#include "../Network/NeuralNetwork.h"
#include "../DataSet/DataSet.h"
@@ -28,6 +34,9 @@ private:
double r1;
double r2;
+ double r3;
+
+ double current_val;
ErrorFunction* ef;
@@ -50,6 +59,12 @@ public:
*/
double* get_coordinate();
+ /**
+ *
+ * @return
+ */
+ double get_current_value();
+
/**
*
* @return
@@ -60,7 +75,7 @@ public:
*
* @param ref_coordinate
*/
- void get_optimal_coordinate(double *ref_coordinate);
+ void get_optimal_coordinate(std::vector<double> &ref_coordinate);
/**
*
@@ -70,7 +85,7 @@ public:
* @param glob_min_coord
* @param penalty_coef
*/
- double change_coordinate(double w, double c1, double c2, double* glob_min_coord, double penalty_coef=0.25);
+ double change_coordinate(double w, double c1, double c2, std::vector<double> glob_min_coord, std::vector<std::vector<double>> global_min_vec, double penalty_coef=0.25);
};
@@ -98,6 +113,8 @@ private:
double c2;
+ double c3;
+
double w;
double global_optimal_value;
@@ -111,7 +128,7 @@ protected:
* @param val
* @return
*/
- Particle* determine_optimal_coordinate_and_value(double *coord, double &val);
+ Particle* determine_optimal_coordinate_and_value(std::vector<double> &coord, double &val);
/**
*
diff --git a/src/NetConnection/Connection.cpp b/src/NetConnection/Connection.cpp
deleted file mode 100644
index 25eb8c90e42d7e32acbb0ac0f7eeaf2c47135ca4..0000000000000000000000000000000000000000
--- a/src/NetConnection/Connection.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * DESCRIPTION OF THE FILE
- *
- * @author Michal KravÄenko
- * @date 13.6.18 -
- */
-
-#include "Connection.h"
-
-Connection* Connection::get_copy(Neuron *n_in, Neuron *n_out){
- Connection *output = new Connection(n_in, n_out, this->con, false);
- return output;
-}
-
-Connection::Connection(Neuron *n_in, Neuron *n_out, ConnectionWeight* con, bool del_weight) {
- this->neuron_in = n_in;
- this->neuron_out = n_out;
-
- this->con = con;
- this->delete_connection = del_weight;
-}
-
-Connection::~Connection() {
- if(this->con && this->delete_connection ){
- delete this->con;
- this->con = nullptr;
- }
-}
-
-void Connection::adjust_weights(double* values) {
- this->con->adjust_weights(values);
-}
-
-
-Neuron* Connection::get_neuron_in() {
- return this->neuron_in;
-}
-
-Neuron* Connection::get_neuron_out() {
- return this->neuron_out;
-}
-
-//double Connection::get_weight() {
-// return this->weight;
-//}
-
-void Connection::pass_signal() {
-#ifdef VERBOSE_NN_EVAL
- printf(" passing signal between neurons %d -> %d, value: %f * %f\n", this->neuron_in, this->neuron_out, this->neuron_in->get_state(), this->con->eval());
-#endif
- this->neuron_out->adjust_potential(this->neuron_in->get_state() * this->con->eval());
-}
-
-void Connection::set_weights(double *values) {
- this->con->set_weights(values);
-}
diff --git a/src/NetConnection/Connection.h b/src/NetConnection/Connection.h
deleted file mode 100644
index b9895f32ff29223c804c07ab886b08d06df7b6f0..0000000000000000000000000000000000000000
--- a/src/NetConnection/Connection.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * DESCRIPTION OF THE FILE
- *
- * @author Michal KravÄenko
- * @date 13.6.18 -
- */
-
-#ifndef INC_4NEURO_CONNECTION_H
-#define INC_4NEURO_CONNECTION_H
-
-#include "../Neuron/Neuron.h"
-#include "ConnectionWeight.h"
-#include "../settings.h"
-
-class Neuron;
-class ConnectionWeight;
-
-/**
- * Class representing directed connection between two neurons
- */
-class Connection {
-private:
-
- /**
- * Pointer to an object evaluating the weight function
- */
- ConnectionWeight *con = nullptr;
- /**
- * Pointer to the Neuron on the receiving end of this connection
- */
- Neuron *neuron_in = nullptr;
-
- /**
- * Pointer to the Neuron on the signaling end of this connection
- */
- Neuron *neuron_out = nullptr;
-
- /**
- *
- */
- bool delete_connection = true;
-
-
- //TODO pridat gradient pro ucely backpropagation
-
-public:
-
- /**
- * Returns a new object reprresenting an edge using the same weight function as this one
- * @param n_in
- * @param n_out
- * @return
- */
- virtual Connection* get_copy(Neuron *n_in, Neuron *n_out) final;
-
- /**
- *
- * @param n_in
- * @param n_out
- * @param con
- * @param delete_weight
- */
- Connection(Neuron *n_in, Neuron *n_out, ConnectionWeight* con, bool delete_weight = true);
-
- /**
- * Destructor, deletes the 'con' object
- */
- ~Connection();
-
- /**
- * Takes the array of double values and alters the corresponding weights associated
- * with the 'con' object
- * @param[in] values Values to be added to the associated weights
- */
- void adjust_weights(double *values);
-
- /**
- * Takes the array of double values and sets the corresponding weights associated
- * with the 'con' object
- * @param[in] values Values to be set to the associated weights
- */
- void set_weights(double *values);
-
- /**
- * Takes the output signal of Neuron 'neuron_out', multiplies it by the result of the
- * weight function associated with this connection and adds the result to the potential
- * of the Neuron 'neuron_in'
- */
- void pass_signal();
-
-
- /**
- * Returns the pointer to the Neuron on the receiving end of this connection
- * @return
- */
- Neuron* get_neuron_in();
-
- /**
- * Returns the pointer to the Neuron on the signaling end of this connection
- * @return
- */
- Neuron* get_neuron_out();
-
-};
-
-
-#endif //INC_4NEURO_CONNECTION_H
diff --git a/src/NetConnection/ConnectionWeight.cpp b/src/NetConnection/ConnectionFunctionGeneral.cpp
similarity index 100%
rename from src/NetConnection/ConnectionWeight.cpp
rename to src/NetConnection/ConnectionFunctionGeneral.cpp
diff --git a/src/NetConnection/ConnectionWeight.h b/src/NetConnection/ConnectionFunctionGeneral.h
similarity index 100%
rename from src/NetConnection/ConnectionWeight.h
rename to src/NetConnection/ConnectionFunctionGeneral.h
diff --git a/src/NetConnection/ConnectionFunctionIdentity.cpp b/src/NetConnection/ConnectionFunctionIdentity.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b69160f489296576ca71e5cb99a6ada39c8a7eaf
--- /dev/null
+++ b/src/NetConnection/ConnectionFunctionIdentity.cpp
@@ -0,0 +1,16 @@
+/**
+ * DESCRIPTION OF THE FILE
+ *
+ * @author Michal KravÄenko
+ * @date 14.6.18 -
+ */
+
+#include "ConnectionWeightIdentity.h"
+
+ConnectionWeightIdentity::ConnectionWeightIdentity(double * val) {
+ this->value = val;
+}
+
+double ConnectionWeightIdentity::eval() {
+ return (*this->value);
+}
\ No newline at end of file
diff --git a/src/NetConnection/ConnectionWeightIdentity.h b/src/NetConnection/ConnectionFunctionIdentity.h
similarity index 61%
rename from src/NetConnection/ConnectionWeightIdentity.h
rename to src/NetConnection/ConnectionFunctionIdentity.h
index 2b214abaee05cad7cbe2de3a5210a599962ac3d7..d1d9c8d0f934c08812667f07addb884a1d4fad26 100644
--- a/src/NetConnection/ConnectionWeightIdentity.h
+++ b/src/NetConnection/ConnectionFunctionIdentity.h
@@ -8,21 +8,22 @@
#ifndef INC_4NEURO_CONNECTIONWEIGHTIDENTITY_H
#define INC_4NEURO_CONNECTIONWEIGHTIDENTITY_H
-#include "ConnectionWeight.h"
+#include "ConnectionFunctionGeneral.h"
-class ConnectionWeight;
+class ConnectionFunctionGeneral;
/**
*
*/
-class ConnectionWeightIdentity:public ConnectionWeight {
+class ConnectionWeightIdentity:public ConnectionFunctionGeneral {
private:
+ double * value = nullptr;
public:
/**
*
*/
- ConnectionWeightIdentity(std::vector<double>* w_array);
+ ConnectionWeightIdentity(double * value_ptr);
/**
*
diff --git a/src/NetConnection/ConnectionWeightIdentity.cpp b/src/NetConnection/ConnectionWeightIdentity.cpp
deleted file mode 100644
index ad3ffc0c8be7b7e06f9a71e9fb4718f7dc9d08dd..0000000000000000000000000000000000000000
--- a/src/NetConnection/ConnectionWeightIdentity.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * DESCRIPTION OF THE FILE
- *
- * @author Michal KravÄenko
- * @date 14.6.18 -
- */
-
-#include "ConnectionWeightIdentity.h"
-
-ConnectionWeightIdentity::ConnectionWeightIdentity(std::vector<double>* w_array) {
- this->n_params = 1;
- this->weight_array = w_array;
-
- this->param_indices = new int[1];
-}
-
-double ConnectionWeightIdentity::eval() {
-
- double a = this->weight_array->at(this->param_indices[0]);
-
- return a;
-}
\ No newline at end of file
diff --git a/src/Neuron/NeuronNeuralNet.cpp b/src/Neuron/NeuronConstant.cpp
similarity index 58%
rename from src/Neuron/NeuronNeuralNet.cpp
rename to src/Neuron/NeuronConstant.cpp
index 70d1307df87a7535ba109c1f4309726c51116aa7..a656c3f628dd7e4d0716435f363f9f6c0688d5b6 100644
--- a/src/Neuron/NeuronNeuralNet.cpp
+++ b/src/Neuron/NeuronConstant.cpp
@@ -2,7 +2,7 @@
* DESCRIPTION OF THE FILE
*
* @author Michal KravÄenko
- * @date 13.6.18 -
+ * @date 8.8.18 -
*/
-#include "NeuronNeuralNet.h"
+#include "NeuronConstant.h"
diff --git a/src/Neuron/NeuronConstant.h b/src/Neuron/NeuronConstant.h
new file mode 100644
index 0000000000000000000000000000000000000000..dff05a073c18122b477e414dd30585b39837c095
--- /dev/null
+++ b/src/Neuron/NeuronConstant.h
@@ -0,0 +1,17 @@
+/**
+ * DESCRIPTION OF THE FILE
+ *
+ * @author Michal KravÄenko
+ * @date 8.8.18 -
+ */
+
+#ifndef INC_4NEURO_NEURONCONSTANT_H
+#define INC_4NEURO_NEURONCONSTANT_H
+
+
+class NeuronConstant {
+
+};
+
+
+#endif //INC_4NEURO_NEURONCONSTANT_H
diff --git a/src/Neuron/NeuronNeuralNet.h b/src/Neuron/NeuronNeuralNet.h
deleted file mode 100644
index 35cb2a3ac180c2ca8a8201e4dbb66bcccb78568d..0000000000000000000000000000000000000000
--- a/src/Neuron/NeuronNeuralNet.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * DESCRIPTION OF THE FILE
- *
- * @author Michal KravÄenko
- * @date 13.6.18 -
- */
-
-#ifndef INC_4NEURO_NEURONNEURALNET_H
-#define INC_4NEURO_NEURONNEURALNET_H
-
-#include "Neuron.h"
-
-class NeuronNeuralNet:public Neuron {
-
-};
-
-
-#endif //INC_4NEURO_NEURONNEURALNET_H
diff --git a/src/Neuron/NeuronTanh.cpp b/src/Neuron/NeuronTanh.cpp
deleted file mode 100644
index cef2a07faedf044e19f06c368b0729d5c1756bb0..0000000000000000000000000000000000000000
--- a/src/Neuron/NeuronTanh.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// Created by fluffymoo on 11.6.18.
-//
-
-#include "NeuronTanh.h"
-
-Neuron* NeuronTanh::get_copy( ){
- NeuronTanh* output = new NeuronTanh( this->activation_function_parameters[0]);
-
- return output;
-}
-
-NeuronTanh::NeuronTanh(double a) {
-
- this->n_activation_function_parameters = 1;
- this->activation_function_parameters = new double[1];
- this->activation_function_parameters[0] = a;
-
- this->edges_in = new std::vector<Connection*>(0);
- this->edges_out = new std::vector<Connection*>(0);
-
-}
-
-void NeuronTanh::activate( ) {
-
- double a = this->activation_function_parameters[0];
- double x = this->potential;
- double ex = std::pow(E, x - a);
- double exi = 1.0 / ex;
-
- this->state = (ex - exi) / (ex + exi);
-
-}
-
-double NeuronTanh::activation_function_eval_partial_derivative(int param_idx) {
-
- double a = this->activation_function_parameters[0];
- double x = this->potential;
-
-
- if(param_idx == 0){
- /**
- * TODO
- * Same as activation_function_get_derivative()
- */
- double ex = -4.0 * std::pow(E, 2.0 * (x + a));
- double exi = std::pow(E, 2.0 * a) + std::pow(E, 2.0 * x);
-
- return ex / (exi * exi);
- }
-
- return 0.0;
-
-}
-
-double NeuronTanh::activation_function_eval_derivative( ) {
-
- double a = this->activation_function_parameters[0];
- double x = this->potential;
- double ex = -4.0 * std::pow(E, 2.0 * (x + a));
- double exi = std::pow(E, 2.0 * a) + std::pow(E, 2.0 * x);
-
- return ex / (exi * exi);
-}
-
-Neuron* NeuronTanh::get_derivative() {
- return nullptr;
-}
\ No newline at end of file
diff --git a/src/Neuron/NeuronTanh.h b/src/Neuron/NeuronTanh.h
deleted file mode 100644
index 3d5ce6d8aabf4ad6bcabb55193612606dde7241d..0000000000000000000000000000000000000000
--- a/src/Neuron/NeuronTanh.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * DESCRIPTION OF THE CLASS
- *
- * @author Martin Beseda
- * @author Martin Mrovec
- * @author Michal KravÄenko
- * @date 2017 - 2018
- */
-
-#ifndef INC_4NEURO_NEURONTANH_H
-#define INC_4NEURO_NEURONTANH_H
-
-#include <cmath>
-#include "Neuron.h"
-#include "../constants.h"
-
-class NeuronTanh:public Neuron, public IDifferentiable {
- friend class boost::serialization::access;
-
-protected:
- template<class Archive>
- void serialize(Archive & ar, const unsigned int version){
- //TODO separate implementation to NeuronLogistic.cpp!
- ar & boost::serialization::base_object<Neuron>(*this);
- };
-
-public:
-
- Neuron* get_copy( );
-
- /**
- * Constructs the object of the Hyperbolic Tangent >neuron with activation function
- * f(x) = (e^(x-a) - e^(a-x))/(e^(x-a) + e^(a-x))
- * @param[in] a First coefficient, stored in activation_function_parameters[0]
- */
- explicit NeuronTanh(double a = 0.0);
-
- /**
- * Evaluates '(e^(x-a) - e^(a-x))/(e^(x-a) + e^(a-x))' and stores the result into the 'state' property
- */
- void activate( ) override;
-
- /**
- * Calculates the partial derivative of the activation function
- * f(x) = (e^(x-a) - e^(a-x))/(e^(x-a) + e^(a-x))
- * @param[in] param_idx Index of the parameter to calculate derivative of
- * @return Partial derivative of the activation function according to the
- * 'param_idx'-th parameter.
- */
- double activation_function_eval_partial_derivative(int param_idx) override;
-
- /**
- * TODO
- * Wrong return statement, there is no b
- * Calculates d/dx of (e^(x-a) - e^(a-x))/(e^(x-a) + e^(a-x))
- * @return a * e^(b - x) * [e^(b - x) + 1]^(-a)
- */
- double activation_function_eval_derivative( ) override;
-
- /**
- * Returns a pointer to a Neuron with derivative as its activation function
- * @return
- */
- Neuron* get_derivative() override;
-};
-
-
-#endif //INC_4NEURO_NEURONTANH_H
diff --git a/src/tests/Connection_test.cpp b/src/tests/Connection_test.cpp
deleted file mode 100644
index 027c696c88e37e52175937f74bf15fd80dcc55a3..0000000000000000000000000000000000000000
--- a/src/tests/Connection_test.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * DESCRIPTION OF THE CLASS
- *
- * @author David Vojtek
- * @date 2018
- */
-
-#define BOOST_TEST_NO_MAIN
-
-#include <boost/test/unit_test.hpp>
-
-
-#include "../NetConnection/Connection.h"
-#include "../NetConnection/ConnectionWeight.h"
-#include "../Neuron/NeuronLinear.h"
-#include <iostream>
-/**
- * Boost testing suite for testing Connection.h
- */
-
-BOOST_AUTO_TEST_SUITE(Connection_test)
-
- /**
- * Test of constructor of Connection
- */
- BOOST_AUTO_TEST_CASE(Connection_construction__test) {
-
- Neuron *neuron1 = new NeuronLinear(2, 3);
- Neuron *neuron2 = new NeuronLinear(4, 5);
- std::vector<double> w_array = {2, 3, 4, 5, 6};
-
- ConnectionWeight *conn = new ConnectionWeight(2, &w_array);
- Connection connection(neuron1, neuron2, conn);
- //Test of correct input neuron
- BOOST_CHECK_EQUAL(neuron1, connection.get_neuron_in());
- //Test of correct output neuron
- BOOST_CHECK_EQUAL(neuron2, connection.get_neuron_out());
- }
-
- /**
- * Test of pass_signal method
- */
- BOOST_AUTO_TEST_CASE(Connection_pass_signal_test) {
-
- Neuron *neuron1 = new NeuronLinear(2, 3);
- Neuron *neuron2 = new NeuronLinear(4, 5);
- std::vector<double> w_array = {2, 3, 4, 5, 6};
- std::function<double(double *, int *, int)> f = [](double *weight_array, int *index_array, int n_params) {
- double a = weight_array[0];
- double b = weight_array[1];
- return (a + 1.5 * b);
- };
-
-
- ConnectionWeight *conn = new ConnectionWeight(2, &w_array);
-
- Connection connection(neuron1, neuron2, conn);
-
- neuron1->activate();
- neuron2->activate();
- // test of neuron state before passing signal
- BOOST_CHECK_EQUAL(4, neuron2->get_state());
- connection.pass_signal();
- neuron2->activate();
- // test of neuron state after passing signal
- BOOST_CHECK_EQUAL(7204, neuron2->get_state());
-
- }
-
-
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
diff --git a/src/tests/NeuronLogistic_test.cpp b/src/tests/NeuronLogistic_test.cpp
index 7d3e9fe4bcca31c993e99951b8943089a80a7786..e33d8fbfa9b961320ceb2489aa7974b7e5ef19ed 100644
--- a/src/tests/NeuronLogistic_test.cpp
+++ b/src/tests/NeuronLogistic_test.cpp
@@ -44,11 +44,11 @@ BOOST_AUTO_TEST_SUITE(neuronLogistic_test)
NeuronLogistic neuron(3.0, 2.0);
//Test of correct output of activation_function_get_derivative method
- BOOST_CHECK_CLOSE(0.00447566759338, neuron.activation_function_eval_derivative(), 0.00001);
+ BOOST_CHECK_CLOSE(0.0042850850699, neuron.activation_function_eval_derivative(), 0.00001);
//Tests of correct outputs of activation_function_get_partial_derivative method
- BOOST_CHECK_CLOSE(-0.0036025788498, neuron.activation_function_eval_partial_derivative(0), 0.00001);
- BOOST_CHECK_CLOSE(-0.0044756675933, neuron.activation_function_eval_partial_derivative(1), 0.00001);
+ BOOST_CHECK_CLOSE(-0.0068569236644, neuron.activation_function_eval_partial_derivative(0), 0.00001);
+ BOOST_CHECK_CLOSE(-0.0042850850699, neuron.activation_function_eval_partial_derivative(1), 0.00001);
BOOST_CHECK_EQUAL(0.0, neuron.activation_function_eval_partial_derivative(10000));
}
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/tests/NeuronTanh.cpp b/src/tests/NeuronTanh.cpp
deleted file mode 100644
index cac6e0982d00011a03c6917ca6f5b439e7527d96..0000000000000000000000000000000000000000
--- a/src/tests/NeuronTanh.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * DESCRIPTION OF THE CLASS
- *
- * @author David Vojtek
- * @date 2018
- */
-
-#define BOOST_TEST_NO_MAIN
-
-#include <boost/test/unit_test.hpp>
-
-#include "../Neuron/NeuronTanh.h"
-/**
- * Boost testing suite for testing NeuronTanh.h
- * doesn't test inherited methods
- */
-BOOST_AUTO_TEST_SUITE(neuronTanh_test)
-
- /**
- * Test of creating new instance of NeuronTanh
- */
- BOOST_AUTO_TEST_CASE(neuronTanh_construction__test) {
- NeuronTanh neuron(1.745);
- //Test of correct value of activation function parameter
- BOOST_CHECK_EQUAL(neuron.activation_function_get_parameter(0), 1.745);
- }
-
- /**
- * Test of activate method
- */
- BOOST_AUTO_TEST_CASE(neuronTanh_activate__test) {
- NeuronTanh neuron(2.0);
- neuron.activate();
- //Test of correct state after activate neuron
- BOOST_CHECK_CLOSE(-0.96402758007581, neuron.get_state(), 0.00001);
- }
-
- /**
- * Test of derivative methods
- */
- BOOST_AUTO_TEST_CASE(neuronTanh_derivative_test) {
- NeuronTanh neuron(2.0);
-
- //Test of correct output of activation_function_get_derivative method
- BOOST_CHECK_CLOSE(-0.0706508248531644, neuron.activation_function_eval_derivative(), 0.00001);
- //Tests of correct outputs of activation_function_get_partial_derivative method
- BOOST_CHECK_CLOSE(-0.0706508248531644, neuron.activation_function_eval_partial_derivative(0), 0.00001);
- BOOST_CHECK_EQUAL(0.0, neuron.activation_function_eval_partial_derivative(10000));
- }
-
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file