--- a/marking/mark02	Tue Dec 13 13:02:52 2016 +0000
+++ b/marking/mark02	Wed Jan 11 14:40:53 2017 +0000
@@ -12,7 +12,7 @@
 echo "" >> $out
 
 function scala_vars {
-   (egrep 'var|return|ListBuffer|mutable' "$1" 2> /dev/null 1> /dev/null)
+   (egrep '\bvar\b|\breturn\b|ListBuffer|mutable' "$1" 2> /dev/null 1> /dev/null)
 }
 
 
@@ -189,38 +189,6 @@
 fi
 
 
-# knights3: var, comments test
-#
-#echo "knight3.scala does not contain vars, returns etc?" | tee -a $out
-
-#if (scala_vars knight3.scala)
-#then
-#  echo "  --> fail" | tee -a $out
-#  tsts0=$(( 1 ))
-#else
-#  echo "  --> success" | tee -a $out
-#  tsts0=$(( 0 )) 
-#fi
-
-
-# compilation test
-#if  [ $tsts0 -eq 0 ]
-#then    
-#  echo "knight3.scala runs?" | tee -a $out
-#
-#  if (scala_compile knight3.scala.bak)
-#  then
-#    echo "  --> success" | tee -a $out
-#    tsts1=$(( 0 ))
-#  else
-#    echo "  --> scala did not run knight3.scala" | tee -a $out
-#    tsts1=$(( 1 )) 
-#  fi
-#else
-#  tsts1=$(( 1 ))     
-#fi
-
-
 ## final marks
-echo "Overall mark for CW 2, Part 1 " | tee -a $out
+echo "Overall mark for CW 7, Part 1 " | tee -a $out
 echo "$marks" | tee -a $out

--- a/marking/mark02b	Tue Dec 13 13:02:52 2016 +0000
+++ b/marking/mark02b	Wed Jan 11 14:40:53 2017 +0000
@@ -12,7 +12,7 @@
 echo "" >> $out
 
 function scala_vars {
-   (egrep 'var|return|ListBuffer|mutable' "$1" 2> /dev/null 1> /dev/null)
+   (egrep '\bvar\b|\breturn\b|ListBuffer|mutable' "$1" 2> /dev/null 1> /dev/null)
 }
 
 
@@ -66,7 +66,33 @@
 fi
 
 
