Update README.md

Added idea for charts

README.md

@@ -69,9 +69,68 @@ FIXME: listing of options this app accepts.
 
 ...
 
-### Any Other Sections
-### That You Think
-### Might be Useful
+### Graphs
+
+Posible ASCII art charts
+
+#### Simple day
+
+A one dimension diagram. Draw a tick each day the player has played
+
+```
+     #######    ###   ######               ###########                                       
+   ------------------------------------------------------------------------------------------
+     |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |
+     1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30
+     
+                                              june
+```
+
+#### Day and hour
+
+The x axis represents days of month, while y axis represents hours of each day. A tick is drawed in the hour
+when the player was playing.
+
+```
+23 |                                                                                         
+22 |                                                                                         
+21 |                                                                                         
+20 |                                                                                         
+19 |                   #                             #                                       
+18 |                   #  #                          #                                       
+17 |                   #  #                 #        #                                       
+16 |                   #                                                                     
+15 |       #                                #  #  #                                          
+14 | #     #                                   #  #                                          
+13 |             #                                                                           
+12 | #           #                          #        #                                       
+11 | #  #                                   #  #     #                                       
+10 | #                                      #  #  #                                          
+09 |                                        #     #                                          
+08 |                                                                                         
+07 |                                                                                         
+06 |                                                                                         
+05 |                                                                                         
+04 |                                                                                         
+03 |                                                                                         
+02 |                                                                                         
+01 |                                                                                         
+00 |                                                                                         
+   ------------------------------------------------------------------------------------------
+     |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |
+     1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30
+     
+                                              june
+```
+
+## Interesting graphic and UI libraries
+
+- Raster SVG: https://github.com/soulspace-org/cmp.batik
+- Modify SVG graphics: https://github.com/stathissideris/dali
+- Create Vega-lite SVG graphics: https://github.com/techascent/tech.viz
+- Enhance CLI text: https://github.com/clj-commons/pretty?tab=readme-ov-file
+- Universal UI: https://github.com/phronmophobic/membrane?tab=readme-ov-file
+- Interesting libraries: https://www.clojure-toolbox.com/
 
 ## License
 

project.clj

@@ -5,25 +5,37 @@
   :license {:name "MIT"
             :url "https://mit-license.org/"}
 
