simon/the-great-game
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

All but one test on gossip.news-items pass

Browse source 
Ran 23 tests containing 105 assertions.
1 failures, 0 errors.
This commit is contained in:
Simon Brooke 2021-06-10 12:35:55 +01:00
parent 23032c586c
commit 32d6d71e6c
No known key found for this signature in database
GPG key ID: A7A4F18D1D4DF987
10 changed files with 185 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -36,3 +36,9 @@ libopenal64.so
.settings/
.classpath
.project
.calva/
.lsp/
*.so

2
docs/codox/cc.journeyman.the-great-game.buildings.rectangular.html
View file

@ -29,4 +29,4 @@
<li>crafts to which it is appropriate;</li>
<li>cultures to which it is appropriate.</li>
</ul>
<p>Each generated building will be of one family, and will comprise modules taken only from that family.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/the-great-game/blob/master/src/cc/journeyman/the_great_game/buildings/rectangular.clj#L98">view source</a></div></div><div class="public anchor" id="var-*crafts*"><h3>*crafts*</h3><h4 class="dynamic">dynamic</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Crafts which affect building types in the game. See <code>Populating a game world</code>. TODO: placeholder</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/the-great-game/blob/master/src/cc/journeyman/the_great_game/buildings/rectangular.clj#L93">view source</a></div></div><div class="public anchor" id="var-*cultures*"><h3>*cultures*</h3><h4 class="dynamic">dynamic</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Cultures which affect building families. TODO: placeholder</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/the-great-game/blob/master/src/cc/journeyman/the_great_game/buildings/rectangular.clj#L89">view source</a></div></div><div class="public anchor" id="var-*terrain-types*"><h3>*terrain-types*</h3><h4 class="dynamic">dynamic</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Types of terrain which affect building families. TODO: This is a placeholder; a more sophisticated model will be needed.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/the-great-game/blob/master/src/cc/journeyman/the_great_game/buildings/rectangular.clj#L84">view source</a></div></div><div class="public anchor" id="var-build.21"><h3>build!</h3><div class="usage"><code>(build! holding terrain culture craft size)</code></div><div class="doc"><div class="markdown"><p>Builds a building, and returns a data structure which represents it. In building the building, it adds a model of the building to the representation of the world, so it does have a side effect.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/the-great-game/blob/master/src/cc/journeyman/the_great_game/buildings/rectangular.clj#L163">view source</a></div></div><div class="public anchor" id="var-building-family"><h3>building-family</h3><div class="usage"><code>(building-family terrain culture craft gene)</code></div><div class="doc"><div class="markdown"><p>A building family is essentially a collection of models of building modules which can be assembled to create buildings of a particular structural and architectural style.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/the-great-game/blob/master/src/cc/journeyman/the_great_game/buildings/rectangular.clj#L149">view source</a></div></div></div></body></html>
<p>Each generated building will be of one family, and will comprise modules taken only from that family.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/the-great-game/blob/master/src/cc/journeyman/the_great_game/buildings/rectangular.clj#L98">view source</a></div></div><div class="public anchor" id="var-*crafts*"><h3>*crafts*</h3><h4 class="dynamic">dynamic</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Crafts which affect building types in the game. See <code>Populating a game world</code>. TODO: placeholder</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/the-great-game/blob/master/src/cc/journeyman/the_great_game/buildings/rectangular.clj#L93">view source</a></div></div><div class="public anchor" id="var-*cultures*"><h3>*cultures*</h3><h4 class="dynamic">dynamic</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Cultures which affect building families. TODO: placeholder</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/the-great-game/blob/master/src/cc/journeyman/the_great_game/buildings/rectangular.clj#L89">view source</a></div></div><div class="public anchor" id="var-*terrain-types*"><h3>*terrain-types*</h3><h4 class="dynamic">dynamic</h4><div class="usage"></div><div class="doc"><div class="markdown"><p>Types of terrain which affect building families. TODO: This is a placeholder; a more sophisticated model will be needed.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/the-great-game/blob/master/src/cc/journeyman/the_great_game/buildings/rectangular.clj#L84">view source</a></div></div><div class="public anchor" id="var-build.21"><h3>build!</h3><div class="usage"><code>(build! holding terrain culture craft size)</code></div><div class="doc"><div class="markdown"><p>Builds a building, and returns a data structure which represents it. In building the building, it adds a model of the building to the representation of the world, so it does have a side effect.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/the-great-game/blob/master/src/cc/journeyman/the_great_game/buildings/rectangular.clj#L133">view source</a></div></div><div class="public anchor" id="var-building-family"><h3>building-family</h3><div class="usage"><code>(building-family terrain culture craft gene)</code></div><div class="doc"><div class="markdown"><p>A building family is essentially a collection of models of building modules which can be assembled to create buildings of a particular structural and architectural style.</p></div></div><div class="src-link"><a href="https://github.com/simon-brooke/the-great-game/blob/master/src/cc/journeyman/the_great_game/buildings/rectangular.clj#L119">view source</a></div></div></div></body></html>

