Probability distributions working

src/battleship/ai.clj

@@ -0,0 +1,29 @@
+(ns battleship.ai
+  (:use battleship.core))
+
+; A Monte Carlo solver for Battleship.
+
+; An infinite sequence of random boards
+(def infinite-boards
+  (repeatedly #(place-all-pieces (newboard))))
+
+; 1 if we might want to shoot that square, 0 otherwise
+(defn is-target [square]
+  (if (and (not (nil? (:piece square)))
+       (= :unstruck (:state square)))
+    1 0))
+
+; Gets the (not normalized) distribution of targetable squares
+; in a (finite) boardseq.
+(defn get-distribution [boardseq]
+  (reduce (fn [running-count board]
+            (map (fn [running-count-row row]
+                   (map + running-count-row
+                        (map #(if (is-target %) 1 0) row)))
+                 running-count board))
+          (repeat (repeat 0.0)) boardseq))
+
+#_(defn get-normalized-probability-distribution [boardseq]
+  (let [magnitude (apply #(apply + %) boardseq)]
+    (map #(map / (float %) magnitude)
+         (get-distribution boardseq))))

src/battleship/game.clj

@@ -35,6 +35,10 @@
            (range (int \A) (int \K)) (:board dboard))
       [top-bottom-border])))
 
+; good for debugging
+(defn print-board [board]
+  (dorun (map println (get-board-strs (DecoratedBoard. board nil nil) true))))
+
 (defn print-message [dboard is-friendly]
   nil)
 
@@ -93,14 +97,15 @@
   (println
     "Welcome to Battleship. Input some coordinates to fire, or 'Q' to quit.")
   (loop [game (newgame)]
+    (printgame game)
     (if (game-won? game)
       (let [winner (get-winner game)]
         (if (= winner 1)
           (println "***YOU WIN!***")
           (println "***YOU LOSE!***"))
-        nil)
+        (flush)
+        nil) ; returning nil not neccesary, but clarifies the code
       (do
-        (printgame game)
         (print "Fire: ")
         (flush)
         (let [input-line (read-line) 
@@ -110,6 +115,7 @@
             (= \Q letter)
             (do
               (println "Be seeing you...")
+              (flush)
               nil)
             (or (nil? letter) (nil? number))
             (do