-  :dependencies [[org.clojure/clojure "1.11.1"]
-                 [clj-http/clj-http "2.0.0"]
-                 [cheshire/cheshire "6.0.0"]
-                 [slingshot/slingshot "0.12.2"]
-                 [org.clojure/tools.cli "1.1.230"]
-                 [cli-matic/cli-matic "0.5.4"]
-                 [buddy/buddy-core "1.12.0-430"]
-                 [org.clojure/tools.namespace "1.5.0"]
-                 [lt.tokenmill/timewords "0.5.0"]]
-
-  :plugins [[io.taylorwood/lein-native-image "0.3.1"]]
+  :dependencies [[org.clojure/clojure "1.11.1"] ;; Clojure itself
+                 [clj-http/clj-http "2.0.0"]  ;; HTTP client
+                 [cheshire/cheshire "6.0.0"]  ;; Convert to/from JSON
+                 [slingshot/slingshot "0.12.2"]  ;; Better exceptions for clj-http
+                 ;; [org.clojure/tools.cli "1.1.230"]  ;; Parse params. NOT USED
+                 [cli-matic/cli-matic "0.5.4"]  ;; Parse params and make a nice CLI app
+                 [buddy/buddy-core "1.12.0-430"]  ;; Cipher data
+                 [org.clojure/tools.namespace "1.5.0"]  ;; Hot reload from REPL
+                 [lt.tokenmill/timewords "0.5.0"]  ;; Parse dates and times in natural languaje
+                 
+                 ;;; LIBS FOR GRAPHS, SOME OF THEM WILL BE REMOVED IN THE FUTURE
+                 
+                 ;[com.hypirion/clj-xchart "0.2.0"]  ;; Graphs and charts
+                 ;[aerial.hanami "0.15.1"]  ;; Parse vega-lite data and generate graphics
+                 ;[folcon/oz "1.6.0-alpha6.2"] ;; Parse vega and vega-lite
+                 [metasoarous/oz "1.6.0-alpha36"] ;; Other version of Oz
+                 ;[metasoarous/oz "2.0.0-alpha5"] ;; Newer version of Oz
+                 [incanter/incanter-charts "1.9.3"] ;; graphics with Incanter
+                 ;[hswick/jutsu "0.1.1"] ;; Wrapper para plotly
+                 [techascent/tech.viz "6.00-beta-16-4"] ;; Vega-lite parser (https://github.com/techascent/tech.viz)
+                 ]
 
+  :plugins [[io.taylorwood/lein-native-image "0.3.1"]]  ;; Compile to native using graal
+  
   :main ^:skip-aot riot.app
   :target-path "target/%s"
 
   :native-image {:name "riot"                 ;; name of output image, optional
                  :graal-bin "/home/ruben/.sdkman/candidates/java/21.0.2-graalce/" ;; path to GraalVM home, optional
                  :opts ["--verbose"]}           ;; pass-thru args to GraalVM native-image, optional
-
+  
   :profiles {:uberjar {:aot :all
                        :jvm-opts ["-Dclojure.compiler.direct-linking=true"]}
              :native-image {:jvm-opts ["-Dclojure.compiler.direct-linking=true"]}

src/riot/app.clj

@@ -27,7 +27,8 @@
   (get-puuid-from-params (get-lol-api-key) [] :name "Errepunto" :tag "4595")
 
   (get-puuid-from-params (get-tft-api-key) [] :puuid "annlAfxhJnTwlwRgQZYbGeQpD3jWb-ju7vVKEW_g-EIJf6xQT0eeb-0obARVekrksf8n9XCjcxyHHQ")
-  (get-puuid-from-params (get-tft-api-key) [] :name "Errepunto" :tag "4595"))
+  (get-puuid-from-params (get-tft-api-key) [] :name "Errepunto" :tag "4595")
+  )
 
 
 
@@ -54,7 +55,8 @@
 
 (comment
   (cmd-active :_arguments ["annlAfxhJnTwlwRgQZYbGeQpD3jWb-ju7vVKEW_g-EIJf6xQT0eeb-0obARVekrksf8n9XCjcxyHHQ"])
-  (cmd-active :_arguments ["Errepunto" "4595"]))
+  (cmd-active :_arguments ["Errepunto" "4595"])
+  )
 
 
 
@@ -136,7 +138,7 @@
             (take count)
             (format-dates-cond format-dates format-durations date-format)
             (filter-columns show-columns)
-            (map)
+            (map )
             (format-map output))))
    (catch [:status 401] _
      (U/exit! "Invalid API key" 3))
