Commit bb0f4371 authored by Vanja Sophie Cangalovic's avatar Vanja Sophie Cangalovic

Merge branch 'master' into deploy-litmus

parents 803be2f9 78504781
Pipeline #104646 passed with stage
in 13 seconds
......@@ -33,7 +33,7 @@
(require '[scg-server.core :as server])
(deftask dashboard
"Run the application"
"Run the application."
[p port PORT int "Port web server listens on"]
(let [port (or port 8080)]
(comp
......@@ -42,7 +42,7 @@
(info (str "Server started on port " port))
(info (str "Opening Dasboard on:\n"
"https://observablehq.com/@bultmann/scg-dashboard?scgport=" port))
(dosh "open" (str "https://observablehq.com/@bultmann/scg-dashboard?scgport=" port))
(dosh "open" "-a" "Google Chrome" (str "https://observablehq.com/@bultmann/scg-dashboard?scgport=" port))
fileset)
(wait))))
......
......@@ -73,7 +73,7 @@
; {} Empty Bindings
{:seeds #{f}
:bindings bindings
:matchfacts (disj matchfacts m)})))
:matchfacts (into [] (remove #{m}) matchfacts)})))
(filter some?))
matchfacts)))
delta)]
......@@ -82,8 +82,8 @@
(let [{:keys [matchfacts bindings] :as w} (peek work)]
(if (empty? matchfacts)
(recur (conj success w) (pop work))
(let [mf (first matchfacts)
nmatchfacts (disj matchfacts mf)]
(let [mf (peek matchfacts)
nmatchfacts (pop matchfacts)]
(recur
success
(into (pop work)
......@@ -114,8 +114,8 @@
(let [{:keys [facts mergefacts bindings] :as w} (peek work)]
(if (or (empty? mergefacts) (empty? facts))
(recur (conj success w) (pop work))
(let [mf (first mergefacts)
nmergefacts (disj mergefacts mf)]
(let [mf (peek mergefacts)
nmergefacts (pop mergefacts)]
(recur
success
(into (conj (pop work)
......@@ -305,7 +305,7 @@
(map
(fn [[id1 id2]] [id1 :meets id2])
(partition 2 1 ids))
(mapcat
#_(mapcat
(fn [ids]
(map
(fn [id]
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment