Working on unit tests.

src/cc/journeyman/the_great_game/buildings/rectangular.clj

@@ -115,36 +115,6 @@
                           :cultures #{:coastal}
                           :modules []}})
 
-;; TODO: So, modules need to contain
-;;
-;; 1. Ground floor modules, having external doors;
-;; 2. Craft modules -- workshops -- which will normally be ground floor (except
-;; weavers) and may have the constraint that no upper floor module can cover them;
-;; 3. Upper floor modules, having NO external doors (but linking internal doors);
-;; 4. Roof modules
-;; 
-;; There also needs to be an undercroft or platform module, such that the area of 
-;; the top of the platform is identical with the footprint of the building, and 
-;; the altitude of the top of the platform is equal to the altitude of the 
-;; terrain at the heighest corner of the building; so that the actual 
-;; building doesn't float in the air, and also so that none of the doors or windows
-;; are partly underground.
-;;
-;; Each module needs to wrap an actual 3d model created in Blender or whatever, 
-;; and have a list of optional textures with which that model can be rendered. 
-;; So an upper floor bedroom module might have the following renders:
-;;
-;; 1. Bare masonry - constrained to upland or plateau terrain, and to coastal culture
-;; 2. Painted masonry - constrained to upland or plateau terrain, and to coastal culture
-;; 3. Half-timbered - not available on plateau terrain
-;; 4. Weatherboarded - constrained to forest terrain
-;; 5. Brick - constrained to arable or arid terrain
-;;
-;; of course these are only examples, and also, it's entirely possible to have
-;; for example multiple different weatherboard renders for the same module. 
-;; There needs to be a way of rendering what can be built above what: for
-;; example, you can't have a masonry clad module over a half timbered one, 
-;; but you can have a half-timbered one over a masonry one
 
 (defn building-family
   "A building family is essentially a collection of models of building modules

src/cc/journeyman/the_great_game/gossip/news_items.clj

@@ -1,5 +1,5 @@
 (ns cc.journeyman.the-great-game.gossip.news-items
-  "Categories of news events interesting to gossip agents.
+  "Using news items (propositions) to transfer knowledge between gossip agents.
    
    The ideas here are based on the essay [The spread of knowledge in a large
    game world](The-spread-of-knowledge-in-a-large-game-world.html), q.v.; 
@@ -22,7 +22,8 @@
    list of propositions, each of which must be checked every time any new
    proposition is offered. This is woefully inefficient. "
   (:require [cc.journeyman.the-great-game.world.location :refer [distance-between]]
-            [cc.journeyman.the-great-game.time :refer [game-time]]))
+            [cc.journeyman.the-great-game.time :refer [game-time]]
+            [taoensso.timbre :as l]))
 
 
 (def news-topics
@@ -155,8 +156,8 @@
 
 (defn interesting-location?
   "True if the location of this news `item` is interesting to this `gossip`."
-  [gossip item]
-  (> (interest-in-location gossip (:location item)) 0))
+  [gossip location]
+  (> (interest-in-location gossip location) 0))
 
 (defn interesting-object?
   [gossip object]
@@ -190,13 +191,16 @@
    learning that 'someone killed Sweet Daisy', but there is point in learning
    'someone killed Sweet Daisy _with poison_'."
   [new-item known-item]
-  (reduce
-   #(and %1 %2)
-   (map #(if
-          (known-item %) ;; if known-item has this key
-           (compatible-value? (new-item %) (known-item %))
-           true)
-        (remove #{:nth-hand :confidence :learned-from} (keys new-item)))))
+  (if
+   (reduce
+    #(and %1 %2)
+    (map #(if
+           (known-item %) ;; if known-item has this key
+            (compatible-value? (new-item %) (known-item %))
+            true)
+         (remove #{:nth-hand :confidence :learned-from} (keys new-item))))
+    true
+    false))
 
 (defn known-item?
   "True if this news `item` is already known to this `gossip`.
@@ -205,9 +209,13 @@
    the same _or more specific_ values for all the keys of this `item` except
    `:nth-hand`, `:confidence` and `:learned-from`."
   [gossip item]
-  (reduce
-   #(or %1 %2)
-   (filter true? (map #(compatible-item? item %) (:knowledge gossip)))))
+  (if
+   (reduce
+    #(or %1 %2)
+    false
+    (filter true? (map #(compatible-item? item %) (:knowledge gossip))))
+    true
+    false))
 
 (defn interesting-item?
   "True if anything about this news `item` is interesting to this `gossip`."
@@ -220,30 +228,39 @@
         (interesting-object? gossip (:object item))
         (interesting-topic? gossip (:verb item)))))
 
+(defn inc-or-one
+  "If this `val` is a number, return that number incremented by one; otherwise,
+   return 1. TODO: should probably be in `utils`."
+  [val]
+  (if
+   (number? val)
+    (inc val)
+    1))
+
 (defn infer
-  "Infer a new knowledge item from this `item`, following this `rule`"
+  "Infer a new knowledge item from this `item`, following this `rule`."
   [item rule]
+;;  (l/info "Applying rule '" rule "' to item '" item "'")
   (reduce merge
           item
           (cons
-           {:verb (:verb rule)}
-           (map (fn [k] {k (apply (k rule) (list item))})
+           {:verb (:verb rule)
+            :nth-hand (inc-or-one (:nth-hand item))}
+           (map (fn [k] {k (item (rule k))})
                 (remove
-                 #{:verb}
+                 #{:verb :nth-hand}
                  (keys rule))))))
 
 (declare learn-news-item)
 
 (defn make-all-inferences
-  "Return a list of knowledge entries that can be inferred from this news
+  "Return a set of knowledge entries that can be inferred from this news
   `item`."
   [item]
   (set
-   (reduce
-    concat
     (map
-     #(:knowledge (learn-news-item {} (infer item %) false))
-     (:inferences (news-topics (:verb item)))))))
+     #(infer item %)
+     (:inferences (news-topics (:verb item))))))
 
 (defn degrade-character
   "Return a character specification like this `character`, but comprising
@@ -264,15 +281,6 @@
              location))]
     (when-not (empty? l) l)))
 
-(defn inc-or-one
-  "If this `val` is a number, return that number incremented by one; otherwise,
-   return 1. TODO: should probably be in `utils`."
-  [val]
-  (if
-   (number? val)
-    (inc val)
-    1))
-
 (defn learn-news-item
   "Return a gossip like this `gossip`, which has learned this news `item` if
   it is of interest to them."

src/cc/journeyman/the_great_game/location/location.clj

@@ -43,5 +43,3 @@
 
  ;; (.settlement (OrientedLocation. 123.45 543.76 12.34 0.00 {}))
 
-
-;; (OrientedLocation. 123.45 543.76 12.34 0.00 {})