From fb91cdcb6834114cb69820648988f9c17eba735f Mon Sep 17 00:00:00 2001
From: Paul Stadig <paul@stadig.name>
Date: Sat, 13 Sep 2014 15:31:16 -0400
Subject: [PATCH] Cleanup.

---
 desktop/src-common/advent/pathfind.clj | 48 ++++++++------------------
 1 file changed, 15 insertions(+), 33 deletions(-)

diff --git a/desktop/src-common/advent/pathfind.clj b/desktop/src-common/advent/pathfind.clj
index 4979bca2..e3c798c5 100644
--- a/desktop/src-common/advent/pathfind.clj
+++ b/desktop/src-common/advent/pathfind.clj
@@ -1,18 +1,6 @@
 (ns advent.pathfind
-  (:require [play-clj.core :refer :all]
-            [play-clj.ui :refer :all]
-            [play-clj.utils :refer :all]
-            [play-clj.g2d :refer :all]
-            [clojure.pprint]
-            [clojure.data.priority-map :refer [priority-map]])
-  (:import [com.badlogic.gdx.files FileHandle]
-           [com.badlogic.gdx Files]
-           [java.lang Math]
-           [com.badlogic.gdx.graphics Camera Color GL20 OrthographicCamera
-            PerspectiveCamera Pixmap Pixmap$Format PixmapIO Texture
-            VertexAttributes$Usage]))
-
-(def compare-count (atom 0))
+  (:require [play-clj.core :refer :all])
+  (:import (java.lang Math)))
 
 (def scale 2)
 
@@ -29,10 +17,10 @@
     (doseq [row (take-nth skip my-map)]
       (println (take-nth skip (map {1 \space 0 "W" "X" "X" "." "."} row))))))
 
-(defn random-map [] (-> (vec (take 640 (repeatedly (fn [] (vec (take 480 (repeatedly  (fn [] (rand-nth [1  1  1  1 1  0])))))))))
-                        (update-in [1 1] (constantly 1))
-                        (update-in [639 479] (constantly 1))))
-
+(defn random-map []
+  (-> (vec (take 640 (repeatedly (fn [] (vec (take 480 (repeatedly  (fn [] (rand-nth [1  1  1  1 1  0])))))))))
+      (update-in [1 1] (constantly 1))
+      (update-in [639 479] (constantly 1))))
 
 (defn neighbors [[^long x ^long y] my-map]
   (let [x (long x)
@@ -48,12 +36,10 @@
         width (count my-map)]
     (remove #(= 0 (get-in my-map %))
             (filter (fn [[^long x ^long y]] (and (< -1 x width)
-                                                (< -1 y height))) candidates))))
-
+                                                 (< -1 y height))) candidates))))
 
 (defn resolve-path [came-from play-loc target-loc]
   (let [came-from (into {} came-from)]
-
     (if (nil? (came-from target-loc))
       nil
       (loop [path []
@@ -65,33 +51,31 @@
            (conj path (from-scale current-node))
            (came-from (vec current-node))))))))
 
-
 (def d2 ^double (- (Math/sqrt 2) 2))
+
 (defn heuristic ^long [^long goal-x ^long goal-y ^long current-x ^long current-y]
   (let [dist-x (if (< goal-x current-x)
-                       (unchecked-subtract current-x goal-x)
-                       (unchecked-subtract goal-x current-x ))
+                 (unchecked-subtract current-x goal-x)
+                 (unchecked-subtract goal-x current-x ))
         dist-y (if (< goal-y current-y)
-                       (unchecked-subtract current-y goal-y)
-                       (unchecked-subtract goal-y current-y))
+                 (unchecked-subtract current-y goal-y)
+                 (unchecked-subtract goal-y current-y))
         min-dist ^double (double (min dist-x dist-y))]
     (unchecked-add (unchecked-add dist-x dist-y )
                    (long (unchecked-multiply ^double d2 min-dist)))))
 
-
 (defn visit-all [my-map play-loc target-loc]
   (let [play-loc (vec (to-scale play-loc))
         target-loc (vec (to-scale target-loc))]
     (if (= 0 (get-in my-map target-loc))
       nil
-      (let [cost-so-far ^java.util.HashMap (java.util.HashMap. {play-loc 0}) 
+      (let [cost-so-far ^java.util.HashMap (java.util.HashMap. {play-loc 0})
             came-from ^java.util.HashMap (java.util.HashMap.)
             fronteir ^java.util.PriorityQueue (java.util.PriorityQueue. (/ (* 320 240) scale) cost-comparator)]
         (.offer fronteir {:cost 0 :loc play-loc})
         (loop [current-loc (.poll fronteir)]
           (if (or (nil? current-loc)
                   (= (:loc current-loc) target-loc))
-            
             (resolve-path came-from play-loc target-loc)
             (do (doseq [neighbor (neighbors (:loc current-loc) my-map)]
                   (let [cost-for-neighbor (.get cost-so-far neighbor)
@@ -104,15 +88,13 @@
                                         :loc neighbor}))))
                 (recur (.poll fronteir)))))))))
 
-
 (defn print-resolved [path my-map]
   (doseq [row (reduce (fn [acc path]
                         (if path
                           (update-in acc (reverse path) (constantly "X"))
                           acc))
-                my-map
-                path)]
-    
+                      my-map
+                      path)]
     (println (map {1 \space 5 "." 0 "W" "X" "X"} row)))
   nil)