diff --git a/common/src/app/common/logging.cljc b/common/src/app/common/logging.cljc index 35e22aca8..f9356e588 100644 --- a/common/src/app/common/logging.cljc +++ b/common/src/app/common/logging.cljc @@ -11,16 +11,15 @@ [cuerdas.core :as str] #?(:clj [io.aviso.exception :as ie]) #?(:cljs [goog.log :as glog])) - #?(:cljs (:require-macros [app.common.logging])) - #?(:clj - (:import - org.apache.logging.log4j.Level - org.apache.logging.log4j.LogManager - org.apache.logging.log4j.Logger - org.apache.logging.log4j.ThreadContext - org.apache.logging.log4j.CloseableThreadContext - org.apache.logging.log4j.message.MapMessage - org.apache.logging.log4j.spi.LoggerContext))) + #?(:cljs (:require-macros [app.common.logging]) + :clj (:import + org.apache.logging.log4j.Level + org.apache.logging.log4j.LogManager + org.apache.logging.log4j.Logger + org.apache.logging.log4j.ThreadContext + org.apache.logging.log4j.CloseableThreadContext + org.apache.logging.log4j.message.MapMessage + org.apache.logging.log4j.spi.LoggerContext))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; CLJ Specific diff --git a/frontend/deps.edn b/frontend/deps.edn index 5468b8b55..b2f85c8b1 100644 --- a/frontend/deps.edn +++ b/frontend/deps.edn @@ -22,7 +22,8 @@ :main-opts ["-m" "antq.core"]} :dev - {:extra-deps + {:extra-paths ["dev"] + :extra-deps {thheller/shadow-cljs {:mvn/version "2.15.12"} cider/cider-nrepl {:mvn/version "0.26.0"}}} diff --git a/frontend/dev/bench/core.cljs b/frontend/dev/bench/core.cljs deleted file mode 100644 index 511f93212..000000000 --- a/frontend/dev/bench/core.cljs +++ /dev/null @@ -1,112 +0,0 @@ -(ns bench.core - (:require [kdtree.core :as k] - [intervaltree.core :as it] - [cljs.pprint :refer (pprint)] - [cljs.nodejs :as node])) - -(enable-console-print!) - -;; --- Index Initialization Bechmark - -(defn- bench-init-10000 - [] - (println "1000x1000,10 -> 10000 points") - (time - (k/generate 1000 1000 10 10))) - -(defn- bench-init-250000 - [] - (time - (k/generate 5000 5000 10 10))) - -(defn bench-init - [] - (bench-init-10000) - (bench-init-10000) - (bench-init-250000) - (bench-init-250000) - (bench-init-10000) - (bench-init-10000) - (bench-init-250000) - (bench-init-250000)) - -;; --- Nearest Search Benchmark - -(defn- bench-knn-160000 - [] - (let [tree (k/create)] - (k/setup tree 4000 4000 10 10) - (println "KNN Search (160000 points) 1000 times") - (time - (dotimes [i 1000] - (let [pt #js [(rand-int 400) - (rand-int 400)]] - (k/nearest tree pt 2)))))) - - -(defn- bench-knn-360000 - [] - (let [tree (k/create)] - (k/initialize tree 6000 6000 10 10) - (println "KNN Search (360000 points) 1000 times") - (time - (dotimes [i 1000] - (let [pt #js [(rand-int 600) - (rand-int 600)]] - (k/nearest tree pt 2)))))) - -(defn bench-knn - [] - (bench-knn-160000) - (bench-knn-360000)) - -;; --- Accuracity tests - -(defn test-accuracity - [] - (let [tree (k/create)] - (k/setup tree 4000 4000 20 20) - (print "[1742 1419]") - (pprint (js->clj (k/nearest tree #js [1742 1419] 6))) - (print "[1742 1420]") - (pprint (js->clj (k/nearest tree #js [1742 1420] 6))) - )) - -(defn test-interval - [] - (let [tree (it/create)] - (it/add tree #js [1 5]) - (it/add tree #js [5 7]) - (it/add tree #js [-4 -1]) - (it/add tree #js [-10 -3]) - (it/add tree #js [-20 -10]) - (it/add tree #js [20 30]) - (it/add tree #js [3 9]) - (it/add tree #js [100 200]) - (it/add tree #js [1000 2000]) - (it/add tree #js [6 9]) - - (js/console.dir tree #js {"depth" nil}) - (js/console.log "contains", 4, (it/contains tree 4)) - (js/console.log "contains", 0, (it/contains tree 0)) - )) - -(defn main - [& [type]] - (cond - (= type "kd-init") - (bench-init) - - (= type "kd-search") - (bench-knn) - - (= type "kd-test") - (test-accuracity) - - (= type "interval") - (test-interval) - - :else - (println "not implemented"))) - -(set! *main-cli-fn* main) diff --git a/frontend/dev/cljs/user.cljs b/frontend/dev/cljs/user.cljs new file mode 100644 index 000000000..3a927046b --- /dev/null +++ b/frontend/dev/cljs/user.cljs @@ -0,0 +1,5 @@ +(ns cljs.user) + +(defn hello + [] + (js/console.log "hello")) diff --git a/frontend/shadow-cljs.edn b/frontend/shadow-cljs.edn index 942e2c93d..8d3bc58e0 100644 --- a/frontend/shadow-cljs.edn +++ b/frontend/shadow-cljs.edn @@ -4,7 +4,6 @@ :jvm-opts ["-Xmx700m" "-Xms100m" "-XX:+UseSerialGC" "-XX:-OmitStackTraceInFastThrow"] :dev-http {8888 "classpath:public"} - :builds {:main {:target :browser