cleaned up and finished 1-3

[ar1516.git] / a2 / src / 1c.bash

diff --git a/a2/src/1c.bash b/a2/src/1c.bash
index f8ba916..5b2a04e 100644 (file)
--- a/a2/src/1c.bash
+++ b/a2/src/1c.bash
@@ -159,17 +159,17 @@ GEN
        )
 GEN
        done
-#      echo "(or"
-#      for i in $(seq 0 $ITERATIONS); do
-#              for j in $(seq $((i+1)) $ITERATIONS); do
-#                      echo "(and (= t$i t$j) (= l$i l$j) (= a$i a$j) (= b$i b$j) (= c$i c$j))"
-#              done
-#      done
-#      echo ")"
+       echo "(or"
+       for i in $(seq 0 $ITERATIONS); do
+               for j in $(seq $((i+1)) $ITERATIONS); do
+                       echo "(and (= t$i t$j) (= l$i l$j) (= a$i a$j) (= b$i b$j) (= c$i c$j))"
+               done
+       done
+       echo ")"
        echo "))"
 }
 it=1
-while generate $it 318 | $YICES | pee sort "grep -q \"^sat\""
+while generate $it 318 | $YICES -m | pee sort "grep -q \"^unsat\""
 do
        echo $((it++))
 done