push game-config through the history generation

AndreaCrotti · Jan 28, 2019 · 6661f41 · 6661f41
1 parent a635d98
commit 6661f41
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 20 deletions.
diff --git a/src/cljc/elo/games.cljc b/src/cljc/elo/games.cljc
@@ -80,6 +80,7 @@
    (get-rankings games players shared/default-game-config))
 
   ([games players config]
+   (println "config =" config)
    (let [norm-games (map elo/normalize-game games)
          rankings (elo/compute-rankings norm-games
                                         (map :id players)
@@ -112,26 +113,33 @@
        (:p2_points game)))
 
 (defn rankings-at-idx*
-  [players idx all-games]
-  (let [current-game (nth all-games idx)
-        name-mapping (player->names players)
-        common-map
-        {:game-idx idx
-         :time (:played_at current-game)
-         :result (game-result current-game name-mapping)}
+  ([players idx all-games]
+   (rankings-at-idx* players idx all-games shared/default-game-config))
 
-        rankings (get-rankings (take (inc idx) all-games) players)]
+  ([players idx all-games game-config]
+   (let [current-game (nth all-games idx)
+         name-mapping (player->names players)
+         common-map
+         {:game-idx idx
+          :time (:played_at current-game)
+          :result (game-result current-game name-mapping)}
 
-    (map #(merge % common-map)
-         (for [r (filter #(plays? current-game (:id %)) rankings)]
-           {:ranking (:ranking r)
-            :player (name-mapping (:id r))}))))
+         rankings (get-rankings (take idx all-games) players)]
+
+     (map #(merge % common-map)
+          (for [r (filter #(plays? current-game (:id %)) rankings)]
+            {:ranking (:ranking r)
+             :player (name-mapping (:id r))})))))
 
 (defn rankings-history
-  [players games]
-  (flatten
-   (for [idx (range (count games))]
-     (rankings-at-idx* players idx games))))
+  ([players games]
+   (rankings-history players games shared/default-game-config))
+
+  ([players games game-config]
+   (println "rankings history:" "config = " game-config)
+   (flatten
+    (for [idx (range (count games))]
+      (rankings-at-idx* players idx games game-config)))))
 
 (defn longest-winning-subseq
   [s]

diff --git a/src/cljs/elo/league_detail/handlers.cljs b/src/cljs/elo/league_detail/handlers.cljs
@@ -89,9 +89,10 @@
             :<- [::visible-players]
             :<- [::games-live-players]
             :<- [::up-to-games]
+            :<- [::game-config]
 
-            (fn [[players visible-players games up-to]]
-              (rankings/rankings-history players visible-players games up-to)))
+            (fn [[players visible-players games up-to game-config]]
+              (rankings/rankings-history players visible-players games up-to game-config)))
 
 (rf/reg-sub ::last-game-played-by
             :<- [::games-live-players]
@@ -310,8 +311,10 @@
 
 (rf/reg-sub ::rankings-history-vega
             :<- [::rankings-history]
+            :<- [::game-config]
 
-            (fn [history]
+            (fn [[history game-config]]
+              (js/console.log "history changed now")
               (let [kw->keyname {:player "Player"
                                  :ranking "Ranking"
                                  :game-idx "Game #"

diff --git a/src/cljs/elo/league_detail/views.cljs b/src/cljs/elo/league_detail/views.cljs
@@ -320,6 +320,7 @@
   (let [history (rf/subscribe [::handlers/rankings-history-vega])
         rankings-domain (rf/subscribe [::handlers/rankings-domain])]
     (fn []
+      (js/console.log "Recomputing the history and the rankings domain")
       [vega/vega-inner @history @rankings-domain])))
 
 (defn- percent
@@ -402,6 +403,6 @@
       [stats-component ::stats-specs/best-percents]]
 
      [:div.section.vega__table [vega-outer]]
-     #_[:div.section.game__config [game-config]]
+     [:div.section.game__config [game-config]]
      [:div.section.rankings__table [rankings-table]]
      [:div.section.games__table [games-table]]]))