@@ -153,29 +155,30 @@
 (defn cmd-bulk
   "Get all matches"
   [& {:keys [lol-api-key tft-api-key output format-dates format-durations date-format reverse order-by show-columns debug-http since until _arguments]
-      :as opts}]
-  (try+
+       :as opts}]
+   (try+
      ;(println "Get timeline" opts)
-   (let [lol-key (get-lol-api-key lol-api-key)
-         tft-key (get-tft-api-key tft-api-key)
-         lol-id (get-puuid-from-params lol-key _arguments opts)
-         tft-id (get-puuid-from-params tft-key _arguments opts)]
+    (let [lol-key (get-lol-api-key lol-api-key)
+          tft-key (get-tft-api-key tft-api-key)
+          lol-id (get-puuid-from-params lol-key _arguments opts)
+          tft-id (get-puuid-from-params tft-key _arguments opts)]
        ;(println "LOL API key" lol-key "TFT API key" tft-key)
-     (if (or (nil? lol-id) (nil? tft-id))
-       (U/exit! "Invalid params" 2)
-       (->> (get-matches-info-batch lol-id tft-id :lol-api-key lol-key :tft-api-key tft-key :debug debug-http :order-by (keyword order-by) :since (get-date since) :until (get-date until))
-            (reverse-cond reverse)
-            (format-dates-cond format-dates format-durations date-format)
-            (filter-columns show-columns)
-            (format-map output))))
-   (catch [:status 401] _
-     (U/exit! "Invalid API key" 3))
-   (catch [:status 404] _
-     (U/exit! "Unknown user or tag" 5))
-   (catch [:status 429] _
-     (U/exit! "Rate limit exceeded, please wait some minutes and try again" 4))
-   (catch [:status 503] _
-     (U/exit! "Server timeout, please wait some minutes and try again" 6))))
+      (if (or (nil? lol-id) (nil? tft-id))
+        (U/exit! "Invalid params" 2)
+        (->> (get-matches-info-batch lol-id tft-id :lol-api-key lol-key :tft-api-key tft-key :debug debug-http :order-by (keyword order-by) :since (get-date since) :until (get-date until))
+             (reverse-cond reverse)
+             (format-dates-cond format-dates format-durations date-format)
+             (filter-columns show-columns) 
+             (format-map output))))
+    (catch [:status 401] _
+      (U/exit! "Invalid API key" 3))
+    (catch [:status 404] _
+      (U/exit! "Unknown user or tag" 5))
+    (catch [:status 429] _
+      (U/exit! "Rate limit exceeded, please wait some minutes and try again" 4))
+    (catch [:status 503] _
+      (U/exit! "Server timeout, please wait some minutes and try again" 6))
+    ))
 
 
 ;; More info: https://github.com/l3nz/cli-matic/blob/master/README.md
@@ -383,4 +386,5 @@
   ; Launch manually
   (-main)
 
-  (old-main))
+  (old-main)
+  )

src/riot/core.clj

@@ -33,7 +33,7 @@
 
 ;;;; API KEYS
 
-(def DEV_KEY "RGAPI-fc8c6d88-2c13-4a43-b53f-3465bb564acc")
+(def DEV_KEY "RGAPI-e068aea3-5828-48e2-9500-259ef96c8c4f")
 (def LOL_KEY "jXL+gA3LIeBPBvrOhLOYSZCiURC7eOtwMXahkxtwpdj6JDtT5NMu25zMz+UY2+9MuHBADjUJh46jSanrV5OBag==")
 (def TFT_KEY (encrypt-data DEV_KEY secret-key iv))
 
@@ -107,7 +107,8 @@
   (get-in riot.test-examples/response-lol-match [:info :participants 3])
 
   (get-player-info riot.test-examples/response-lol-match riot.test-examples/example-lol-puuid)
-  (winner? riot.test-examples/response-lol-match riot.test-examples/example-lol-puuid))
+  (winner? riot.test-examples/response-lol-match riot.test-examples/example-lol-puuid)
+  )
 
 
 (defn with-winner-status
@@ -117,7 +118,8 @@
 
 
 (comment
-  (with-winner-status riot.test-examples/matches-example riot.test-examples/example-lol-puuid))
+  (with-winner-status riot.test-examples/matches-example riot.test-examples/example-lol-puuid)
+  )
 
 
 ;; json adapters
@@ -139,7 +141,7 @@
                                 (make-json-data [:none] :game-type (constantly "ftf"))
                                 (make-json-data [:metadata :match_id] :id)
                                 (make-json-data [:none] :winner (constantly false))]
-                       :post #(post-calculate-win
+                       :post #(post-calculate-win 
                                (post-calculate-end %1 %2 %3) %2 %3)}) ; end = start + (duration * 1000)
 
 (def lol-current-parser {:parser [(make-json-data [:gameStartTime] :start)
@@ -219,7 +221,7 @@
 
 
 (defn date-to-seconds
-  ([] (date-to-seconds (java.util.Date.)))
+  ([] (date-to-seconds (java.util.Date. )))
   ([d]
    (when (some? d) (quot (.getTime d) 1000))))
 
@@ -357,7 +359,7 @@
                                server1 "europe"
                                server2 "euw1"
                                count 20
-                               start 0
+                               start 0 
                                order-by :start}}]
   (sort-by order-by
            (filter some?
@@ -423,9 +425,9 @@
                          debug false}}]
   (when (every? some? [puuid api-key])
     (get-batch-range #(get-lol-matches puuid :api-key api-key :start (* count %) :since since :until until :server server :wait-limit-exceeded wait-limit-exceeded :debug debug :count count)
-                     :wait-limit-exceeded wait-limit-exceeded
-                     :first-batch first-batch
-                     :max-batches max-batches)))
+               :wait-limit-exceeded wait-limit-exceeded
+               :first-batch first-batch
+               :max-batches max-batches)))
 
 
 (defn get-matches-batch-tft
@@ -444,12 +446,12 @@
                      :max-batches max-batches)))
 
 
