Merge remote-tracking branch 'origin/170-receive-complete-message-graph' into 170-receive-complete-message-graph

Author: matildeRivas

test/test.sh

@@ -17,37 +17,37 @@ unzip -q target_results.zip
 PATH=../Cell2Fire:$PATH
 
 # run
-set -x # enable debug tracing
+# set -x # enable debug tracing
 for format in asc tif; do
 	for model in fbp kitral sb portugal; do
-	  for msg in all normal; do
-      echo running $model-$format-$msg
-      output_folder=test_results/$model-$format-$msg
-      mkdir -p $output_folder
-      rm -rf $output_folder/*
-      if [ "$model" == "fbp" ]; then
-        additional_args="--cros"
-        sim_code="C"
-      elif [ "$model" == "sb" ]; then
-        additional_args="--scenario 1"
-        sim_code="S"
-      elif [ "$model" == "portugal" ]; then
-        additional_args="--scenario 1 "
-        sim_code="P"
-      elif [ "$model" == "kitral" ]; then
-        additional_args=""
-        sim_code="K"
-      fi
-      if [ "$msg" == "all" ]; then
-        msgs="--all-messages"
-      elif [ "$msg" == "normal" ]; then
-        msgs="--output-messages"
-      fi
-      Cell2Fire$1 --input-instance-folder model/$model-$format --output-folder $output_folder --nsims 113 --grids --out-intensity --sim ${sim_code} --seed 123 --ignitionsLog ${msgs} ${additional_args} >test_results/$model-$format-$msg/log.txt
-	  done
+		for msg in all normal; do
+			echo running $model-$format-$msg
+			output_folder=test_results/$model-$format-$msg
+			mkdir -p $output_folder
+			rm -rf $output_folder/*
+			if [ "$model" == "fbp" ]; then
+				additional_args="--cros"
+				sim_code="C"
+			elif [ "$model" == "sb" ]; then
+				additional_args="--scenario 1"
+				sim_code="S"
+			elif [ "$model" == "portugal" ]; then
+				additional_args="--scenario 1 "
+				sim_code="P"
+			elif [ "$model" == "kitral" ]; then
+				additional_args=""
+				sim_code="K"
+			fi
+			if [ "$msg" == "all" ]; then
+				msgs="--all-messages"
+			elif [ "$msg" == "normal" ]; then
+				msgs="--output-messages"
+			fi
+			Cell2Fire$1 --input-instance-folder model/$model-$format --output-folder $output_folder --nsims 113 --grids --out-intensity --sim ${sim_code} --seed 123 --ignitionsLog ${msgs} ${additional_args} >test_results/$model-$format-$msg/log.txt
+		done
 	done
 done
-set +x # disable debug tracing
+# set +x # disable debug tracing
 
 # find difference between directories and files
 
@@ -56,11 +56,11 @@ dir1="test_results"
 dir2="target_results"
 
 # get the list of files in each directory
-dir1_files=$(find "$dir1" -type f | sort)
-dir1_num_files=$(ls -1 $dir1_files | wc -l)
+# dir1_files=$(find "$dir1" -type f | sort)
+dir1_num_files=$(find "$dir1" -type f | wc -l)
 # echo $dir1_files $dir1_num_files
-dir2_files=$(find "$dir2" -type f | sort)
-dir2_num_files=$(ls -1 $dir2_files | wc -l)
+# dir2_files=$(find "$dir2" -type f | sort)
+dir2_num_files=$(find "$dir2" -type f | wc -l)
 # echo $dir2_files $dir2_num_files
 
 # check if the number of files in each directory is equal
@@ -71,7 +71,7 @@ if [ $dir1_num_files -ne $dir2_num_files ]; then
 	exit 1
 fi
 # delete version line
-find test_results/ -name log.txt -type f | xargs sed -i -e '/version:/d'
+find test_results/ -name log.txt -type f -exec sed -i -e '/^version:/d' {} \;
 
 # use diff to compare the files in each directory
 diff_output=$(diff -rq "$dir1" "$dir2")