From 12919a96117a4da67559cc793c3ad4c6d8464db5 Mon Sep 17 00:00:00 2001
From: Matthew Butterick <mb@mbtype.com>
Date: Wed, 1 Oct 2014 12:52:51 -0700
Subject: [PATCH] lunchbreak

---
 csp/constraint.rkt                      | 140 ++++++++++++++++--------
 csp/helpers.rkt                         |  49 +++++++++
 csp/python-constraint/constraint.py     |   5 +
 csp/python-constraint/testconstraint.py |   7 ++
 4 files changed, 157 insertions(+), 44 deletions(-)
 create mode 100644 csp/helpers.rkt
 create mode 100644 csp/python-constraint/testconstraint.py

diff --git a/csp/constraint.rkt b/csp/constraint.rkt
index 6b7c2ec6..af434387 100644
--- a/csp/constraint.rkt
+++ b/csp/constraint.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require racket/class racket/contract racket/match racket/list racket/generator)
 (require sugar/container sugar/debug)
-
+(require "helpers.rkt")
 (module+ test (require rackunit))
 
 ;; Adapted from work by Gustavo Niemeyer
@@ -85,6 +85,13 @@
       ;; Add one or more variables to the problem
       (for-each (λ(var) (addVariable var domain)) variables))
     
+    (define/public (getSolution)
+      ;; Find and return a solution to the problem
+      (define-values (domains constraints vconstraints) (_getArgs))
+      (if (not domains)
+          null
+          (send _solver getSolution domains constraints vconstraints)))
+    
     (define/public (getSolutions)
       ;; Find and return all solutions to the problem
       (define-values (domains constraints vconstraints) (_getArgs))
@@ -129,17 +136,21 @@
   (check-equal? (get-field _constraints (new Problem)) null)
   (check-equal? (get-field _variables (new Problem)) (make-hash))
   
-  (define problem (new Problem))
-  (send problem addVariable "a" '(1 2))
-  (check-equal? (get-field _list (hash-ref (get-field _variables problem) "a")) '(1 2)) 
+  (define problem (new Problem)) ;; test from line 125
+  (send problem addVariable "a" '(1))
+  (check-equal? (get-field _list (hash-ref (get-field _variables problem) "a")) '(1)) 
+  
+  (displayln (format "The solution to ~a is ~a" 
+                     problem 
+                     (send problem getSolutions)))
+  
+  
   (send problem reset)
   (check-equal? (get-field _variables problem) (make-hash))
   (send problem addVariables '("a" "b") '(1 2 3))
   (check-equal? (get-field _list (hash-ref (get-field _variables problem) "a")) '(1 2 3))
   (check-equal? (get-field _list (hash-ref (get-field _variables problem) "b")) '(1 2 3))
-  ;  (get-field _variables problem)
-  (displayln (format "The solution to ~a:" problem))
-  (send problem getSolutions)
+  
   )
 
 
@@ -153,17 +164,25 @@
   ;; When list or tuples are used as domains, they are automatically
   ;; converted to an instance of that class.
   
-  (class object%
+  (class* object% (printable<%>)
     (super-new)
     (init-field set)
     (field [_list set][_hidden null][_states null])
     
+    (define (repr) (format "<Domain ~v>" _list))
+    (define/public (custom-print out quoting-depth) (print (repr) out))
+    (define/public (custom-display out) (displayln (repr) out))
+    (define/public (custom-write out) (write (repr) out))
+    
     (define/public (resetState)
       ;; Reset to the original domain state, including all possible values
-      (set! _list (append _list _hidden))
+      (py-extend! _list _hidden)
       (set! _hidden null)
       (set! _states null))
     
+    (define/public (domain-pop!)
+      (py-pop! _list))
+    
     ))
 
 
@@ -191,6 +210,7 @@
       (define forwardcheck _forwardcheck)
       (define assignments (make-hash))
       (define queue null)
+      (define values null)
       (define pushdomains null)
       (define variable #f)
       (let/ec done
@@ -198,50 +218,82 @@
         (define lst (sort (for/list ([variable (in-hash-keys domains)])
                             (list (* -1 (length (hash-ref vconstraints variable)))
                                   (length (get-field _list (hash-ref domains variable)))
-                                  variable)) < #:key car)) ;;todo: sort on multiple keys
-        (if (not (null? lst)) ; ? good translation of for–else?
-            (for ([item (in-list lst)])
-              (when (not ((last item) . in? . assignments))
-                ; Found unassigned variable
-                (define variable (last item))
-                (define values (hash-ref domains variable))
-                (set! pushdomains 
-                      (if forwardcheck
-                          (for/list ([x (in-hash-keys domains)] 
-                                     #:when (and (not (x . in? . assignments)) 
-                                                 (not (x . equal? . variable))))
-                            (hash-ref domains x))
-                          null))
-                (done)))
-            (begin
-              ;; No unassigned variables. We've got a solution. Go back
-              ;; to last variable, if there's one.
-              (generator ()
-                         (yield '(copy assignments)) ;;todo: fix copy
-                         (when (not queue) (done))
-                         (match-define (list variable values pushdomains) (take-right 1 queue))
-                         (set! queue (drop-right 1 queue))
-                         (when pushdomains
-                           (for ([domain (in-list pushdomains)])
-                             (send domain popState))))))
-        (let/ec done2
+                                  variable)) list-comparator)) 
+        (report lst)
+        (let/ec bonk
+          (if (not (null? lst)) ; ? good translation of for–else?
+              (for ([item (in-list lst)])
+                (when (not ((last item) . in? . assignments))
+                  ; Found unassigned variable
+                  (set! variable (last item))
+                  (set! values (hash-ref domains variable))
+                  (set! pushdomains 
+                        (if forwardcheck
+                            (for/list ([x (in-hash-keys domains)] 
+                                       #:when (and (not (x . in? . assignments)) 
+                                                   (not (x . equal? . variable))))
+                              (hash-ref domains x))
+                            null))   
+                  (bonk)))
+              (begin
+                ;; No unassigned variables. We've got a solution. Go back
+                ;; to last variable, if there's one.
+                (generator ()
+                           (yield (hash-copy assignments))
+                           (when (not queue) (done))
+                           (match-define (list variable values pushdomains) (py-pop! queue))
+                           (when (not (null? pushdomains))
+                             (for ([domain (in-list pushdomains)])
+                               (send domain popState)))))))
+        (report variable)
+        (report values)
+        (report assignments)
+        
+        (let/ec inner-done
           ;; We have a variable. Do we have any values left?
+          (report values)
           (when (null? values)
             ;; No. Go back to last variable, if there's one.
             (hash-remove! assignments variable)
-            ;; resume @ line 492
-            ))
-        )
-      (list 'tada) ; todo: remove this dummy value
-      )
+            (let loop ()
+              (if (not (null? queue))
+                  (let ()
+                    (define-values (variable values pushdomains) (py-pop! queue))
+                    (when pushdomains
+                      (for ([domain (in-list pushdomains)])
+                        (send domain popState)))
+                    (when values (inner-done))
+                    (hash-remove! assignments variable)
+                    (loop))
+                  (error 'todo "return from function"))))
+          ;; Got a value. Check it.
+          (hash-set! assignments variable (send values domain-pop!))
+          (when (not (null? pushdomains))
+            (for ([domain (in-list pushdomains)])
+              (send domain pushState)))
+          ;; todo: ok replacement for for/else?
+          (if (not (null? (hash-ref vconstraints variable))) 
+              (for ([cvpair (in-list (hash-ref vconstraints variable))])
+                (match-define (cons constraint variables) cvpair)
+                (when (not (constraint variables domains assignments pushdomains))
+                  ;; Value is not good.
+                  (inner-done)))
+              (inner-done))
+          (when (not (null? pushdomains))
+            (for ([domain (in-list pushdomains)])
+              (send domain popState)))
+          ;; Push state before looking for next variable.
+          (py-append! queue (list variable values pushdomains))))
+      (error 'getSolutionIter "Whoops, broken solver"))
+    
     
     
     (define/override (getSolution domains constraints vconstraints)
-      ;; todo: repair this properly
-      (car (getSolutions domains constraints vconstraints)))
+      ;; todo: fix this
+      (void))
     
     (define/override (getSolutions domains constraints vconstraints)
-      (getSolutionIter domains constraints vconstraints))
+      (for/list ([solution (in-generator (getSolutionIter domains constraints vconstraints))]) solution))
     
     ))
 
diff --git a/csp/helpers.rkt b/csp/helpers.rkt
new file mode 100644
index 00000000..e845fe10
--- /dev/null
+++ b/csp/helpers.rkt
@@ -0,0 +1,49 @@
+#lang racket/base
+(require racket/list)
+(provide (all-defined-out))
+
+(module+ test (require rackunit))
+
+(define (list-comparator xs ys)
+  ;; For use in sort. Compares two lists element by element.
+  (cond
+    [(equal? xs ys) #f] ; elements are same, so no sort preference    
+    [(and (null? xs) (not (null? ys))) #t] ; ys is longer, so #t 
+    [(and (not (null? xs)) (null? ys)) #f] ; xs is longer, so #f makes it sort later
+    [else (let ([x (car xs)][y (car ys)])
+            (cond
+              [(equal? x y) (list-comparator (cdr xs) (cdr ys))]
+              [(and (real? x) (real? y)) (< x y)]
+              [(and (string? x) (string? y)) (string<? x y)]
+              [else (error 'list-comparator (format "Can’t compare ~v and ~v" x y))]))]))
+
+(module+ test 
+  (check-false (list-comparator null null))
+  (check-false (list-comparator (range 2) (range 2)))
+  (check-true (list-comparator (range 2) (range 4)))
+  (check-false (list-comparator (range 4) (range 2)))
+  (check-true (list-comparator '(1 1 "a") '(1 1 "b"))))
+
+(define-syntax-rule (py-pop! xs)
+  (let ([i (last xs)])
+      (set! xs (drop-right xs 1))
+      i))
+
+(module+ test
+  (let ([xs '(1 2 3)])
+    (check-equal? (py-pop! xs) 3)
+    (check-equal? xs '(1 2))))
+
+(define-syntax-rule (py-append! xs x)
+  (set! xs `(,@xs ,x)))
+
+(define-syntax-rule (py-extend! xs x)
+  (set! xs `(,@xs ,@x)))
+
+(module+ test
+  (let ([xs '(1 2 3)])
+    (py-append! xs (range 2))
+    (check-equal? xs '(1 2 3 (0 1))))
+  (let ([xs '(1 2 3)])
+    (py-extend! xs (range 2))
+    (check-equal? xs '(1 2 3 0 1))))
\ No newline at end of file
diff --git a/csp/python-constraint/constraint.py b/csp/python-constraint/constraint.py
index b1cd836b..d64630f3 100644
--- a/csp/python-constraint/constraint.py
+++ b/csp/python-constraint/constraint.py
@@ -461,6 +461,7 @@ class BacktrackingSolver(Solver):
             lst = [(-len(vconstraints[variable]),
                     len(domains[variable]), variable) for variable in domains]
             lst.sort()
+            print "lst", lst
             for item in lst:
                 if item[-1] not in assignments:
                     # Found unassigned variable
@@ -484,8 +485,12 @@ class BacktrackingSolver(Solver):
                     for domain in pushdomains:
                         domain.popState()
 
+            print "variable", variable
+            print "values", values
+            print "assignments", assignments
             while True:
                 # We have a variable. Do we have any values left?
+                print "values", values
                 if not values:
                     # No. Go back to last variable, if there's one.
                     del assignments[variable]
diff --git a/csp/python-constraint/testconstraint.py b/csp/python-constraint/testconstraint.py
new file mode 100644
index 00000000..186fc7c2
--- /dev/null
+++ b/csp/python-constraint/testconstraint.py
@@ -0,0 +1,7 @@
+#!/usr/bin/python
+
+from constraint import *
+
+p = Problem()
+p.addVariable("a", [1])
+print p.getSolutions()
\ No newline at end of file