24
docs/codox/cc.journeyman.the-great-game.gossip.news-items.html
View file

File diff suppressed because one or more lines are too long

2
docs/codox/cc.journeyman.the-great-game.playroom.html
View file

File diff suppressed because one or more lines are too long

2
docs/codox/cc.journeyman.the-great-game.utils.html
View file

File diff suppressed because one or more lines are too long

2
docs/codox/index.html
View file

File diff suppressed because one or more lines are too long

116
src/cc/journeyman/the_great_game/gossip/news_items.clj
View file

@ -1,6 +1,15 @@
(ns cc.journeyman.the-great-game.gossip.news-items
"Using news items (propositions) to transfer knowledge between gossip agents.
## Status
What is here is essentially working. It's not, however, working with the
rich data objects which will be needed, and it's not yet nearly efficient
enough, but it allows knowledge to propagate through the world procedurally,
at a rate limited by the speed of movement of the gossip agents.
## Discussion
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.;
they've advanced a little beyond that and will doubtless
@ -8,7 +17,7 @@
A news item is a map with the keys:
* `date` - the date on which the reported event happened;
* `date` - the date on which the reported event is claimed to have happened;
* `nth-hand` - the number of agents the news item has passed through;
* `verb` - what it is that happened (key into `news-topics`);
@ -23,9 +32,9 @@
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.utils :refer [inc-or-one truthy?]]
[taoensso.timbre :as l]))
(def news-topics
"Topics of interest to gossip agents. Topics are keyed in this map by
their `verbs`. The `keys` associated with each topic are the extra pieces
@ -40,9 +49,7 @@
action;
* `price` is special to buy/sell, but of significant interest to merchants.
## Notes
### Characters
## Characters
*TODO* but note that at most all the receiver can learn about a character
from a news item is what the giver knows about that character, degraded by
@ -56,7 +63,7 @@
as the receiver stores only that segment which the receiver finds
interesting.
### Locations
## Locations
A 'location' value is a list comprising at most the x/y coordinate location
and the ids of the settlement and region (possibly hierarchically) that contain
@ -66,12 +73,11 @@
It is assumed that the `:home` of a character is a location in this sense.
### Inferences
## Inferences
If an agent learns that Adam has married Betty, they can infer that Betty has
married Adam; if they learn that Charles killed Dorothy, that Dorothy has died.
I'm not convinced that my representation of inferences here is ideal.
"
I'm not convinced that my representation of inferences here is ideal."
{;; A significant attack is interesting whether or not it leads to deaths
:attack {:verb :attack :keys [:actor :other :location]}
;; Deaths of characters may be interesting
@ -95,7 +101,7 @@
{:verb :sex}
{:verb :sex :actor :other :other :actor}]}
;; Merchants, especially, are interested in prices in other markets
:sell {:verb :sell :keys [:actor :other :object :location :price]}
:sell {:verb :sell :keys [:actor :other :object :location :quantity :price]}
;; Sex can juicy gossip, although not normally if the participants are in an
;; established sexual relationship.
:sex {:verb :sex :keys [:actor :other :location]
@ -110,6 +116,11 @@
:inferences [{:verb :war :actor :other :other :actor}]}})
(def all-known-verbs
"All verbs currently known to the gossip system."
(set (keys news-topics)))
(defn interest-in-character
"Integer representation of how interesting this `character` is to this
`gossip`.
@ -118,8 +129,11 @@
[gossip character]
(count
(concat
(filter #(= (:actor % character)) (:knowledge gossip))
(filter #(= (:other % character)) (:knowledge gossip)))))
;; TODO: we ought also check the relationships of the gossip.
;; Are relationships just propositions in the knowledge base?
(filter #(= (:actor %) character) (:knowledge gossip))
(filter #(= (:other %) character) (:knowledge gossip)))))
(defn interesting-character?
"Boolean representation of whether this `character` is interesting to this
@ -135,10 +149,13 @@
(and (map? location) (number? (:x location)) (number? (:y location)))
(if-let [home (:home gossip)]
(let [d (distance-between location home)
i (/ 10000 d) ;; 10000 at metre scale is 10km; interest should
i (if
(zero? d) 1
(/ 10000 d))
;; 10000 at metre scale is 10km; interest should
;;fall off with distance from home, but possibly on a log scale
]
(if (> i 1) i 0))
(if (>= i 1) i 0))
0)
(coll? location)
(reduce
@ -152,6 +169,7 @@
#(some (fn [x] (= x location)) (:location %))
(cons {:location (:home gossip)} (:knowledge gossip))))))
;; (distance-between {:x 25 :y 37} {:x 25 :y 37})
;; (interest-in-location {:home [{0, 0} :test-home] :knowledge []} [:test-home])
(defn interesting-location?
@ -169,6 +187,17 @@
;; TODO: Not yet (really) implemented
true)
(defn interesting-verb?
"Is this `verb` interesting to this `gossip`?"
[gossip verb]
(let [vs (:interesting-verbs gossip)]
(truthy?
(if (set? vs)
(vs verb)
false))))
;; (interesting-verb? {:interesting-verbs #{:kill :sell}} :sell)
(defn compatible-value?
"True if `known-value` is the same as `new-value`, or, for each key present
in `new-value`, has the same value for that key.
@ -191,16 +220,14 @@
learning that 'someone killed Sweet Daisy', but there is point in learning
'someone killed Sweet Daisy _with poison_'."
[new-item known-item]
(if
(truthy?
(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))
(remove #{:nth-hand :confidence :learned-from} (keys new-item))))))
(defn known-item?
"True if this news `item` is already known to this `gossip`.
@ -209,18 +236,17 @@
the same _or more specific_ values for all the keys of this `item` except
`:nth-hand`, `:confidence` and `:learned-from`."
[gossip item]
(if
(truthy?
(reduce
#(or %1 %2)
false
(filter true? (map #(compatible-item? item %) (:knowledge gossip))))
true
false))
(filter true? (map #(compatible-item? item %) (:knowledge gossip))))))
(defn interesting-item?
"True if anything about this news `item` is interesting to this `gossip`."
[gossip item]
(and (not (known-item? gossip item))
(interesting-verb? gossip item) ;; news is only interesting if the topic is.
(or
(interesting-character? gossip (:actor item))
(interesting-character? gossip (:other item))
@ -228,15 +254,6 @@
(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`."
[item rule]
@ -281,6 +298,26 @@
location))]
(when-not (empty? l) l)))
(defn degrade-news-item
[gossip item]
(assoc
item
:nth-hand (inc-or-one (:nth-hand item))
:time-stamp (if
(number? (:time-stamp item))
(:time-stamp item)
(game-time))
:location (degrade-location gossip (:location item))
:actor (degrade-character gossip (:actor item))
:other (degrade-character gossip (:other item))
;; TODO: do something to degrade confidence in the item,
;; probably as a function of the provider's confidence in
;; the item and the gossip's trust in the provider
))
;; (degrade-news-item {:home [{:x 25 :y 37} :auchencairn :scotland]}
;; {:verb :marry :actor :adam :other :belinda :location [{:x 25 :y 37} :auchencairn :scotland]})
(defn learn-news-item
"Return a gossip like this `gossip`, which has learned this news `item` if
it is of interest to them."
@ -289,20 +326,7 @@
([gossip item follow-inferences?]
(if
(interesting-item? gossip item)
(let [item' (assoc
item
:nth-hand (inc-or-one (:nth-hand item))
:time-stamp (if
(number? (:time-stamp item))
(:time-stamp item)
(game-time))
:location (degrade-location gossip (:location item))
:actor (degrade-character gossip (:actor item))
:other (degrade-character gossip (:other item))
;; TODO: do something to degrade confidence in the item,
;; probably as a function of the provider's confidence in
;; the item and the gossip's trust in the provider
)
(let [item' (degrade-news-item gossip item)
g (assoc
gossip
:knowledge
@ -313,7 +337,7 @@
(assoc
g
:knowledge
(concat (:knowledge g) (make-all-inferences item)))
(concat (:knowledge g) (make-all-inferences item')))
g)))
gossip))

38
src/cc/journeyman/the_great_game/playroom.clj
View file

@ -37,7 +37,7 @@
:init init
:update simple-update)
(start app)
;; (start app)
;; Reinitialises the running app
;;(run app
@ -45,28 +45,28 @@
;; By default, there is a Fly Camera attached to the app that you can control with W, A, S and D keys.
;; Let's increase its movement speed. Now, you fly faster :)
(run app
(set* (fly-cam) :move-speed 15))
;; (run app
;; (set* (fly-cam) :move-speed 15))
;; Updates the app
(run app
(let [{:keys [cube]} (get-state)]
(set* cube :local-translation (add (get* cube :local-translation) 1 1 1))))
;; (run app
;; (let [{:keys [cube]} (get-state)]
;; (set* cube :local-translation (add (get* cube :local-translation) 1 1 1))))
;; Updates the app adding a second cube
(run app
(let [cube (geo "jMonkey cube" (box 1 1 1))
mat (unshaded-mat)]
(set* mat :texture "ColorMap" (load-texture "textures/Monkey.jpg"))
(setc cube
:material mat
:local-translation [-3 0 0])
(add-to-root cube)
(set-state :cube2 cube)))
;; (run app
;; (let [cube (geo "jMonkey cube" (box 1 1 1))
;; mat (unshaded-mat)]
;; (set* mat :texture "ColorMap" (load-texture "textures/Monkey.jpg"))
;; (setc cube
;; :material mat
;; :local-translation [-3 0 0])
;; (add-to-root cube)
;; (set-state :cube2 cube)))
;; We added the new cube, but it's not rotating. We need to update the simple-update fn.
(defn simple-update [tpf]
(let [{:keys [cube cube2]} (get-state)]
(rotate cube 0 (* 2 tpf) 0)
(rotate cube2 0 (* 2 tpf) 0)))
;; (defn simple-update [tpf]
;; (let [{:keys [cube cube2]} (get-state)]
;; (rotate cube 0 (* 2 tpf) 0)
;; (rotate cube2 0 (* 2 tpf) 0)))

16
src/cc/journeyman/the_great_game/utils.clj
View file

@ -43,3 +43,19 @@
;; (value-or-default {:x 0 :y 0 :altitude 7} :altitude 8)
;; (value-or-default {:x 0 :y 0 :altitude 7} :alt 8)
;; (value-or-default nil :altitude 8)
(defn truthy?
"Returns `true` unless `val` is `nil`, `false` or an empty sequence.
Otherwise always 'false'; never any other value."
[val]
(and (or val false) true))
(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))

64
test/cc/journeyman/the_great_game/gossip/news_items_test.clj
View file

@ -1,8 +1,49 @@
(ns cc.journeyman.the-great-game.gossip.news-items-test
(:require [clojure.test :refer [deftest is testing]]
[cc.journeyman.the-great-game.gossip.news-items :refer
[compatible-item? degrade-location infer interest-in-location interesting-location?
learn-news-item make-all-inferences]]))
[all-known-verbs compatible-item? degrade-location infer
interest-in-character interesting-character? interest-in-location
interesting-location? learn-news-item make-all-inferences]]))
(deftest interesting-character-tests
(testing "To what degree characters are of interest to the gossip"
(let [expected 1
gossip {:home [{0, 0} :test-home]
:interesting-verbs all-known-verbs
;; already knows about adam
:knowledge [{:verb :sell :actor :adam :other :charles :object :wheat :quantity 10 :price 5 :location [:test-home]}]}
actual (interest-in-character
gossip
:adam)]
(is (= actual expected)))
(let [expected 0
gossip {:home [{0, 0} :test-home]
:interesting-verbs all-known-verbs
;; already knows about adam
:knowledge [{:verb :sell :actor :adam :other :charles :object :wheat :quantity 10 :price 5 :location [:test-home]}]}
actual (interest-in-character
gossip
:dorothy)]
(is (= actual expected))))
(testing "Whether characters are of interest to the gossip"
(let [expected true
gossip {:home [{0, 0} :test-home]
:interesting-verbs all-known-verbs
;; already knows about adam
:knowledge [{:verb :sell :actor :adam :other :charles :object :wheat :quantity 10 :price 5 :location [:test-home]}]}
actual (interesting-character?
gossip
:adam)]
(is (= actual expected)))
(let [expected false
gossip {:home [{0, 0} :test-home]
:interesting-verbs all-known-verbs
;; already knows about adam
:knowledge [{:verb :sell :actor :adam :other :charles :object :wheat :quantity 10 :price 5 :location [:test-home]}]}
actual (interesting-character?
gossip
:dorothy)]
(is (= actual expected)))))
(deftest compatible-item-test
(testing "Compatible item: items are identical"
@ -128,17 +169,17 @@
(deftest inference-tests
(testing "Ability to infer new knowledge from news items: single rule tests"
(let [expected {:verb :marry, :actor :belinda, :other :adam}
(let [expected {:verb :marry, :actor :belinda, :other :adam, :nth-hand 1}
item {:verb :marry :actor :adam :other :belinda}
rule {:verb :marry :actor :other :other :actor}
actual (infer item rule)]
(is (= actual expected)))
(let [expected {:verb :attack, :actor :adam, :other :belinda}
(let [expected {:verb :attack, :actor :adam, :other :belinda, :nth-hand 1}
item {:verb :rape :actor :adam :other :belinda}
rule {:verb :attack}
actual (infer item rule)]
(is (= actual expected)))
(let [expected {:verb :sex, :actor :belinda, :other :adam}
(let [expected {:verb :sex, :actor :belinda, :other :adam, :nth-hand 1}
item {:verb :rape :actor :adam :other :belinda}
rule {:verb :sex :actor :other :other :actor}
actual (infer item rule)]
@ -149,15 +190,22 @@
{:verb :attack, :actor :adam, :other :belinda, :location :test-home, :nth-hand 1}}
;; dates will not be and cannot be expected to be equal
actual (set (make-all-inferences
{:verb :rape :actor :adam :other :belinda :location :test-home :nth-hand 1}))]
{:verb :rape :actor :adam :other :belinda :location :test-home}))]
(is (= actual expected)))))
(deftest learn-tests
(testing "Learning from an interesting news item."
(let [expected {:home [{0 0} :test-home]
:knowledge [{:verb :sex, :actor :adam, :other :belinda, :location [:test-home], :nth-hand 1}
:interesting-verbs all-known-verbs
:knowledge [{:verb :sell :actor :adam :other :charles :object :wheat :quantity 10 :price 5 :location [:test-home]}
{:verb :sex, :actor :adam, :other :belinda, :location [:test-home], :nth-hand 1}
{:verb :sex, :actor :belinda, :other :adam, :location [:test-home], :nth-hand 1}]}
gossip {:home [{0, 0} :test-home]
:interesting-verbs all-known-verbs
;; already knows about adam
:knowledge [{:verb :sell :actor :adam :other :charles :object :wheat :quantity 10 :price 5 :location [:test-home]}]}
actual (learn-news-item
{:home [{0, 0} :test-home] :knowledge []}
gossip
{:verb :sex :actor :adam :other :belinda :location [:test-home]})]
(is (= actual expected)))))