Permalink
Browse files

meir

  • Loading branch information...
Kevin Brubeck Unhammer
Kevin Brubeck Unhammer committed Jan 16, 2011
1 parent c0bb2a2 commit 8ac051eb2d5ad57be20617568af67ba26d62c3ce
Showing with 22 additions and 38 deletions.
  1. +3 −2 eval.lisp
  2. +19 −36 eval/mrs/gold.lisp
View
@@ -124,9 +124,10 @@
;; If the gold test does not define a c-structure, don't test
;; for c-structure:
(unless (cdr gold) (setf (cdr result) nil))
- (if (equal gold result) (incf pass)
+ (if (and (set-equal (first gold) (first result))
+ (set-equal (second gold) (second result))) (incf pass)
(progn (incf fail)
- (out "~A <=> ~A failed" srcfile trgfile))))
+ (out "FAIL: ~A <=> ~A~%" srcfile trgfile))))
finally (return (list pass '/ (+ pass fail))))))
View
@@ -7,39 +7,22 @@
(((-1 . -1) (0 . 0) (11 . 10)) ;alignments
(((184 40 181 178 176 159 155 2 154 4 153 6 152 8 151 10 150 12 148 16)
(617 89 655 1090 1069 808 45 807 47 806 49)))))
-("1" ;src
- "1" ;trg
- (((-1 . -1) (0 . 0) (3 . 5)) ;alignments
- ))
-("2" ;src
- "2" ;trg
- (((-1 . -1) (0 . 0) (0 . 6) (3 . 5)) ;alignments
- ))
-("3" ;src
- "3" ;trg
- (((-1 . -1) (0 . 0) (12 . 7) (3 . 8)) ;alignments
- ))
-("4" ;src
- "4" ;trg
- (((-1 . -1) (0 . 0) (6 . 9) (9 . 11) (3 . 10)) ;alignments
- ))
-;; ("5" ;src
-;; "5" ;trg
-;; (((-1 . -1) (0 . 0) (? . ?)) ;alignments
-;; ))
-;; ("6" ;src
-;; "6" ;trg
-;; (((-1 . -1) (0 . 0) (? . ?)) ;alignments
-;; ))
-;; ("7" ;src
-;; "7" ;trg
-;; (((-1 . -1) (0 . 0) (? . ?)) ;alignments
-;; ))
-;; ("8" ;src
-;; "8" ;trg
-;; (((-1 . -1) (0 . 0) (? . ?)) ;alignments
-;; ))
-;; ("9" ;src
-;; "9" ;trg
-;; (((-1 . -1) (0 . 0) (? . ?)) ;alignments
-;; ))
+("1"
+ "1"
+ (((-1 . -1) (0 . 0) (3 . 5))))
+("2"
+ "2"
+ (((-1 . -1) (0 . 0) (0 . 6) (3 . 5))))
+("3"
+ "3"
+ (((-1 . -1) (0 . 0) (12 . 7) (3 . 8))))
+("4"
+ "4"
+ (((-1 . -1) (0 . 0) (6 . 9) (9 . 11) (3 . 10))))
+("4"
+ "5"
+ (((-1 . -1) (0 . 0) (6 . 20) (9 . 21) (3 . 19))))
+("5"
+ "6"
+ (((-1 . -1) (0 . 0) (37 . 28) (10 . 27) (5 . 29)
+ (46 . 30) (116 . 128))))

0 comments on commit 8ac051e

Please sign in to comment.