-(defn get-matches-info-batch-lol
+(defn get-matches-info-batch-lol 
   "Get a lot of LOL matches info"
   [matches-id puuid api-key & {:keys [server wait-limit-exceeded debug]
-                               :or {server "europe"
-                                    wait-limit-exceeded 15
-                                    debug false}}]
+                    :or {server "europe"
+                         wait-limit-exceeded 15
+                         debug false}}]
   ;; (println "Matches: " matches-id)
   (when (every? some? [matches-id puuid api-key])
     (get-batch-seq #(get-lol-match-info % :puuid puuid :api-key api-key :server server :wait-limit-exceeded wait-limit-exceeded :debug debug)

src/riot/data.clj

@@ -33,11 +33,12 @@
 (defn parse-localdate
   "Parse a yyyy-MM-dd date to java.time.LocalDate"
   [s]
-  (java.time.LocalDate/parse s (DateTimeFormatter/ofPattern DEFAULT_DATE_FORMAT)))
+  (java.time.LocalDate/parse s (DateTimeFormatter/ofPattern DEFAULT_DATE_FORMAT))
+)
 
 (defn parse-date-str
   [s]
-  (localdate-to-date (parse-localdate s)))
+  (localdate-to-date(parse-localdate s)))
 
 
 (defn parse-date-epoch
@@ -68,9 +69,9 @@
   "Converts a duration in seconds to a string with hours and seconds"
   [seconds]
   (when (some? seconds)
-    (if (<  seconds 3600)
+    (if (<  seconds 3600) 
       (format "%02d:%02d" (quot seconds 60) (rem seconds 60))
-      (format "%02d:%02d:%02d" (quot seconds 3600) (- (quot seconds 60) 60) (rem seconds 60)))))
+      (format "%02d:%02d:%02d" (quot seconds 3600) ( - ( quot seconds 60) 60) (rem seconds 60)))))
 
 
 
@@ -86,8 +87,8 @@
    
    A match has been played today if its start date or end date is from today"
   [match]
-  (or
-   (>= (or (:start match) 0) (today-millis))
+  (or 
+   (>= (or (:start match) 0) (today-millis)) 
    (>= (or (:end match) 0) (today-millis))))
 
 
@@ -102,7 +103,8 @@
        (map #(update % :start (fn [x] (format-datetime-millis x datetime-format))))
        (map #(update % :end (fn [x] (format-datetime-millis x datetime-format))))))
 (comment
-  (with-parsed-dates riot.test-examples/matches-example))
+  (with-parsed-dates riot.test-examples/matches-example)
+)
 
 
 
@@ -118,8 +120,9 @@
   [matches & {:keys [datetime-format]
               :or {datetime-format DEFAULT_DATE_TIME_FORMAT}}]
   (-> matches
-      (with-parsed-durations)
-      (with-parsed-dates :datetime-format datetime-format)))
+       (with-parsed-durations)
+       (with-parsed-dates :datetime-format datetime-format)
+       ))
 
 
 ;;; Export to other formats
@@ -141,7 +144,8 @@
 
 (comment
   (println (as-json (with-parsed-dates-durations riot.test-examples/matches-example
-                      :pretty false))))
+                    :pretty false)))
+  )
 
 
 
@@ -152,7 +156,8 @@
 
 (comment
   (as-ascii-table riot.test-examples/matches-example)
-  (as-ascii-table (with-parsed-dates-durations riot.test-examples/matches-example)))
+  (as-ascii-table (with-parsed-dates-durations riot.test-examples/matches-example))
+  )
 
 
 
