From fe94d1ff60fe3b5b33c23287921a458ac2aa61e6 Mon Sep 17 00:00:00 2001
From: Matthew Butterick <mb@mbtype.com>
Date: Sat, 20 Oct 2018 19:39:40 -0700
Subject: [PATCH] cleanse

---
 csp/hacs-test-workbench.rkt |  2 +-
 csp/hacs.rkt                | 24 +++++++++---------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/csp/hacs-test-workbench.rkt b/csp/hacs-test-workbench.rkt
index 32fa1f05..2c39acd7 100644
--- a/csp/hacs-test-workbench.rkt
+++ b/csp/hacs-test-workbench.rkt
@@ -9,7 +9,7 @@
 ;; queens problem
 ;; place queens on chessboard so they do not intersect
 (define queens (make-csp))
-(define qs (for/list ([q 10]) (string->symbol (format "q~a" q))))
+(define qs (for/list ([q 8]) (string->symbol (format "q~a" q))))
 (define rows (range (length qs)))
 (add-vars! queens qs rows)
 (define (q-col q) (string->number (string-trim (symbol->string q) "q")))
diff --git a/csp/hacs.rkt b/csp/hacs.rkt
index 4b0acbea..999983c3 100644
--- a/csp/hacs.rkt
+++ b/csp/hacs.rkt
@@ -28,6 +28,7 @@
 (define constraints $csp-constraints)
 (define-syntax-rule (in-constraints csp) (in-list ($csp-constraints csp)))
 (define-syntax-rule (in-vars csp) (in-list ($csp-vars csp)))
+(define-syntax-rule (in-var-names csp) (in-list (map $var-name ($csp-vars csp))))
 
 (struct $constraint (names proc) #:transparent
   #:property prop:procedure
@@ -209,18 +210,11 @@
     [(? empty?) #false]
     [(cons x _) x]))
 
-(define/contract (argmin-random-tie proc xs)
-  (procedure? (non-empty-listof any/c) . -> . any/c)
-  (let* ([xs (sort xs < #:key proc)]
-         [xs (takef xs (λ (x) (= (proc (car xs)) (proc x))))]
-         [xs ((if (current-shuffle) shuffle values) xs)])
-    (first xs)))
-
 (define/contract (minimum-remaining-values csp)
   (csp? . -> . (or/c #false (and/c $var? (not/c assigned-var?))))
   (match (unassigned-vars csp)
     [(? empty?) #false]
-    [xs (argmin-random-tie (λ (var) (length ($var-domain var))) xs)]))
+    [xs (argmin (λ (var) (length ($var-domain var))) (shuffle xs))]))
 
 (define mrv minimum-remaining-values)
 
@@ -419,7 +413,7 @@
                     conflicts)]))))
 
 
-(define/contract (min-conflicts csp [max-steps (expt 10 3)])
+(define/contract (min-conflicts csp [max-steps 64])
   (($csp?) (integer?) . ->* . generator?)
   ;; Solve a CSP by stochastic hillclimbing on the number of conflicts.
   (generator ()
@@ -434,7 +428,7 @@
                (for/fold ([csp starting-assignment])
                          ([i (in-range max-steps)])
                  (match (conflicted-var-names csp)
-                   [(? empty?) (when (check-constraints csp) (report i 'steps-taken) (yield csp))]
+                   [(? empty?) (when (check-constraints csp) (yield csp)) (loop csp0)]
                    [cvar-names
                     (define cvar-name (first ((if (current-shuffle) shuffle values) cvar-names)))
                     (define val (min-conflicts-value csp cvar-name ($csp-vals csp0 cvar-name)))
@@ -444,14 +438,14 @@
 (define/contract (conflicted-var-names csp)
   ($csp? . -> . (listof name?))
   ;; Return a list of variables in current assignment that are conflicted
-  (for/list ([var (in-vars csp)]
-             #:when (positive? (nconflicts csp (var-name var))))
-            (var-name var)))
+  (for/list ([name (in-var-names csp)]
+             #:when (positive? (nconflicts csp name)))
+            name))
  
 (define/contract (min-conflicts-value csp name vals)
   ($csp? name? (listof any/c) . -> . any/c)
   ;; Return the value that will give var the least number of conflicts
-  (argmin-random-tie (λ (val) (nconflicts csp name val)) vals))
+  (argmin (λ (val) (nconflicts csp name val)) (shuffle vals)))
 
 (define no-value-sig (gensym))
 
@@ -460,7 +454,7 @@
   ;; How many conflicts var: val assignment has with other variables.
   (check-constraints (if (eq? val no-value-sig)
                          csp
-                         (assign-val csp name val)) (list name) #:conflicts #t))
+                         (assign-val csp name val)) (list name) #:conflicts #true))
 
 (define/contract (csp->assocs csp)
   (csp? . -> . (listof (cons/c name? any/c)))