updated
authorChristian Urban <christian dot urban at kcl dot ac dot uk>
Fri, 16 Dec 2016 13:34:33 +0000
changeset 88 990a1531135d
parent 87 9384b8c98014
child 89 fac25de665d2
updated
marking/knight3b_test.scala
marking/mark02b
--- a/marking/knight3b_test.scala	Fri Dec 16 13:25:08 2016 +0000
+++ b/marking/knight3b_test.scala	Fri Dec 16 13:34:33 2016 +0000
@@ -31,7 +31,7 @@
 
 lazy val f = Future {
 
-  val tsc = first_tour(6, List((3, 3))).get
+  val tsc = first_closed_tour_heuristic(6, List((3, 3))).get
   assert(correct_closed_urban(6)(tsc) == true)
 
 }
--- a/marking/mark02b	Fri Dec 16 13:25:08 2016 +0000
+++ b/marking/mark02b	Fri Dec 16 13:34:33 2016 +0000
@@ -80,6 +80,18 @@
   fi
 fi
 
+if [ $tsts1 -eq 0 ]
+then
+  echo " first_closed_tour_heuristic(6, List((3, 3))) found and 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