Merge pull request #8 from DCM-UPB/update_ffnn_hotfix

Updated lib for changed FFNN interface

Author: Ithanil

config_template.sh

@@ -10,14 +10,14 @@ CC="g++"
 FLAGS="-std=c++11 -Wall -Werror"
 
 # Optimization flags
-OPTFLAGS="-O3"
+OPTFLAGS="-O3 -flto"
 
 # Debuggin flags
 DEBUGFLAGS="-g -O0"
 
 #FFNN Library (used in ex3)
 FFNN_FOLDER="/...../FeedForwardNeuralNetwork"
-IFFNN="-I${FFNN_FOLDER}/src/"
+IFFNN="-I${FFNN_FOLDER}/include/"
 LFFNN="-L${FFNN_FOLDER}"
 LIBNAMEFFNN="ffnn"
 LIBFFNN="-lffnn"

debug/unittests/run_single_unittest.sh

@@ -17,7 +17,7 @@ $CC $FLAGS $DEBUGFLAGS -Wall -I${ROOT_FOLDER}/src/ -c *.cpp
 
 case ${OS_NAME} in
     "Linux")
-        $CC $FLAGS $DEBUGFLAGS -L${ROOT_FOLDER} -Wl,-rpath=${RPATH} -o exe *.o -l${LIBNAME}
+        $CC $FLAGS $DEBUGFLAGS -L${ROOT_FOLDER} -Wl,-rpath=${ROOT_FOLDER} -o exe *.o -l${LIBNAME}
         ;;
     "Darwin")
         $CC $FLAGS $DEBUGFLAGS -L${ROOT_FOLDER} -o exe *.o -l${LIBNAME}

examples/ex3/main.cpp

@@ -39,7 +39,7 @@ class MyInterfaces: public MCISamplingFunctionInterface, public MCIObservableFun
 public:
     MyInterfaces(FeedForwardNeuralNetwork * bare_ffnn, FeedForwardNeuralNetwork * deriv_ffnn)
         : MCISamplingFunctionInterface(1, 1),
-            MCIObservableFunctionInterface(1, 3+deriv_ffnn->getNBeta()),
+            MCIObservableFunctionInterface(1, 3+deriv_ffnn->getNVariationalParameters()),
             MCICallBackOnAcceptanceInterface(1){
         _bare_ffnn = bare_ffnn;
         _deriv_ffnn = deriv_ffnn;
@@ -87,6 +87,7 @@ int main(){
 
     FeedForwardNeuralNetwork * deriv_ffnn = new FeedForwardNeuralNetwork(2, 10, 2);
     deriv_ffnn->connectFFNN();
+    deriv_ffnn->assignVariationalParameters();
     FeedForwardNeuralNetwork * bare_ffnn = new FeedForwardNeuralNetwork(deriv_ffnn);
     deriv_ffnn->addFirstDerivativeSubstrate();
     deriv_ffnn->addSecondDerivativeSubstrate();