# HG changeset patch
# User Christian Urban <christian.urban@kcl.ac.uk>
# Date 1606577850 0
# Node ID 6cc36d0ef79e219832edee2a7dbb1e8458c76d78
# Parent  ddda2e76a40f5ecbb1d9339863ea127240c5b6a3
updated

diff -r ddda2e76a40f -r 6cc36d0ef79e main_testing1/drumb_test.sh
--- a/main_testing1/drumb_test.sh	Sat Nov 28 12:09:55 2020 +0000
+++ b/main_testing1/drumb_test.sh	Sat Nov 28 15:37:30 2020 +0000
@@ -23,7 +23,7 @@
 # purity test
 
 function scala_vars {
-   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
+   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|AtomicInteger|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
 }
 
 
diff -r ddda2e76a40f -r 6cc36d0ef79e main_testing2/danube_test.sh
--- a/main_testing2/danube_test.sh	Sat Nov 28 12:09:55 2020 +0000
+++ b/main_testing2/danube_test.sh	Sat Nov 28 15:37:30 2020 +0000
@@ -27,7 +27,7 @@
 # purity test
 
 function scala_vars {
-   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
+   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|AtomicInteger|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
 }
 
 
diff -r ddda2e76a40f -r 6cc36d0ef79e main_testing3/re_test.sh
--- a/main_testing3/re_test.sh	Sat Nov 28 12:09:55 2020 +0000
+++ b/main_testing3/re_test.sh	Sat Nov 28 15:37:30 2020 +0000
@@ -25,7 +25,7 @@
 # purity test
 
 function scala_vars {
-   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
+   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|AtomicInteger|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
 }
 
 
diff -r ddda2e76a40f -r 6cc36d0ef79e main_testing4/knight_test.sh
--- a/main_testing4/knight_test.sh	Sat Nov 28 12:09:55 2020 +0000
+++ b/main_testing4/knight_test.sh	Sat Nov 28 15:37:30 2020 +0000
@@ -31,7 +31,7 @@
 # purity test
 
 function scala_vars {
-   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
+   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|AtomicInteger|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
 }
 
 
@@ -72,65 +72,65 @@
 
 ### knight1 test
 
-if [ $tsts1 -eq 0 ]
-then
-    #echo -e "For testing needs to take 10 seconds or less to execute: " >> $out
-    echo -e " is_legal(8, Nil, (3, 4)) == true " >> $out
-    echo -e " is_legal(8, List((4, 1), (1, 0)), (4, 1)) == false " >> $out
-    echo -e " is_legal(2, Nil, (0, 0)) == true" >> $out                          
-
-    if (scala_assert "knight1.scala" "knight_test1.scala")
-    then
-        echo -e "  --> success" >> $out
-    else
-        echo -e "  --> \n ONE TEST FAILED\n" >> $out
-    fi
-fi
+#if [ $tsts1 -eq 0 ]
+#then
+#    #echo -e "For testing needs to take 10 seconds or less to execute: " >> $out
+#    echo -e " is_legal(8, Nil, (3, 4)) == true " >> $out
+#    echo -e " is_legal(8, List((4, 1), (1, 0)), (4, 1)) == false " >> $out
+#    echo -e " is_legal(2, Nil, (0, 0)) == true" >> $out                          
+#
+#    if (scala_assert "knight1.scala" "knight_test1.scala")
+#    then
+#        echo -e "  --> success" >> $out
+#    else
+#        echo -e "  --> \n ONE TEST FAILED\n" >> $out
+#    fi
+#fi
 
 ### knight2 test
 
