trend arrow for recent position changes

matthiasn · matthiasn · commit 75fd92562591 · 2014-12-15T15:08:02.000+01:00
diff --git a/Clojure-Websockets/MainApp/src/cljs/birdwatch/wordcount_barchart.cljs b/Clojure-Websockets/MainApp/src/cljs/birdwatch/wordcount_barchart.cljs
@@ -1,10 +1,16 @@
 (ns birdwatch.wordcount-barchart
   (:require [birdwatch.util :as util]
+            [birdwatch.stats.regression :as reg]
             [reagent.core :as r :refer [atom]]))
 
 (enable-console-print!)
 
 (def items (atom []))
+(def pos-trends (atom {}))
+(def pos-items (atom {}))
+(def ratio-trends (atom {}))
+(def ratio-items (atom {}))
+
 (def ts-elem (util/by-id "wordcount-barchart"))
 (def ts-w (aget ts-elem "offsetWidth"))
 (def text-defaults {:stroke "none" :fill "#DDD" :fontWeight 500 :fontSize "0.8em" :dy ".35em" :textAnchor "end"})
@@ -25,37 +31,44 @@
     [:polygon {:transform arrowTrans :stroke "none" :fill color :points points}]))
 
 (defn bar [text cnt y h w idx]
-  [:g
-   [:text {:y (+ y 8) :x 138 :stroke "none" :fill "black" :dy ".35em" :textAnchor "end"} text]
-   [arrow 146 y :RIGHT-UP]
-   [arrow 160 y :RIGHT]
-   [:rect {:y y :x 168 :height 15 :width w :stroke "white" :fill "#428bca"}]
-   (if (> w 50)
-     [:text (merge text-defaults {:y (+ y 8) :x (+ w 160)}) cnt]
-     [:text (merge text-defaults {:y (+ y 8) :x (+ w 171) :fill "#666" :textAnchor "start"}) cnt])])
+  (let [pos-slope (get @pos-trends text)]
+    [:g
+     [:text {:y (+ y 8) :x 138 :stroke "none" :fill "black" :dy ".35em" :textAnchor "end"} text]
+     [arrow 146 y (cond
+                   (pos? pos-slope) :UP
+                   (neg? pos-slope ) :DOWN
+                   :else :RIGHT)]
+     [arrow 160 y :RIGHT]
+     [:rect {:y y :x 168 :height 15 :width w :stroke "white" :fill "#428bca"}]
+     (if (> w 50)
+       [:text (merge text-defaults {:y (+ y 8) :x (+ w 160)}) cnt]
+       [:text (merge text-defaults {:y (+ y 8) :x (+ w 171) :fill "#666" :textAnchor "start"}) cnt])]))
 
 (defn wordcount-barchart []
-  (let [items @items
-        indexed (map-indexed vector items)
-        mx (apply max (map (fn [[k v]] v) items))
-        cnt (count items)]
+  (let [indexed @items
+        mx (apply max (map (fn [[idx [k v]]] v) indexed))
+        cnt (count indexed)]
     [:div
      [:svg {:width ts-w :height (+ (* cnt 15) 5)}
       [:g
-        (doall (for [[idx [text cnt]] indexed]
-                 [bar text cnt (* idx 15) 15 (* (- ts-w 190) (/ cnt mx)) idx]))
+       (for [[idx [text cnt]] indexed]
+         ^{:key text}[bar text cnt (* idx 15) 15 (* (- ts-w 190) (/ cnt mx)) idx])
        [:line {:transform "translate(168, 0)" :y 0 :y2 (* cnt 15) :stroke "black"}]]]
      [:p.legend [:strong "1st trend indicator:"] " position changes in last "
       [:select {:defaultValue 300000}
-       (for [[v t] opts1] [:option {:value (* v 1000)} t])]]
+       (for [[v t] opts1] ^{:key v} [:option {:value (* v 1000)} t])]]
      [:p.legend [:strong "2nd trend indicator:"] " ratio change termCount / totalTermsCounted over last "
       [:select {:defaultValue 100}
-       (for [[v t] opts2] [:option {:value v} t])]]]))
+       (for [[v t] opts2] ^{:key v} [:option {:value v} t])]]]))
 
 (r/render-component [wordcount-barchart] ts-elem)
 
 (defn update-words
   "update wordcount chart"
   [words]
-  (reset! items words))
+  (reset! items (vec (map-indexed vector words)))
+  (doseq [[idx [text cnt]] @items]
+    (let [slope (get (reg/linear-regression (take 3 (get @pos-items text))) 1)]
+      (swap! pos-items update-in [text] conj idx)
+      (swap! pos-trends assoc-in [text] slope))))
 