@@ -163,11 +168,12 @@
    (str/join (System/lineSeparator) ; Local EOL characteres
              (concat
               [(clojure.string/join separator (map name (keys (first matches))))] ; header
-              (map #(clojure.string/join separator %)
-                   (map vals matches))))))
+             (map #(clojure.string/join separator %)
+                  (map vals matches))))))
 
-(comment
-  (as-csv riot.test-examples/matches-example)
-  (as-csv riot.test-examples/matches-example2)
-  (as-csv (with-parsed-dates-durations riot.test-examples/matches-example))
-  (as-csv (with-parsed-dates-durations riot.test-examples/matches-example2)))
+  (comment 
+    (as-csv riot.test-examples/matches-example) 
+    (as-csv riot.test-examples/matches-example2)
+    (as-csv (with-parsed-dates-durations riot.test-examples/matches-example))
+    (as-csv (with-parsed-dates-durations riot.test-examples/matches-example2))
+    )

src/riot/graph_experiments.clj

@@ -0,0 +1,323 @@
+(ns riot.graph_experiments
+  (:use riot.data)
+  (:require ;[com.hypirion.clj-xchart :as c]
+   [clojure.pprint :as pprint]
+   [clojure.math :as m]
+   [clojure.core.matrix :as mtx])
+  (:require [incanter.core :as incanter]
+            [incanter.stats :as stats]
+            [incanter.charts :as charts]
+            [incanter.datasets :as datasets])
+  (:require [oz.core :as oz])
+  (:require [tech.viz.vega :as vega]))
+
+
+
+;; ;;;; XCHART
+
+;;  ;; XY chart
+;;  (def xchart_xy
+;;    (c/xy-chart {"Expected rate" [(range 10) (range 10)]
+;;                 "Actual rate" [(range 10) (map #(+ % (rand-int 5) -2) (range 10))]}))
+;;  (comment
+;;    (c/view xchart_xy))
+
+
+;; ;;;; HANAMI
+;;  (comment
+;;    (hc/xform ht/point-chart
+;;              :UDATA "data/cars.json"
+;;              :X "Horsepower" :Y "Miles_per_Gallon" :COLOR "Origin"))
+
+
+;;;; OZ
+
+(def test-plot
+  {:data {:values
+          [{:time "18:00" :volume 10}
+           {:time "18:02" :volume 41}
+           {:time "18:07" :volume 192}
+           {:time "18:30" :volume 257}
+           {:time "19:00" :volume 300}]
+          :format {:parse {:time "date:'%H:%M'"}}}
+   :encoding {:x {:field "time" :type "temporal" :timeUnit "hoursminutes"}
+              :y {:field "volume" :type "quantitative"}}
+   :mark "point"})
+
+;;; to compile and view in Clojure - Oz:
+(comment
+  (do
+    (println "calling (oz/start-server!)")
+    (oz/start-server!)
+
+    (println "calling (oz/view!)")
+    (oz/view! test-plot)
+
+    (println "calling (Thread/sleep)")
+    (Thread/sleep 5000))
+  )
+
+
+;;;; INCANTER
+
+ ;; Simple histogram
+ (comment
+   (incanter/view (charts/histogram (stats/sample-normal 1000))))
+
+
+ ;; Boxplot demo
+ (defn create-box-plot [data]
+   (let [box-plot (charts/box-plot data
+                                   :title "Box Plot Example"
+                                   :y-label "Values"
+                                   :x-label "Dataset")]
+     (incanter/view box-plot)))
+
+ (def sample-data [5, 7, 8, 9, 10, 14, 15, 21, 23, 23, 24, 26, 28, 30, 37])
+
+ (comment
+   (create-box-plot sample-data))
+
+ ;; Scatter
+ (comment
+   (incanter/view (charts/scatter-plot :Sepal.Length :Sepal.Width
+                                       :data (datasets/get-dataset :iris)))
+
+   (clojure.pprint/pprint (datasets/get-dataset :iris)))
+
+ 
+ ;; Scatter grouped
+
+ (comment
+   (incanter/view (charts/scatter-plot :Sepal.Length :Sepal.Width
+                                       :group-by :Species
+                                       :data (datasets/get-dataset :iris)
+                                       :legend true)))
+
+ ;; Scatter matrix (too complicated)
+ (comment
+   (incanter/view (charts/scatter-plot-matrix
+                   (datasets/get-dataset :iris)
+                   :nbins 20
+                   :group-by :Species))
+
+   (incanter/with-data (datasets/get-dataset :iris) (incanter/view (charts/scatter-plot-matrix :nbins 20 :group-by :Species)))
+
+   (incanter/view (charts/scatter-plot-matrix
+                   (datasets/get-dataset :chick-weight)
+                   :group-by :Diet
+                   :nbins 20)))
+
+
+ ;; Heatmaps
+ (comment
+   (defn f [x y] (incanter/sin (incanter/sqrt (mtx/add (incanter/sq x) (incanter/sq y)))))
+   (incanter/view (charts/heat-map f -10 10 -15 15))
+   (incanter/view (charts/heat-map f -10 10 -10 10 :color? false))
+   (incanter/view (charts/heat-map f 5 10 5 10 :include-zero? false))
+   )
+
+
+
+;; Personalize a scatter
+
+(def my-data '({:start 1751537581404,
+                :end 1751539178158,
+                :duration 1583,
+                :active false,
+                :game-type "lol",
+                :id "EUW1_7450441192",
+                :winner true}
+               {:start 1751489335800,
+                :end 1751491099813,
+                :duration 1748,
+                :active false,
+                :game-type "lol",
+                :id "EUW1_7450117155",
+                :winner true}
+               {:start 1751486177961,
+                :end 1751487764068,
+                :duration 1568,
+                :active false,
+                :game-type "lol",
+                :id "EUW1_7450048068",
+                :winner true}
+               {:start 1751484450321,
+                :end 1751485680510,
+                :duration 1201,
+                :active false,
+                :game-type "lol",
+                :id "EUW1_7450013510",
+                :winner true}
+               {:start 1751400380588,
+                :end 1751401545922,
+                :duration 1133,
+                :active false,
+                :game-type "lol",
+                :id "EUW1_7449129548",
+                :winner true}
+               {:start 1751398221584,
+                :end 1751399322722,
+                :duration 1020,
+                :active false,
+                :game-type "lol",
+                :id "EUW1_7449082553",
+                :winner false}
+               {:start 1751394541765,
+                :end 1751396611534,
+                :duration 2040,
+                :active false,
+                :game-type "lol",
+                :id "EUW1_7449005657",
+                :winner false}
+               {:start 1751388187077,
+                :end 1751390143357,
+                :duration 1937,
+                :active false,
+                :game-type "lol",
+                :id "EUW1_7448887620",
+                :winner true}
+               {:start 1751384103153,
+                :end 1751385903519,
+                :duration 1767,
+                :active false,
+                :game-type "lol",
+                :id "EUW1_7448818616",
+                :winner false}
+               {:start 1751363056183,
+                :end 1751364555063,
+                :duration 1462,
+                :active false,
+                :game-type "lol",
+                :id "EUW1_7448564681",
+                :winner false}))
+
+(defn extract-date-millis
+  "Extract date from a long epoch timestamp in milliseconds"
+  [x]
+  ;(java.util.Date. x)
+  (let [date (new java.util.Date x)]
+    (. (java.util.Date. (. date getYear) (. date getMonth) (. date getDay)) getTime)))
+
+(defn extract-date
+  "Extract date from a long epoch timestamp in milliseconds"
+  [x]
+  ;(java.util.Date. x)
+  (let [date (new java.util.Date x)]
+    (java.util.Date. (. date getYear) (. date getMonth) (. date getDay))))
+
+(comment 
+  (extract-date-millis 1751363056183)
+  (. (extract-date-millis 1751363056183) getTime)
+  )
+
+(defn extract-hour
+  "Extract hour from a long epoch timestamp in milliseconds"
+  [x]
+  ;(java.util.Date. x)
+  (let [date (new java.util.Date x)]
+    (. date getHours)))
+
+(comment
+  (java.util.Date. 1751537581404)
+  (java.util.Date. 1751539178158)
+  (extract-hour 1751537581404)
+  (extract-hour 1751539178158)
+  )
+
+
+(defn extract-active-hours-millis
+  [match]
+  (when (every? some? [ (:start match) (:end match)])
+    (let [d-ini (extract-date-millis (:start match))
+          d-end (extract-date-millis (:end match))
+          h-ini (extract-hour (:start match))
+          h-end (extract-hour (:end match))
+          game-type (:game-type match)
+          winner (:winner match)]
+      (if (= d-ini d-end)
+        (for [day [d-ini]
+              hour (range h-ini (inc h-end))]
+          [day hour game-type winner])
+        (concat
+         (for [day [d-ini]
+               hour (range h-ini 24)]
+           [day hour game-type winner])
+         (for [day [d-ini]
+               hour (range 0 (inc h-end))]
+           [day hour game-type winner]))))))
+
+
+(defn extract-active-hours
+  [match]
+  (when (every? some? [(:start match) (:end match)])
+    (let [d-ini (extract-date (:start match))
+          d-end (extract-date (:end match))
+          h-ini (extract-hour (:start match))
+          h-end (extract-hour (:end match))
+          game-type (:game-type match)
+          winner (:winner match)]
+      (if (= d-ini d-end)
+        (for [day [d-ini]
+              hour (range h-ini (inc h-end))]
+          [day hour game-type winner])
+        (concat
+         (for [day [d-ini]
+               hour (range h-ini 24)]
+           [day hour game-type winner])
+         (for [day [d-ini]
+               hour (range 0 (inc h-end))]
+           [day hour game-type winner]))))))
+
+(comment
+  (extract-active-hours-millis (first my-data))
+  (partition 4 (flatten (map extract-active-hours-millis my-data)))
+  )
+
+
+(defn extract-dataset-millis
+  [matches]
+  (incanter/dataset
+   [:days :hours :game-type :winner]
+   (partition 4 (flatten (map extract-active-hours-millis matches)))))
+
+(defn extract-dataset
+  [matches]
+  (incanter/dataset
+   [:days :hours :game-type :winner]
+   (partition 4 (flatten (map extract-active-hours matches)))))
+
+(comment
+  (extract-dataset-millis my-data)
+  (extract-dataset my-data)
+
+  (incanter/view (charts/scatter-plot :days :hours
+                                      :data (extract-dataset-millis my-data)
+                                      :group-by :game-type
+                                      :x-label "Day"
+                                      :y-label "Hour"
+                                      :legend false))
+  
+  )
+
+
+(comment
+  (defn process-my-data [x y] (+ x y (m/random)))
+
+  (incanter/view (charts/heat-map process-my-data 
+                                  -10 10 -15 15
+                                  :x-label "Day"
+                                  :y-label "Hour"
+                                  :z-label "Count"
+                                  :color? true
+                                  :include-zero? false))
+
+  )
+
+
+
+;;;; tech.viz
+(comment 
+  (let [ my-graph (vega/scatterplot [{:a 1 :b 2} {:a 2 :b 3}] :a :b)]
+    (vega/vega->svg-file my-graph "timeseries.svg"))
+  )

test/riot/core_test.clj

@@ -126,7 +126,8 @@
   (testing "Some dates"
     (is (nil? (date-to-seconds nil)))
     (is (some? (date-to-seconds)))
-    (is (= 1738364400 (date-to-seconds (java.util.Date. 125 1 1))))))
+    (is (= 1738364400 (date-to-seconds (java.util.Date. 125 1 1)))))
+  )
 
 
 ;; Get parameter for querying data
