diff -r fac25de665d2 -r d77af4aca939 marking/mark03a
--- a/marking/mark03a	Sun Dec 18 02:01:18 2016 +0000
+++ b/marking/mark03a	Mon Dec 19 02:55:13 2016 +0000
@@ -6,7 +6,7 @@
 echo "" > $out
 
 echo "Below is the feedback and provisional mark for your submission" >> $out
-echo "for CW 7, Part 2.  Please note all marks are provisional until" >> $out
+echo "for CW 8, Part 1.  Please note all marks are provisional until" >> $out
 echo "ratified by the assessment board -- this is not an official" >> $out
 echo "results transcript." >> $out
 echo "" >> $out
@@ -30,15 +30,15 @@
 }
 
 
-# marks for CW2b
+# marks for CW
 marks=$(( 0 ))
 
 
-# knights3: var, comments test
+# var, return, ListBuffer test
 #
-echo "knight3.scala does not contain vars, returns etc?" | tee -a $out
+echo "re.scala does not contain vars, returns etc?" | tee -a $out
 
-if (scala_vars knight3.scala)
+if (scala_vars re.scala)
 then
   echo "  --> fail" | tee -a $out
   tsts0=$(( 1 ))
@@ -51,14 +51,14 @@
 # compilation test
 if  [ $tsts0 -eq 0 ]
 then    
-  echo "knight3.scala runs?" | tee -a $out
+  echo "re.scala runs?" | tee -a $out
 
-  if (scala_compile knight3.scala.bak)
+  if (scala_compile re.scala.bak)
   then
     echo "  --> yes" | tee -a $out
     tsts1=$(( 0 ))
   else
-    echo "  --> scala knight3.scala did not run successfully" | tee -a $out
+    echo "  --> scala re.scala did not run successfully" | tee -a $out
     tsts1=$(( 1 )) 
   fi
 else
@@ -67,11 +67,32 @@
 
 if [ $tsts1 -eq 0 ]
 then
-  echo " ordered_moves(8, List((3,4), (3,2)), (1, 3)) == List((0,1), (0,5), (2,1), (2,5))" | tee -a $out
-  echo " ordered_moves(8, List((4,0)), (0,0)) == List((2,1), (1,2))" | tee -a $out
-  echo " ordered_moves(8, List((0,4)), (0,0)) == List((1,2), (2,1))" | tee -a $out
+  echo " nullable(ZERO) == false" | tee -a $out
+  echo " nullable(ONE) == true" | tee -a $out
+  echo " nullable(CHAR('a')) == false" | tee -a $out
+  echo " nullable(ZERO | ONE) == true" | tee -a $out
+  echo " nullable(ZERO | CHAR('a')) == false" | tee -a $out
+  echo " nullable(ONE ~  ONE) == true" | tee -a $out
+  echo " nullable(ONE ~ CHAR('a')) == false" | tee -a $out
+  echo " nullable(STAR(ZERO)) == true" | tee -a $out
   
-  if (scala_assert "knight3.scala.bak" "../../../marking/knight3a_test.scala")
+  if (scala_assert "re.scala.bak" "../../../marking/re1a_test.scala")
+  then
+    echo "  --> success" | tee -a $out
+    marks=$(( marks + 1 ))
+  else
+    echo "  --> test failed" | tee -a $out
+  fi
+fi
+
+if [ $tsts1 -eq 0 ]
+then
+  echo " der('a', ZERO | ONE) == (ZERO | ZERO)" | tee -a $out
+  echo " der('a', (CHAR('a') | ONE) ~ CHAR('a')) == ALT((ONE | ZERO) ~ CHAR('a'), ONE)" | tee -a $out
+  echo " der('a', STAR(CHAR('a'))) == (ONE ~ STAR(CHAR('a')))" | tee -a $out
+  echo " der('b', STAR(CHAR('a'))) == (ZERO ~ STAR(CHAR('a')))" | tee -a $out
+  
+  if (scala_assert "re.scala.bak" "../../../marking/re1b_test.scala")
   then
     echo "  --> success" | tee -a $out
     marks=$(( marks + 1 ))
@@ -82,9 +103,13 @@
 
 if [ $tsts1 -eq 0 ]
 then
-  echo " first_closed_tour_heuristic(6, List((3, 3))) found and ok?" | tee -a $out
+  echo " simp(ZERO | ONE) == ONE" | tee -a $out
+  echo " simp(STAR(ZERO | ONE)) == STAR(ZERO | ONE)" | tee -a $out
+  echo " simp(ONE ~ (ONE ~ (ONE ~ CHAR('a')))) == CHAR('a')" | tee -a $out
+  echo " simp(ONE ~ (ONE ~ (ONE ~ ZERO))) == ZERO" | tee -a $out
+  echo " simp(ALT(ONE ~ (ONE ~ (ONE ~ ZERO)), CHAR('a'))) == CHAR('a')" | tee -a $out
   
-  if (scala_assert "knight3.scala.bak" "../../../marking/knight3b_test.scala")
+  if (scala_assert "re.scala.bak" "../../../marking/re1c_test.scala")
   then
     echo "  --> success" | tee -a $out
     marks=$(( marks + 1 ))
@@ -95,10 +120,19 @@
 
 if [ $tsts1 -eq 0 ]
 then
-  echo " first_tour_heuristic(8, List((0,0))) found and ok?" | tee -a $out
-  echo " first_tour_heuristic(50, List((0,0))) found and ok?" | tee -a $out
+  echo " EVIL = (a*)* b" | tee -a $out
+  echo " ders(List.fill(5)('a'),EVIL) == SEQ(SEQ(STAR(CHAR('a')),STAR(STAR(CHAR('a')))),CHAR('b'))" | tee -a $out
+  echo " ders(List('b'),EVIL) == ONE" | tee -a $out
+  echo " ders(List('b','b'),EVIL) == ZERO" | tee -a $out
+  echo " matcher(EVIL, \"a\" * 5 ++ \"b\") == true" | tee -a $out
+  echo " matcher(EVIL, \"b\") == true" | tee -a $out
+  echo " matcher(EVIL, \"bb\") == false" | tee -a $out
+  echo " matcher(\"abc\", \"abc\") == true" | tee -a $out
+  echo " matcher((\"ab\" | \"a\") ~ (ONE | \"bc\"), \"abc\") == true" | tee -a $out
+  echo " matcher(ONE, \"\") == true" | tee -a $out
+  echo " matcher(ZERO, \"\") == false" | tee -a $out
   
-  if (scala_assert "knight3.scala.bak" "../../../marking/knight3c_test.scala")
+  if (scala_assert "re.scala.bak" "../../../marking/re1d_test.scala")
   then
     echo "  --> success" | tee -a $out
     marks=$(( marks + 1 ))
@@ -107,7 +141,21 @@
   fi
 fi
 
+if [ $tsts1 -eq 0 ]
+then
+  echo " replace(\"aa\".% | \"bb\", \"aabbbaaaaaaabaaaaabbaaaabb\" , \"c\") == \"ccbcabcaccc\"" | tee -a $out
+  echo " replace(\"aa\".% | \"bb\", \"abba\" , \"\") == \"aa\"" | tee -a $out
+  
+  if (scala_assert "re.scala.bak" "../../../marking/re1e_test.scala")
+  then
+    echo "  --> success" | tee -a $out
+    marks=$(( marks + 2 ))
+  else
+    echo "  --> test failed" | tee -a $out
+  fi
+fi
+
 
 ## final marks
-echo "Overall mark for CW 7, Part 2" | tee -a $out
+echo "Overall mark for CW 8, Part 1" | tee -a $out
 echo "$marks" | tee -a $out