Browse Source

Called conflicts, not nogoods

Samuel W. Flint 4 years ago
parent
commit
b24c7368da
3 changed files with 4 additions and 4 deletions
  1. 1 1
      checking.lisp
  2. 1 1
      package.lisp
  3. 2 2
      types.lisp

+ 1 - 1
checking.lisp

@@ -36,7 +36,7 @@
          (the-values (mapcar #'cdr cvvps))
          (is-member-p (member the-values (constraints-list constraint)
                               :test #'equalp)))
-    (if (nogoodsp constraint)
+    (if (conflictsp constraint)
         (not is-member-p)
         is-member-p)))
 

+ 1 - 1
package.lisp

@@ -18,7 +18,7 @@
            #:problem
            #:check-constraint
            #:<constraint-extension>
-           #:nogoodsp
+           #:conflictsp
            #:constraints-list
            #:<constraint-intension>
            #:constraint-function

+ 2 - 2
types.lisp

@@ -50,8 +50,8 @@
 (defgeneric check-constraint (constraint vvps &key suppress-cc-update-p))
 
 (defclass <constraint-extension> (<constraint>)
-  ((nogoodsp :reader nogoodsp
-             :initarg :nogoodsp)
+  ((conflictsp :reader conflictsp
+               :initarg :conflictsp)
    (constraints-list :reader constraints-list
                      :initarg :list)))