Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

push game-config through the history generation #137

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

push game-config through the history generation #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0829e56
push game-config through the history generation
AndreaCrotti Jan 24, 2019
d20bdce
disable config for now
AndreaCrotti Feb 3, 2019
1a3939c
remove prints
AndreaCrotti Feb 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 22 additions & 16 deletions src/cljc/elo/games.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,26 +112,32 @@
(: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]
(flatten
(for [idx (range (count games))]
(rankings-at-idx* players idx games game-config)))))

(defn longest-winning-subseq
[s]
Expand Down
8 changes: 5 additions & 3 deletions src/cljs/elo/league_detail/handlers.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -310,8 +311,9 @@

(rf/reg-sub ::rankings-history-vega
:<- [::rankings-history]
:<- [::game-config]

(fn [history]
(fn [[history game-config]]
(let [kw->keyname {:player "Player"
:ranking "Ranking"
:game-idx "Game #"
Expand Down