simon/mw-engine
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Work on trying to improve performance.

Browse source
This commit is contained in:
Simon Brooke 2014-08-28 21:43:36 +01:00
parent 2bf9d34794
commit 1120cb42e8
2 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/mw_engine/core.clj
View file

@ -2,7 +2,8 @@
(ns mw-engine.core (ns mw-engine.core
(:use mw-engine.utils) (:use mw-engine.utils)
(:require [mw-engine.world :as world]) (:require [clojure.core.reducers :as r]
[mw-engine.world :as world])
(:gen-class)) (:gen-class))
;; Every rule is a function of two arguments, a cell and a world. If the rule ;; Every rule is a function of two arguments, a cell and a world. If the rule
@ -79,16 +80,34 @@
these `:rules`. As a side effect, print the world." these `:rules`. As a side effect, print the world."
[state] [state]
(let [world (transform-world (:world state) (:rules state))] (let [world (transform-world (:world state) (:rules state))]
(world/print-world world) ;;(world/print-world world)
{:world world :rules (:rules state)})) {:world world :rules (:rules state)}))
(defn run-world (defn run-world
"Run this world with these rules for this number of generations. "Run this world with these rules for this number of generations.
* `world` a world as discussed above; * `world` a world as discussed above;
* `init-rules` a sequence of rules as defined above, to be run once to initialise the world; * `init-rules` a sequence of rules as defined above, to be run once to initialise the world;
* `rules` a sequence of rules as definied above, to be run iteratively for each generation; * `rules` a sequence of rules as defined above, to be run iteratively for each generation;
* `generations` an (integer) number of generations." * `generations` an (integer) number of generations.
Return the final generation of the world."
[world init-rules rules generations] [world init-rules rules generations]
(let [state {:world (transform-world world init-rules) :rules rules}] (let [state {:world (transform-world world init-rules) :rules rules}]
(take generations (iterate transform-world-state state)))) (:world
(last
(do-all
(take generations
(iterate transform-world-state state)))))))
(defn run-world2
"Doesn't work yet"
[world init-rules rules generations]
(with-local-vars [r (ref (transform-world world init-rules))]
(dotimes [g generations]
(dosync
(ref-set r (transform-world (deref r) rules))))
(deref r)))

16
src/mw_engine/utils.clj
View file

@ -1,7 +1,9 @@
;; Utility functions needed by MicroWorld and, specifically, in the interpretation of MicroWorld rule. ;; Utility functions needed by MicroWorld and, specifically, in the interpretation of MicroWorld rule.
(ns mw-engine.utils (ns mw-engine.utils
(:require [clojure.math.combinatorics :as combo])) (:require
[clojure.core.reducers :as r]
[clojure.math.combinatorics :as combo]))
(defn abs (defn abs
"Surprisingly, Clojure doesn't seem to have an abs function, or else I've "Surprisingly, Clojure doesn't seem to have an abs function, or else I've
@ -34,11 +36,13 @@
([world function] ([world function]
(map-world world function nil)) (map-world world function nil))
([world function additional-args] ([world function additional-args]
(apply vector ;; vectors are more efficient for scanning, which we do a lot. (into [] ;; vectors are more efficient for scanning, which we do a lot.
(for [row world] (r/map (fn [row]
(apply vector (into [] (r/map
(map #(apply function (cons world (cons % additional-args))) #(apply function
row)))))) (cons world (cons % additional-args)))
row)))
world))))
(defn get-cell (defn get-cell
"Return the cell a x, y in this world, if any. "Return the cell a x, y in this world, if any.