diff -r 19b75e899d37 -r 9c03b5e89a2a marking3/knight1_test.sh
--- a/marking3/knight1_test.sh	Fri Apr 26 17:29:30 2024 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,184 +0,0 @@
-#!/bin/bash
-
-# to make the script fail safely
-set -euo pipefail
-
-out=${1:-output}
-
-echo "" > $out
-
-echo "Below is the feedback and provisional marks for your submission" >> $out
-echo "for Preliminary 8.  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
-
-
-
-# marks for CW8 part 1
-marks=$(( 0 ))
-
-
-function scala_compile {
-  (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala "$1") # 2>> $out 1>> $out) 
-}
-
-# functional tests
-
-function scala_assert_slow {
-  (ulimit -t 120; JAVA_OPTS="-Xmx1g" scala -i "$1" "-- $2" 2> /dev/null 1> /dev/null)
-}
-
-function scala_assert_thirty {
-  (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -i "$1" -- "$2" 2> /dev/null 1> /dev/null)
-}
-
-function scala_assert_quick {
-  (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -i "$1" -- "$2" 2> /dev/null 1> /dev/null)
-}
-
-function scala_assert {
-  (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala  -i "$1" -- "$2" 2> /dev/null 1> /dev/null)
-}
-
-function scala_assert_long {
-  (ulimit -t 60; JAVA_OPTS="-Xmx1g" scala -i "$1" -- "$2" -2> /dev/null 1> /dev/null)
-}
-
-function scala_assert_elong {
-  (ulimit -t 90; JAVA_OPTS="-Xmx1g" scala -i "$1" -- "$2" 2> /dev/null 1> /dev/null)
-}
-
-# purity test
-
-function scala_vars {
-   (egrep '\bvar\b|\breturn\b|\.par|ListBuffer|mutable|new Array' "$1" 2> /dev/null 1> /dev/null)
-}
-
-
-# knights1: purity test
-
-echo "knight1.scala does not contain vars, returns, Arrays, ListBuffers etc?" | tee -a $out
-
-if (scala_vars knight1.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 "knight1.scala runs?" | tee -a $out
-
-  if (scala_compile knight1.scala)
-  then
-    echo "  --> success " | tee -a $out
-    tsts1=$(( 0 ))
-  else
-    echo -e "  --> SCALA DID NOT RUN KNIGHT1.SCALA\n" | tee -a $out
-    tsts1=$(( 1 )) 
-  fi
-else
-  tsts1=$(( 1 ))   
-fi
-
-### knight1 test
-
-if [ $tsts1 -eq 0 ]
-then
-    echo " is_legal(8, Nil, (3, 4)) == true " | tee -a $out
-    echo " is_legal(8, List((4, 1), (1, 0)), (4, 1)) == false " | tee -a $out
-    echo " is_legal(2, Nil, (0, 0)) == true" | tee -a $out                          
-
-    if (scala_assert "knight1.scala" "knight1_test1.scala")
-    then
-        echo -e "  --> success\n" | tee -a $out
-	marks=$(( marks + 1 ))
-    else
-        echo -e "  --> \n ONE TEST FAILED\n"| tee -a $out
-    fi
-fi
-
-### knight2 test
-
-if [ $tsts1 -eq 0 ]
-then
-  echo " legal_moves(8, Nil, (2,2)) == List((3,4), (4,3), (4,1), (3,0), (1,0), (0,1), (0,3), (1,4))" | tee -a $out
-  echo " legal_moves(8, Nil, (7,7)) == List((6,5), (5,6))" | tee -a $out
-  echo " legal_moves(8, List((4,1), (1,0)), (2,2)) == List((3,4), (4,3), (3,0), (0,1), (0,3), (1,4))" | tee -a $out
-  echo " legal_moves(8, Nil, (0,1)) == List((1,3), (2,2), (2,0))" | tee -a $out
-  echo " legal_moves(8, List((6,6)), (7,7)) == List((6,5), (5,6))" | tee -a $out
-  echo " legal_moves(1, Nil, (0,0)) == Nil" | tee -a $out
-  echo " legal_moves(2, Nil, (0,0)) == Nil" | tee -a $out
-  echo " legal_moves(3, Nil, (0,0)) == List((1,2), (2,1))" | tee -a $out
-  
-  if (scala_assert "knight1.scala" "knight1_test2.scala")
-  then
-     echo -e "  --> success\n" | tee -a $out
-     marks=$(( marks + 1 ))
-  else
-     echo -e "  --> \n ONE TEST FAILED\n" | tee -a $out
-  fi
-fi
-
-
-### knight3 test
-
-if [ $tsts1 -eq 0 ]
-then
-  echo " all_tours from every position on the board" | tee -a $out
-  echo " dim = 1: 1" | tee -a $out
-  echo "       2: 0,0,0,0" | tee -a $out
-  echo "       3: 0,0,0,0,0,0,0,0,0" | tee -a $out
-  echo "       4: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" | tee -a $out
-  echo "       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" | tee -a $out
-  START=$(date +%s)
-  
-  if (scala_assert "knight1.scala" "knight1_test3a.scala") 
-  then
-     END=$(date +%s)
-     DIFF=$(( $END - $START ))
-     echo " It took $DIFF seconds" | tee -a $out  
-     echo -e "  --> success\n" | tee -a $out
-     marks=$(( marks + 1 ))
-  else
-     END=$(date +%s)
-     DIFF=$(( $END - $START ))
-     echo " It took $DIFF seconds" | tee -a $out 
-     echo -e "  --> \n ONE TEST FAILED\n" | tee -a $out
-  fi
-fi
-
-if [ $tsts1 -eq 0 ]
-then
-  echo " enum_tours(5, List((0,2)) ) => 56 tours? and all correct?" | tee -a $out
-  echo " enum_tours(5, List((0,0)) ) => 304 tours? and all correct?" | tee -a $out
-  START=$(date +%s)
-  
-  if (scala_assert "knight1.scala" "knight1_test3b.scala") 
-  then
-     END=$(date +%s)
-     DIFF=$(( $END - $START ))
-     echo "  It took $DIFF seconds" | tee -a $out 
-     echo -e "  --> success\n" | tee -a $out
-     marks=$(( marks + 1 ))
-  else
-     END=$(date +%s)
-     DIFF=$(( $END - $START ))
-     echo " It took $DIFF seconds" | tee -a $out 
-     echo -e "  --> \n ONE TEST FAILED\n" | tee -a $out
-  fi
-fi
-
-
-## final marks
-echo "Overall mark for Preliminary 8" | tee -a $out
-echo "$marks" | tee -a $out
-
-