equal
deleted
inserted
replaced
86 echo " collatz(9000) == 47" | tee -a $out |
86 echo " collatz(9000) == 47" | tee -a $out |
87 |
87 |
88 if (scala_assert "collatz.scala" "collatz_test1.scala") |
88 if (scala_assert "collatz.scala" "collatz_test1.scala") |
89 then |
89 then |
90 echo " --> success" | tee -a $out |
90 echo " --> success" | tee -a $out |
91 marks=$(( marks + 2 )) |
91 marks=$(( marks + 1 )) |
92 else |
92 else |
93 echo " --> one of the tests failed" | tee -a $out |
93 echo " --> one of the tests failed" | tee -a $out |
94 fi |
94 fi |
95 fi |
95 fi |
96 |
96 |
115 else |
115 else |
116 echo " --> one of the tests failed" | tee -a $out |
116 echo " --> one of the tests failed" | tee -a $out |
117 fi |
117 fi |
118 fi |
118 fi |
119 |
119 |
|
120 ### last-odd tests |
|
121 |
|
122 if [ $tsts -eq 0 ] |
|
123 then |
|
124 echo " last_odd(113) == 85" | tee -a $out |
|
125 echo " last_odd(84) == 21" | tee -a $out |
|
126 echo " last_odd(605) == 341" | tee -a $out |
|
127 |
|
128 if (scala_assert "collatz.scala" "collatz_test3.scala") |
|
129 then |
|
130 echo " --> success" | tee -a $out |
|
131 marks=$(( marks + 1 )) |
|
132 else |
|
133 echo " --> one of the tests failed" | tee -a $out |
|
134 fi |
|
135 fi |
|
136 |
120 |
137 |
121 |
138 |
122 ## final marks |
139 ## final marks |
123 echo >> $out |
140 echo >> $out |
124 echo "Overall mark for the Basic Part" | tee -a $out |
141 echo "Overall mark for the Preliminary Part" | tee -a $out |
125 echo " $marks" | tee -a $out |
142 echo " $marks" | tee -a $out |
126 |
143 |
127 |
144 |