# HG changeset patch
# User Christian Urban <urbanc@in.tum.de>
# Date 1544817709 0
# Node ID 884342f5abe04261bd914ff824ee8bb5cf326bda
# Parent  744496a2bade54d65da87a96498e2f673d6326d2
updated

diff -r 744496a2bade -r 884342f5abe0 marking4/compare
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/marking4/compare	Fri Dec 14 20:01:49 2018 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+###set -e
+
+trap "exit" INT
+
+files=${1:-assignment20189-*}
+
+for sd in $files; do
+  cd $sd
+  cp output output1
+  #cmp -s output output1 > /dev/null
+  #if [ $? -eq 1 ]; then
+  #    echo $sd + "is different"
+  #fi
+  cd ..
+done
+
+
diff -r 744496a2bade -r 884342f5abe0 marking4/mk
--- a/marking4/mk	Fri Dec 14 14:41:54 2018 +0000
+++ b/marking4/mk	Fri Dec 14 20:01:49 2018 +0000
@@ -3,7 +3,7 @@
 
 trap "exit" INT
 
-files=${1:-assignment20179-*}
+files=${1:-assignment20189-*}
 
 for sd in $files; do
   cd $sd
diff -r 744496a2bade -r 884342f5abe0 marking4/re_test.sh
--- a/marking4/re_test.sh	Fri Dec 14 14:41:54 2018 +0000
+++ b/marking4/re_test.sh	Fri Dec 14 20:01:49 2018 +0000
@@ -26,7 +26,7 @@
 # functional tests
 
 function scala_assert {
-    (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -nc -i "$1" "$2" -e "") # 2> /dev/null 1> /dev/null)
+    (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -nc -i "$1" "$2" -e "" 2> /dev/null 1> /dev/null)
 }
 
 function scala_assert_long {
diff -r 744496a2bade -r 884342f5abe0 marking4/tails
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/marking4/tails	Fri Dec 14 20:01:49 2018 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+###set -e
+
+trap "exit" INT
+
+files=${1:-assignment20189-*}
+
+for sd in $files; do
+  cd $sd
+  #echo $sd
+  marksone=$(( `tail -1 output` ))
+  markstwo=$(( `tail -1 output1` ))
+  if [ "$marksone" != "$markstwo" ]; then
+      echo $sd + "is different"
+  fi
+  cd ..
+done
+
+