diff --git a/artifact/generate_results.sh b/artifact/generate_results.sh
index 746b5811fa216f40eaa7ecfff109de59aea0b69d..302d56cdc1fd786c0eb02127332d311495749339 100755
--- a/artifact/generate_results.sh
+++ b/artifact/generate_results.sh
@@ -1,8 +1,4 @@
#!/bin/bash
-MATLABPATH="/usr/local"
-#MATLABPATH="/Applications/MATLAB_R2017a.app"
-MATLABPROGRAM="$MATLABPATH/bin/matlab"
-
round()
{
echo $(printf %.$2f $(echo "scale=$2;(((10^$2)*$1)+0.5)/(10^$2)" | bc))
@@ -19,8 +15,7 @@ export skewfactor=0.75 # probability of lower execution time than half
# folder for results
export R=results
-# remove and create results folder
-rm -rf $R
+# create results folder
mkdir -p $R
cd $R
export R=`pwd`
@@ -72,16 +67,8 @@ wait $pid7
# done with simulator
rm -f simulator
echo "------------------------------------------------"
-echo "data generation terminated, starting processing"
-
-# run matlab script
-cd matlab
-P=\'$R\'
-export LC_ALL LC_ALL="en_GB.utf8"
-$MATLABPROGRAM -nodisplay -nosplash -nodesktop -r "run_all_tests_matlab($P);exit;" >/dev/null
-cd ..
+echo "data generation terminated"
echo "------------------------------------------------"
-echo "data processing terminated"
# back out of src
cd ..
diff --git a/artifact/process_results.sh b/artifact/process_results.sh
new file mode 100755
index 0000000000000000000000000000000000000000..32a4d20d301e3d994fdc988d07357c0692b44b6f
--- /dev/null
+++ b/artifact/process_results.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+MATLABPATH="/usr/local"
+#MATLABPATH="/Applications/MATLAB_R2017a.app"
+MATLABPROGRAM="$MATLABPATH/bin/matlab"
+
+# result folder handling
+export R=results
+cd $R
+export R=`pwd`
+cd ..
+
+echo "------------------------------------------------"
+# run matlab script
+cd src/matlab
+P=\'$R\'
+export LC_ALL LC_ALL="en_GB.utf8"
+$MATLABPROGRAM -nodisplay -nosplash -nodesktop -r "run_all_tests_matlab($P);exit;" >/dev/null
+echo "------------------------------------------------"
+echo "data processing terminated"
+echo "------------------------------------------------"
+
+# back out of src
+cd ../..
+
diff --git a/artifact/src/matlab/run_all_tests_matlab.m b/artifact/src/matlab/run_all_tests_matlab.m
index fa9c7b60ff5003b5f456f9f395fe4a25c22e198e..0ab561fad0ec7c37c7da187901a3389737f04cfc 100644
--- a/artifact/src/matlab/run_all_tests_matlab.m
+++ b/artifact/src/matlab/run_all_tests_matlab.m
@@ -11,12 +11,11 @@ function run_all_tests_matlab(name_folder)
if strcmp(name_subf,'n5_u70_f25')
ctl_eval_wclassic(folder_name);
- ctl_eval_fo(folder_name);
+ ctl_eval_fo(folder_name);
else
ctl_eval(folder_name);
end
fprintf(2, 'Matlab wrote results for %s\n', name_subf)
end
- fprintf(2, '------------------------------------------------\n' );
end