@@ -229,9 +230,10 @@
         (is (not res) (str "Oh, well, the player is playing: " res))))
     (testing "Include current"
       (let [res (is-playing? example-lol-puuid example-tft-puuid)]
-        (is (not res) (str "Oh, well, the player is playing: " res))))))
-
+        (is (not res) (str "Oh, well, the player is playing: " res)))))
+  )
 
+ 
 (deftest test-get-matches-batch-lol
   (println "* Get lol matches batch *")
   (testing "Invalid data"
@@ -239,7 +241,7 @@
     (is (= nil (get-matches-batch-lol example-lol-puuid nil)))
     (is (= nil (get-matches-batch-lol nil (get-lol-api-key)))))
   (testing "Get LOL matches"
-    (is (= 10 (count (get-matches-batch-lol example-lol-puuid (get-lol-api-key) :count 5 :max-batches 2))))))
+    (is (= 10 (count (get-matches-batch-lol example-lol-puuid (get-lol-api-key):count 5 :max-batches 2))))))
 
 (deftest test-get-matches-batch-tft
   (println "* Get tft matches batch *")
@@ -250,7 +252,7 @@
   (testing "Get LOL matches"
     (is (= 10 (count (get-matches-batch-tft example-tft-puuid (get-tft-api-key) :count 5 :max-batches 2))))))
 
