From f985dc4e5c9fdec06436c21440c3dc7245369847 Mon Sep 17 00:00:00 2001 From: dozens Date: Thu, 6 Jun 2024 22:49:52 -0600 Subject: feat: add moving phase also moves `moves` into the game object and moves updating `moves` to game:update --- lib/flip.fnl | 6 ------ lib/flip.test.fnl | 13 ------------- lib/index.fnl | 6 ++++-- lib/kvflip.fnl | 6 ++++++ lib/kvflip.test.fnl | 13 +++++++++++++ lib/space-is-neighbor.fnl | 18 ++++++++++++++++++ lib/space-is-neighbor.test.fnl | 22 ++++++++++++++++++++++ 7 files changed, 63 insertions(+), 21 deletions(-) delete mode 100644 lib/flip.fnl delete mode 100644 lib/flip.test.fnl create mode 100644 lib/kvflip.fnl create mode 100644 lib/kvflip.test.fnl create mode 100644 lib/space-is-neighbor.fnl create mode 100644 lib/space-is-neighbor.test.fnl (limited to 'lib') diff --git a/lib/flip.fnl b/lib/flip.fnl deleted file mode 100644 index 9d21b63..0000000 --- a/lib/flip.fnl +++ /dev/null @@ -1,6 +0,0 @@ -(fn flip [t] - "takes a table of {key value} and returns a table of {value key}" - (collect [k v (pairs t)] (values v k))) - -{: flip} - diff --git a/lib/flip.test.fnl b/lib/flip.test.fnl deleted file mode 100644 index 32fa005..0000000 --- a/lib/flip.test.fnl +++ /dev/null @@ -1,13 +0,0 @@ -(let [{: flip} (require :lib.flip) - {: describe :end test-end} (require :lib.test)] - (describe "flip()" (fn [t] - (let [input {:apple "red" :banana "yellow"} - expected {:red "apple" :yellow "banana"} - ] - (t {:given "a table" - :should "flip that table!" - : expected - :actual (flip input)}) - (test-end))))) - - diff --git a/lib/index.fnl b/lib/index.fnl index 6323160..1fb686c 100644 --- a/lib/index.fnl +++ b/lib/index.fnl @@ -1,19 +1,21 @@ (local {: contains} (require :lib.contains)) -(local {: flip} (require :lib.flip)) (local {: head} (require :lib.head)) (local {: keys} (require :lib.keys)) +(local {: kvflip} (require :lib.kvflip)) (local {: mill-at?} (require :lib.mill)) (local {: pprint} (require :lib.tableprint)) (local {: slice} (require :lib.slice)) +(local {: space-is-neighbor?} (require :lib.space-is-neighbor)) (local {: tail} (require :lib.tail)) { : contains - : flip : head : keys + : kvflip : mill-at? : pprint : slice + : space-is-neighbor? : tail } diff --git a/lib/kvflip.fnl b/lib/kvflip.fnl new file mode 100644 index 0000000..25fc222 --- /dev/null +++ b/lib/kvflip.fnl @@ -0,0 +1,6 @@ +(fn kvflip [t] + "takes a table of {key value} and returns a table of {value key}" + (collect [k v (pairs t)] (values v k))) + +{: kvflip} + diff --git a/lib/kvflip.test.fnl b/lib/kvflip.test.fnl new file mode 100644 index 0000000..162650d --- /dev/null +++ b/lib/kvflip.test.fnl @@ -0,0 +1,13 @@ +(let [{: kvflip} (require :lib.kvflip) + {: describe :end test-end} (require :lib.test)] + (describe "kvflip()" (fn [t] + (let [input {:apple "red" :banana "yellow"} + expected {:red "apple" :yellow "banana"} + ] + (t {:given "a table" + :should "kvflip that table!" + : expected + :actual (kvflip input)}) + (test-end))))) + + diff --git a/lib/space-is-neighbor.fnl b/lib/space-is-neighbor.fnl new file mode 100644 index 0000000..380607c --- /dev/null +++ b/lib/space-is-neighbor.fnl @@ -0,0 +1,18 @@ +(local {: contains} (require :lib.contains)) +(local {: head} (require :lib.head)) +(local {: tail} (require :lib.tail)) + +(lambda space-is-neighbor? [all-neighbors from to] + ;; i have learned to check that i'm passing the correct type of move + ;; i.e. a number and not a string + (assert (= "number" (type from)) "from must be a number") + (assert (= "number" (type to)) "to must be a number") + (assert (= "table" (type all-neighbors)) "all-neighbors must be a table") + + (let [neighborhood-list (icollect [_ n (ipairs all-neighbors)] (if (= from (head n)) n)) + neighborhood (head neighborhood-list) + neighbors (tail neighborhood) + is-neighbor (contains neighbors to)] + is-neighbor)) + +{: space-is-neighbor?} diff --git a/lib/space-is-neighbor.test.fnl b/lib/space-is-neighbor.test.fnl new file mode 100644 index 0000000..7b0c0af --- /dev/null +++ b/lib/space-is-neighbor.test.fnl @@ -0,0 +1,22 @@ +(let [{: space-is-neighbor?} (require :lib.space-is-neighbor) + {: neighbors} (require :lib.constants) + {: describe :end test-end} (require :lib.test) + with-neighbors (partial space-is-neighbor? neighbors) + ] + + (describe "space-is-neighbor()" (fn [t] + (t {:given "space of 3" + :should "know 2 is a neighbor" + :expected true + :actual (with-neighbors 3 2)}) + (t {:given "space of 3" + :should "know 15 is a neighbor" + :expected true + :actual (with-neighbors 3 15)}) + (t {:given "space of 3" + :should "know 1 is not a neighbor" + :expected false + :actual (with-neighbors 3 1)}) + + (test-end)))) + -- cgit 1.4.1-2-gfad0