-if [ $tsts1 -eq 0 ]
-then
-  #echo -e "For testing needs to take 10 seconds or less to execute: " >> $out
-  echo -e " legal_moves(8, Nil, (2,2)) == List((3,4), (4,3), (4,1), (3,0), (1,0), (0,1), (0,3), (1,4))" >> $out
-  echo -e " legal_moves(8, Nil, (7,7)) == List((6,5), (5,6))" >> $out
-  echo -e " legal_moves(8, List((4,1), (1,0)), (2,2)) == List((3,4), (4,3), (3,0), (0,1), (0,3), (1,4))" >> $out
-  echo -e " legal_moves(8, List((6,6)), (7,7)) == List((6,5), (5,6))" >> $out
-  echo -e " legal_moves(1, Nil, (0,0)) == Nil" >> $out
-  echo -e " legal_moves(2, Nil, (0,0)) == Nil" >> $out
-  echo -e " legal_moves(3, Nil, (0,0)) == List((1,2), (2,1))" >> $out
-  
-  if (scala_assert "knight1.scala" "knight_test2.scala")
-  then
-    echo -e "  --> success" >> $out
-  else
-    echo -e "  --> \n ONE TEST FAILED\n" >> $out
-  fi
-fi
+#if [ $tsts1 -eq 0 ]
+#then
+#  #echo -e "For testing needs to take 10 seconds or less to execute: " >> $out
+#  echo -e " legal_moves(8, Nil, (2,2)) == List((3,4), (4,3), (4,1), (3,0), (1,0), (0,1), (0,3), (1,4))" >> $out
+#  echo -e " legal_moves(8, Nil, (7,7)) == List((6,5), (5,6))" >> $out
+#  echo -e " legal_moves(8, List((4,1), (1,0)), (2,2)) == List((3,4), (4,3), (3,0), (0,1), (0,3), (1,4))" >> $out
+#  echo -e " legal_moves(8, List((6,6)), (7,7)) == List((6,5), (5,6))" >> $out
+#  echo -e " legal_moves(1, Nil, (0,0)) == Nil" >> $out
+#  echo -e " legal_moves(2, Nil, (0,0)) == Nil" >> $out
+#  echo -e " legal_moves(3, Nil, (0,0)) == List((1,2), (2,1))" >> $out
+#  
+#  if (scala_assert "knight1.scala" "knight_test2.scala")
+#  then
+#    echo -e "  --> success" >> $out
+#  else
+#    echo -e "  --> \n ONE TEST FAILED\n" >> $out
+#  fi
+#fi
 
 
 ### knight3 test
 
-if [ $tsts1 -eq 0 ]
-then
-  #echo -e "For testing needs to take 10 seconds or less to execute: " >> $out
-  echo -e " count_tours from every position on the board" >> $out
-  echo -e " dim = 1: 1" >> $out
-  echo -e "       2: 0,0,0,0" >>  $out
-  echo -e "       3: 0,0,0,0,0,0,0,0,0" >>  $out
-  echo -e "       4: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" >> $out
-  #echo -e "       5: 304,0,56,0,304,0,56,0,56,0,56,0,64,0,56,0,56,0,56,0,304,0,56,0,304" >> $out
-  echo -e " enum_tours(5, List((0,0)) ) == 304 and all correct?" >> $out
-  echo -e " enum_tours(5, List((0,1)) ) == 0" >> $out
-  echo -e " enum_tours(5, List((0,2)) ) == 56 and all correct?" >> $out
-  
-  if (scala_assert "knight1.scala" "knight_test3.scala") 
-  then
-    echo -e "  --> success" >> $out
-  else
-    echo -e "  --> \n ONE TEST FAILED\n" >> $out
-  fi
-fi
+#if [ $tsts1 -eq 0 ]
+#then
+#  #echo -e "For testing needs to take 10 seconds or less to execute: " >> $out
+#  echo -e " count_tours from every position on the board" >> $out
+#  echo -e " dim = 1: 1" >> $out
+#  echo -e "       2: 0,0,0,0" >>  $out
+#  echo -e "       3: 0,0,0,0,0,0,0,0,0" >>  $out
+#  echo -e "       4: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" >> $out
+#  #echo -e "       5: 304,0,56,0,304,0,56,0,56,0,56,0,64,0,56,0,56,0,56,0,304,0,56,0,304" >> $out
+#  echo -e " enum_tours(5, List((0,0)) ) == 304 and all correct?" >> $out
+#  echo -e " enum_tours(5, List((0,1)) ) == 0" >> $out
+#  echo -e " enum_tours(5, List((0,2)) ) == 56 and all correct?" >> $out
+#  
+#  if (scala_assert "knight1.scala" "knight_test3.scala") 
+#  then
+#    echo -e "  --> success" >> $out
+#  else
+#    echo -e "  --> \n ONE TEST FAILED\n" >> $out
+#  fi
+#fi
 
 ### knight4 test
 