-
+ 
 (deftest test-get-matches-info-batch-lol
   (println "* Get lol matches info batch *")
   (testing "Invalid data"
@@ -296,4 +298,5 @@
    (get-matches-info-batch example-lol-puuid example-tft-puuid)
    (catch [:status 404] {:keys [request-time headers body] :as excp}
      (println "NOT Found 404")
-     (pp/pprint excp))))
+     (pp/pprint excp)))
+  )

test/riot/data_test.clj

@@ -58,7 +58,8 @@
   (testing "Long durations"
     (is (= "01:00:00" (format-duration-seconds 3600)))
     (is (= "01:00:01" (format-duration-seconds 3601)))
-    (is (= "01:01:01" (format-duration-seconds 3661)))))
+    (is (= "01:01:01" (format-duration-seconds 3661))))
+  )
 
 
 ;; Epoch in millis for today at 00:00:00 hours. Difficult to test
@@ -76,7 +77,8 @@
     (is (match-today? {:start (+ 5000 (today-millis))})))
   (testing "End date today"
     (is (match-today? {:end (today-millis)}))
-    (is (match-today? {:end (+ 5000 (today-millis))}))))
+    (is (match-today? {:end (+ 5000 (today-millis))})))
+  )
 
 
 ;; Parse dates inside a lis of matches
