everyo was a pseudo relation, rename to everyg. update bench.clj. add distincto relation which uses !=.

Author: David Nolen

src/main/clojure/clojure/core/logic.clj

@@ -2503,14 +2503,14 @@
   (fresh [a]
     (== (lcons a d) l)))
 
-(defn everyo
+(defn everyg
   "A pseudo-relation that takes a coll and ensures that the goal g
    succeeds on every element of the collection."
   [g coll]
   (if (seq coll)
     (all
      (g (first coll))
-     (everyo g (next coll)))
+     (everyg g (next coll)))
     s#))
 
 ;; =============================================================================
@@ -3680,15 +3680,16 @@
           ((cgoal (!=c p)) a)))
       a)))
 
-(defn all-diffo [l]
-  (conde
-    [(== l ())]
-    [(fresh (a) (== l [a]))]
-    [(fresh (a ad dd)
-      (== l (llist a ad dd))
-      (!=c a ad)
-      (all-diffo (llist a dd))
-      (all-diffo (llist ad dd)))]))
+(defne distincto
+  "A relation which guarantees no element of l will unify
+   with another element of l."
+  [l]
+  ([()])
+  ([[a]])
+  ([[a b . r]]
+     (!= a b)
+     (distincto (lcons a r))
+     (distincto (lcons b r))))
 
 (defne rembero
   "A relation between l and o where is removed from
@@ -3697,4 +3698,4 @@
   ([_ [x . xs] xs])
   ([_ [y . ys] [y . zs]]
      (!= y x)
-     (rembero x ys zs)))
+     (rembero x ys zs)))

src/main/clojure/clojure/core/logic/bench.clj

@@ -451,7 +451,7 @@
             sq2 [a3 a4 b3 b4]
             sq3 [c1 c2 d1 d2]
             sq4 [c3 c4 d3 d4]]
-        (everyo distinctfd
+        (everyg distinctfd
            [row1 row2 row3 row4
             col1 col2 col3 col4
             sq1 sq2 sq3 sq4])))))
@@ -503,11 +503,11 @@
         sqs  (->squares rows)]
     (run-nc 1 [q]
       (== q vars)
-      (everyo #(infd % (domain 1 2 3 4 5 6 7 8 9)) vars)
+      (everyg #(infd % (domain 1 2 3 4 5 6 7 8 9)) vars)
       (init vars hints)
-      (everyo distinctfd rows)
-      (everyo distinctfd cols)
-      (everyo distinctfd sqs))))
+      (everyg distinctfd rows)
+      (everyg distinctfd cols)
+      (everyg distinctfd sqs))))
 
 ;; Helpers