diff -r ddda2e76a40f -r 6cc36d0ef79e main_testing5/bf_test.sh
--- a/main_testing5/bf_test.sh	Sat Nov 28 12:09:55 2020 +0000
+++ b/main_testing5/bf_test.sh	Sat Nov 28 15:37:30 2020 +0000
@@ -24,7 +24,7 @@
 # purity test
 
 function scala_vars {
-   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
+   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|AtomicInteger|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
 }
 
 
diff -r ddda2e76a40f -r 6cc36d0ef79e main_testing5/bfc_test.sh
--- a/main_testing5/bfc_test.sh	Sat Nov 28 12:09:55 2020 +0000
+++ b/main_testing5/bfc_test.sh	Sat Nov 28 15:37:30 2020 +0000
@@ -23,7 +23,7 @@
 # purity test
 
 function scala_vars {
-   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
+   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|AtomicInteger|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
 }
 
 
diff -r ddda2e76a40f -r 6cc36d0ef79e pre_marking1/collatz_test.sh
--- a/pre_marking1/collatz_test.sh	Sat Nov 28 12:09:55 2020 +0000
+++ b/pre_marking1/collatz_test.sh	Sat Nov 28 15:37:30 2020 +0000
@@ -37,7 +37,7 @@
 # purity test
 
 function scala_vars {
-   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
+   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|AtomicInteger|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
 }
 
 
diff -r ddda2e76a40f -r 6cc36d0ef79e pre_marking1/mk
--- a/pre_marking1/mk	Sat Nov 28 12:09:55 2020 +0000
+++ b/pre_marking1/mk	Sat Nov 28 15:37:30 2020 +0000
@@ -8,6 +8,7 @@
 for sd in $files; do
   cd $sd
   echo $sd
+  sleep 5
   touch .
   cp ../../../../../pre_marking1/collatz_test.sh .
   cp ../../../../../pre_marking1/collatz_test1.scala .
diff -r ddda2e76a40f -r 6cc36d0ef79e pre_testing1/collatz_test.sh
--- a/pre_testing1/collatz_test.sh	Sat Nov 28 12:09:55 2020 +0000
+++ b/pre_testing1/collatz_test.sh	Sat Nov 28 15:37:30 2020 +0000
@@ -27,7 +27,7 @@
 # purity test
 
 function scala_vars {
-   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
+   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|AtomicInteger|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
 }
 
 
diff -r ddda2e76a40f -r 6cc36d0ef79e pre_testing2/docdiff_test.sh
--- a/pre_testing2/docdiff_test.sh	Sat Nov 28 12:09:55 2020 +0000
+++ b/pre_testing2/docdiff_test.sh	Sat Nov 28 15:37:30 2020 +0000
@@ -27,7 +27,7 @@
 # purity test
 
 function scala_vars {
-   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
+   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|AtomicInteger|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
 }
 
 
diff -r ddda2e76a40f -r 6cc36d0ef79e pre_testing3/postfix_test.sh
--- a/pre_testing3/postfix_test.sh	Sat Nov 28 12:09:55 2020 +0000
+++ b/pre_testing3/postfix_test.sh	Sat Nov 28 15:37:30 2020 +0000
@@ -24,7 +24,7 @@
 # purity test
 
 function scala_vars {
-   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
+   (egrep '\bvar\b|\breturn\b|\.par\.|\.par |ListBuffer|AtomicInteger|mutable|util.control|new Array' c$out 2> /dev/null 1> /dev/null)
 }