+if [ $tsts1 -eq 0 ]
+then
+  echo " ordered_moves(8, List((3,4), (3,2)), (1,3)) == (0,1), (0,5), (2,1), (2,5)" | tee -a $out
+  echo " ordered_moves(8, List((4,0)), (0,0)) == (2,1), (1,2)" | tee -a $out
+  echo " ordered_moves(8, List((0,4)), (0,0)) == (1,2), (2,1)" | tee -a $out
+  
+  if (scala_assert "knight3.scala.bak" "../../../marking/knight3a_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 " first_closed_tour_heuristic(6, List((3, 3))) is ok?" | tee -a $out
+  
+  if (scala_assert "knight3.scala.bak" "../../../marking/knight3b_test.scala")
+  then
+    echo "  --> success" | tee -a $out
+    marks=$(( marks + 1 ))
+  else
+    echo "  --> test failed" | tee -a $out
+  fi
+fi
 
 
 ## final marks

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/progs/re_sol.scala	Wed Jan 11 14:40:53 2017 +0000
@@ -0,0 +1,179 @@
+// Part 1 about Regular Expression Matching
+//==========================================
+
+abstract class Rexp
+case object ZERO extends Rexp
+case object ONE extends Rexp
+case class CHAR(c: Char) extends Rexp
+case class ALT(r1: Rexp, r2: Rexp) extends Rexp 
+case class SEQ(r1: Rexp, r2: Rexp) extends Rexp 
+case class STAR(r: Rexp) extends Rexp 
+
+// some convenience for typing in regular expressions
+
+import scala.language.implicitConversions    
+import scala.language.reflectiveCalls 
+
+def charlist2rexp(s: List[Char]): Rexp = s match {
+  case Nil => ONE
+  case c::Nil => CHAR(c)
+  case c::s => SEQ(CHAR(c), charlist2rexp(s))
+}
+implicit def string2rexp(s: String): Rexp = charlist2rexp(s.toList)
+
+implicit def RexpOps (r: Rexp) = new {
+  def | (s: Rexp) = ALT(r, s)
+  def % = STAR(r)
+  def ~ (s: Rexp) = SEQ(r, s)
+}
+
+implicit def stringOps (s: String) = new {
+  def | (r: Rexp) = ALT(s, r)
+  def | (r: String) = ALT(s, r)
+  def % = STAR(s)
+  def ~ (r: Rexp) = SEQ(s, r)
+  def ~ (r: String) = SEQ(s, r)
+}
+
+// (1a) Complete the function nullable according to
+// the definition given in the coursework; this 
+// function checks whether a regular expression
+// can match the empty string
+
+def nullable (r: Rexp) : Boolean = r match {
+  case ZERO => false
+  case ONE => true
+  case CHAR(_) => false
+  case ALT(r1, r2) => nullable(r1) || nullable(r2)
+  case SEQ(r1, r2) => nullable(r1) && nullable(r2)
+  case STAR(_) => true
+}
+
+// (1b) Complete the function der according to
+// the definition given in the coursework; this
+// function calculates the derivative of a 
+// regular expression w.r.t. a character
+
+def der (c: Char, r: Rexp) : Rexp = r match {
+  case ZERO => ZERO
+  case ONE => ZERO
+  case CHAR(d) => if (c == d) ONE else ZERO
+  case ALT(r1, r2) => ALT(der(c, r1), der(c, r2))
+  case SEQ(r1, r2) => 
+    if (nullable(r1)) ALT(SEQ(der(c, r1), r2), der(c, r2))
+    else SEQ(der(c, r1), r2)
+  case STAR(r1) => SEQ(der(c, r1), STAR(r1))
+}
+
+// (1c) Complete the function der according to
+// the specification given in the coursework; this
+// function simplifies a regular expression;
+// however it does not simplify inside STAR-regular
+// expressions
+
+def simp(r: Rexp) : Rexp = r match {
+  case ALT(r1, r2) => (simp(r1), simp(r2)) match {
+    case (ZERO, r2s) => r2s
+    case (r1s, ZERO) => r1s
+    case (r1s, r2s) => if (r1s == r2s) r1s else ALT (r1s, r2s)
+  }
+  case SEQ(r1, r2) =>  (simp(r1), simp(r2)) match {
+    case (ZERO, _) => ZERO
+    case (_, ZERO) => ZERO
+    case (ONE, r2s) => r2s
+    case (r1s, ONE) => r1s
+    case (r1s, r2s) => SEQ(r1s, r2s)
+  }
+  case r => r
+}
+
+// (1d) Complete the two functions below; the first 
+// calculates the derivative w.r.t. a string; the second
+// is the regular expression matcher taking a regular
+// expression and a string and checks whether the
+// string matches the regular expression
+
+def ders (s: List[Char], r: Rexp) : Rexp = s match {
+  case Nil => r
+  case c::s => ders(s, simp(der(c, r)))
+}
+
+// main matcher function
+def matcher(r: Rexp, s: String): Boolean = nullable(ders(s.toList, r))
+
+
+// (1e) Complete the function below: it searches (from the left to 
+// right) in string s1 all the non-empty substrings that match the 
+// regular expression -- these substrings are assumed to be
+// the longest substrings matched by the regular expression and
+// assumed to be non-overlapping. All these substrings in s1 are replaced
+// by s2.
+
+
+
+def splits(s: String): List[(String, String)] =
+  (for (i <- (1 to s.length).toList) yield s.splitAt(i)).reverse
+  
+splits("abcde")
+splits("")
+
+def first(r: Rexp, lst: List[(String, String)]): Option[String] = lst match {
+  case Nil => None
+  case (s1, s2)::xs => if (matcher(r, s1)) Some(s2) else first(r, xs)
+}
+ 
+"abcd".head
+
+def replace(r: Rexp, s1: String, s2: String): String = first(r, splits(s1)) match {
+  case None if (s1 == "") => ""
+  case None => s1.head.toString ++ replace(r, s1.tail, s2)
+  case Some(s) => s2 ++ replace(r, s, s2) 
+}
+ 
+val s1 =  "aabbbaaaaaaabaaaaabbaaaabb"
+val r: Rexp = "aa".% | "bb"
+splits(s1)
+first(r, splits(s1))
+
+replace(r, s1, "c")
+
+splits("bb")
+first(r, splits("bb"))
+replace(r, "abb", "c")
+
+val rl = SEQ("a",SEQ("b", "c"))
+val rk = SEQ(SEQ("a", "b"), "c")
+
+val rm = der('a', rk)
+der('b', rk)
+der('c', rk)
+
+der('a', rm)
+val rn = der('b', rm)
+der('c', rm)
+
+der('a', rn)
+der('b', rn)
+der('c', rn)
+
+// some testing data
+// the supposedly 'evil' regular expression (a*)* b
+
+val EVIL = SEQ(STAR(STAR(CHAR('a'))), CHAR('b'))
+println(matcher(EVIL, "a" * 1000 ++ "b"))
+println(matcher(EVIL, "a" * 1000))
+
+
+def time_needed[T](i: Int, code: => T) = {
+  val start = System.nanoTime()
+  for (j <- 1 to i) code
+  val end = System.nanoTime()
+  (end - start)/(i * 1.0e9)
+}
+
+for (i <- 1 to 5000001 by 500000) {
+  println(i + " " + "%.5f".format(time_needed(2, matcher(EVIL, "a" * i))))
+}
+
+
+