@@ -88,7 +90,8 @@
     (is (= '({:a "AAA" :b 2  :start nil, :end nil}) (with-parsed-dates '({:a "AAA" :b 2})))))
   (testing "Valid list"
     (is (= '({:start "2025-06-11 19:00:54", :end nil, :duration 1288, :active true, :game-type "lol", :id "EUW1_111111"})
-           (with-parsed-dates (take 1 matches-example))))))
+           (with-parsed-dates (take 1 matches-example)))) 
+    ))
 
 
 ;; Parse durations
@@ -100,7 +103,8 @@
     (is (= '({:a "AAA" :b 2  :duration nil}) (with-parsed-durations '({:a "AAA" :b 2})))))
   (testing "Valid list"
     (is (= '({:start 1749661254854, :end nil, :duration "21:28", :active true, :game-type "lol", :id "EUW1_111111"})
-           (with-parsed-durations (take 1 matches-example))))))
+           (with-parsed-durations (take 1 matches-example)))))
+  )
 
 
 ;; Parse dates and durations
@@ -108,12 +112,13 @@
   (println "* Parse dates and durations in a match list *")
   (testing "Empty or invalid lists"
     (is (= '() (with-parsed-dates-durations '())))
-    (is (= '({:duration nil, :start nil, :end nil})
+    (is (= '({:duration nil, :start nil, :end nil}) 
            (with-parsed-dates-durations '({}))))
     (is (= '({:a "AAA" :b 2 :duration nil, :start nil, :end nil})
            (with-parsed-dates-durations '({:a "AAA" :b 2})))))
   (testing "Valid list"
     (is (= '({:start "2025-06-11 19:00:54", :end nil, :duration "21:28", :active true, :game-type "lol", :id "EUW1_111111"})
-           (with-parsed-dates-durations (take 1 matches-example))))))
+           (with-parsed-dates-durations (take 1 matches-example)))))
+  )