more tests that passes

This commit is contained in:
didier amyot committed 2018-05-23 21:20:45 -04:00
1 parent 8fb9335411
commit 0d126be10c
4 files changed
+18 -12

No files matched your search

+10 -8
View File
@@ -31,21 +31,23 @@
(defn create-sell-trade-factory [order-to-fulfill]
(fn [trade book-order]
(let [qtn-to-fulfill (min (:quantity book-order) (- (:quantity order-to-fulfill) (:already-fulfilled trade 0)))
can-fulfill? (< (:price book-order) (:price order-to-fulfill))]
(when (and can-fulfill? (< qtn-to-fulfill 0))
(let [already-fulfilled (:book.order/already-fulfilled trade 0)
qtn-to-fulfill (min (:quantity book-order) (- (:quantity order-to-fulfill) already-fulfilled))
can-fulfill? (<= (:price book-order) (:price order-to-fulfill))]
(when (and can-fulfill? (< 0 qtn-to-fulfill))
#:book.order{:type :sell
:quantity qtn-to-fulfill
:already-fulfilled (+ already-fulfilled qtn-to-fulfill)
:price (min (:price book-order) (:price order-to-fulfill))
:order-id (:book.order/id order-to-fulfill)
:book-id (:book.order/id book-order)}))))
(defn create-sell-trades [order-to-fulfill sell-book]
(take-while nil?
(reductions (create-sell-trade-factory order-to-fulfill) sell-book)))
(let [create-sell-trade (create-sell-trade-factory order-to-fulfill)
trades (reductions create-sell-trade {} sell-book)
ret (rest (take-while some? trades))]
(map #(dissoc % :book.order/already-fulfilled) ret)))
(defn partial-trade? [trade order]
(not= (:quantity order) (:book.order/quantity trade)))
@@ -65,7 +67,7 @@
(defn match-buy-order-in-sell-book [sell-book order]
(let [trades (create-trade order (first sell-book))
(let [trades-1 [(create-trade order (first sell-book))]
trades (create-sell-trades order sell-book)
new-book (compute-new-sell-book-after-trades sell-book trades)]
[trades new-book]))