rename, format
This commit is contained in:
parent
d379c21296
commit
56a1bed93d
@ -54,7 +54,7 @@
|
|||||||
(def Int z3/Int)
|
(def Int z3/Int)
|
||||||
(def Optimize z3/Optimize)
|
(def Optimize z3/Optimize)
|
||||||
(def Sum z3/Sum)
|
(def Sum z3/Sum)
|
||||||
(defn apply-formulas [opt [f & fs]]
|
(defn apply-formulas! [opt [f & fs]]
|
||||||
(when f
|
(when f
|
||||||
(! "add" opt f)
|
(! "add" opt f)
|
||||||
(recur opt fs)))
|
(recur opt fs)))
|
||||||
@ -71,7 +71,7 @@
|
|||||||
count
|
count
|
||||||
range
|
range
|
||||||
(map #(Int (str "j" %))))]
|
(map #(Int (str "j" %))))]
|
||||||
(apply-formulas opt (for [idx (range (count joltages))]
|
(apply-formulas! opt (for [idx (range (count joltages))]
|
||||||
(let [jn (nth js idx)
|
(let [jn (nth js idx)
|
||||||
summation-args (->> buttons
|
summation-args (->> buttons
|
||||||
(map set)
|
(map set)
|
||||||
@ -80,15 +80,14 @@
|
|||||||
(map first)
|
(map first)
|
||||||
(map #(nth bs %)))]
|
(map #(nth bs %)))]
|
||||||
(py= jn (apply Sum summation-args)))))
|
(py= jn (apply Sum summation-args)))))
|
||||||
(apply-formulas opt (for [[idx joltage] (map-indexed vector joltages)]
|
(apply-formulas! opt (for [[idx joltage] (map-indexed vector joltages)]
|
||||||
(let [jn (nth js idx)]
|
(let [jn (nth js idx)]
|
||||||
(py= jn joltage))))
|
(py= jn joltage))))
|
||||||
(apply-formulas opt (for [b bs] (py>= b 0)))
|
(apply-formulas! opt (for [b bs] (py>= b 0)))
|
||||||
(! "minimize" opt (apply Sum bs))
|
(! "minimize" opt (apply Sum bs))
|
||||||
(! "check" opt)
|
(! "check" opt)
|
||||||
(let [model (! "model" opt)]
|
(let [model (! "model" opt)]
|
||||||
(apply +
|
(->> (for [b bs] (! "as_long" (pysubscript model b)))
|
||||||
(for [b bs]
|
(apply +))))))
|
||||||
(! "as_long" (pysubscript model b))))))))
|
|
||||||
(apply +))
|
(apply +))
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user