Done the first bit of work towards making the web side of this work,
namely roughing out the structure of a table in which the vending machine mechanism can fit, and downloading appropriate images.
This commit is contained in:
parent
cbe6842991
commit
8a78132d90
BIN
resources/public/img/caramel_wafer.jpg
Normal file
BIN
resources/public/img/caramel_wafer.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 21 KiB |
BIN
resources/public/img/snowball.png
Normal file
BIN
resources/public/img/snowball.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 39 KiB |
BIN
resources/public/img/teacake.jpg
Normal file
BIN
resources/public/img/teacake.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 49 KiB |
|
|
@ -1,131 +0,0 @@
|
||||||
(ns vending.core)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(defn make-default-machine [] { :stock {:apples 5 :oranges 5 :lemons 5}
|
|
||||||
:coins {:dollars 1 :quarters 4 :dimes 4 :nickels 4}
|
|
||||||
:tendered nil
|
|
||||||
:last-message ""
|
|
||||||
:change nil
|
|
||||||
:output nil} )
|
|
||||||
|
|
||||||
(def coin-values {:dollar 1 :quarter 0.25 :dime 0.10 :nickel 0.05})
|
|
||||||
|
|
||||||
(keys coin-values)
|
|
||||||
|
|
||||||
(.indexOf (keys coin-values) :nickel)
|
|
||||||
|
|
||||||
(def item-prices {:apples 0.65 :oranges 1 :lemons 1.5})
|
|
||||||
|
|
||||||
(defn coin-value [coin]
|
|
||||||
(coin-values coin))
|
|
||||||
|
|
||||||
(defn coins-value [coins]
|
|
||||||
"Sum the value of these coins."
|
|
||||||
(apply + (map coin-value coins)))
|
|
||||||
|
|
||||||
(defn coin-return [machine]
|
|
||||||
"Return all tendered coins in this machine."
|
|
||||||
(assoc (dissoc machine :tendered) :change (:tendered machine)))
|
|
||||||
|
|
||||||
(defn add-coin [machine coin]
|
|
||||||
"Add this coin to this machine."
|
|
||||||
(assoc (dissoc machine :tendered) :tendered (cons coin (:tendered machine))))
|
|
||||||
|
|
||||||
(defn add-coins [machine coins]
|
|
||||||
"Add these coins to this machine"
|
|
||||||
(cond (empty? coins) machine
|
|
||||||
true (add-coins (add-coin machine (first coins)) (rest coins))))
|
|
||||||
|
|
||||||
(defn magic-inc [maybenum]
|
|
||||||
"A wrapper round inc which treats nil as zero."
|
|
||||||
(cond (nil? maybenum) 1
|
|
||||||
true (inc maybenum)))
|
|
||||||
|
|
||||||
(defn sum-coin [coin sums]
|
|
||||||
"Adds this coin (assumed to be on of :dollars, :quarters, :dimes, :nickels)
|
|
||||||
to this map of sums."
|
|
||||||
(update-in sums [coin] magic-inc))
|
|
||||||
|
|
||||||
(defn sum-coins
|
|
||||||
"takes a list in the form (:dollars :dollars :dimes :quarters :nickels) and returns
|
|
||||||
a map {:dollars 2 :quarters 1 :dimes 1 :nickels 1}. Optional second argument: an
|
|
||||||
existing map in that general form."
|
|
||||||
([coins]
|
|
||||||
(sum-coins coins {}))
|
|
||||||
([coins sums]
|
|
||||||
(cond (empty? coins) sums
|
|
||||||
true (sum-coins (rest coins) (sum-coin (first coins) sums)))))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(defn subtract-denomination [list position]
|
|
||||||
(cond (= (count list) position)(cons (- (first list) 1) (rest list))
|
|
||||||
true (cons (first list) (subtract-denomination (rest list) position))))
|
|
||||||
|
|
||||||
(defn subtract-nickle [list]
|
|
||||||
(subtract-denomination list 1))
|
|
||||||
|
|
||||||
(defn subtract-dime [list]
|
|
||||||
(subtract-denomination list 2))
|
|
||||||
|
|
||||||
(defn subtract-quarter [list]
|
|
||||||
(subtract-denomination list 3))
|
|
||||||
|
|
||||||
(defn subtract-dollar [list]
|
|
||||||
(subtract-denomination list 4))
|
|
||||||
|
|
||||||
(defn in-make-change [amount dollars quarters dimes nickels]
|
|
||||||
"Return a tuple (dollars quarters nickels dimes) which indicates the number remaining
|
|
||||||
after making change, or nil if not possible"
|
|
||||||
(cond
|
|
||||||
(= amount 0) (list dollars quarters dimes nickels)
|
|
||||||
(and (>= amount (:dollar coin-values)) (> dollars 0))
|
|
||||||
(in-make-change (- amount (:dollar coin-values)) (- dollars 1) quarters dimes nickels)
|
|
||||||
(and (>= amount (:quarter coin-values)) (> quarters 0))
|
|
||||||
(in-make-change (- amount (:quarter coin-values)) dollars (- quarters 1) dimes nickels)
|
|
||||||
(and (>= amount (:dime coin-values)) (> dimes 0))
|
|
||||||
(in-make-change (- amount (:dime coin-values)) dollars quarters (- dimes 1) nickels)
|
|
||||||
(and (>= amount (:nickel coin-values)) (> nickels 0))
|
|
||||||
(in-make-change (- amount (:nickel coin-values)) dollars quarters dimes (- nickels 1))))
|
|
||||||
|
|
||||||
(defn make-change [amount dollars quarters dimes nickels]
|
|
||||||
(map #(- %1 %2) (list dollars quarters dimes nickels)
|
|
||||||
(in-make-change amount dollars quarters dimes nickels)
|
|
||||||
))
|
|
||||||
|
|
||||||
(defn subtract-change [machine change]
|
|
||||||
"subtract this change from this machine")
|
|
||||||
|
|
||||||
(defn make-change-machine [machine item-price change]
|
|
||||||
(let [
|
|
||||||
tend (sum-coins (:tendered machine))
|
|
||||||
change (make-change item-price (:dollar tend) (:quarter tend) (:dime tend) (:nickel tend))]
|
|
||||||
(cond (nil? change) machine)
|
|
||||||
true (assoc (dissoc (subtract-change machine change) :change ) :change change )))
|
|
||||||
|
|
||||||
(defn remove-from-stock [machine item]
|
|
||||||
machine)
|
|
||||||
|
|
||||||
(defn deliver-item [machine item change]
|
|
||||||
(make-change-machine
|
|
||||||
(remove-from-stock
|
|
||||||
(assoc (dissoc machine :output) :output (cons item (:output machine)))
|
|
||||||
item)
|
|
||||||
(item item-prices)
|
|
||||||
change))
|
|
||||||
|
|
||||||
|
|
||||||
(defn get-item [machine item]
|
|
||||||
(let [item-price (item item-prices)
|
|
||||||
tend (sum-coins (:tendered machine))
|
|
||||||
change (make-change item-price (:dollar tend) (:quarter tend) (:dime tend) (:nickel tend))]
|
|
||||||
(cond (<= 0 (item (:stock machine))) (coin-return machine)
|
|
||||||
(<= (coins-value (:tendered machine)) item-price) (coin-return machine)
|
|
||||||
(empty? change) (coin-return)
|
|
||||||
true (deliver-item machine item change))))
|
|
||||||
|
|
||||||
(defn get-apple [machine]
|
|
||||||
(get-item machine :apples))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -11,4 +11,43 @@
|
||||||
{{content|safe}}
|
{{content|safe}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="content">
|
||||||
|
<h2>OK, the Vending machine plan</h2>
|
||||||
|
<p>What this project is about is the
|
||||||
|
<a href="http://code.joejag.com/coding-dojo-vending-machine/">Vending Machine code kata</a>.
|
||||||
|
Just at this point, I've added the whole of a <a href="http://www.luminusweb.net/">luminusweb</a>
|
||||||
|
default template to it, but I haven't done much with it. In due course this page will be replaced
|
||||||
|
with a graphical representation of a <a href="http://en.wikipedia.org/wiki/W._Heath_Robinson">heath-robinson</a>
|
||||||
|
vending machine, with buttons allowing coins to be inserted, and items to be selected.<p>
|
||||||
|
<p>I intend that the page should be interactive, with the vending machine responding graphically to
|
||||||
|
what the user does on the buttons. The logic will almost certainly be server-side at first,
|
||||||
|
but possibly later I'll move it client-side using ClojureScript.</p>
|
||||||
|
<p>At this stage in the project this page uses the <a href="https://github.com/yogthos/Selmer">Selmer</a>
|
||||||
|
templating system; later I intend that it should use <a href="https://github.com/cgrand/enlive">Enlive</a>.</p>
|
||||||
|
<table class="machine">
|
||||||
|
<tr>
|
||||||
|
<td colspan="8" id="tendered-coins">Tendered coins</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td id="teacake" class="items">Teacakes</td>
|
||||||
|
<td id="caramel-wafer" class="items">Caramel wafers</td>
|
||||||
|
<td id="snowballs" class="items">Snowballs</td>
|
||||||
|
<td id="merk" class="coins">Merks</td>
|
||||||
|
<td id="plack" class="coins">Placks</td>
|
||||||
|
<td id="bawbee" class="coins">Bawbees</td>
|
||||||
|
<td id="bodle" class="coins">Bodles</td>
|
||||||
|
<td id="change-chute"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td colspan="3" id="output" class="hoppers">Output</td>
|
||||||
|
<td colspan="5" id="change" class="hoppers">Change</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
{% for button in buttons %}
|
||||||
|
<td class="button" id="{{ button }}-cell">
|
||||||
|
<submit name="action" value="{{ button }}" id="{{ button }}-button"/>
|
||||||
|
</td>
|
||||||
|
{% endfor %}
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue