提交: 442635013a88c060ff0fd919ce7ae048b4a7b418 - flitter-nix (git)

A Nix-friendly SQLite-enhanced fork of Flitter, a speedrunning split timer for Unix-style terminals

Commit MetaInfo

• 修订版: 442635013a88c060ff0fd919ce7ae048b4a7b418 (tree)
• 时间: 2023-05-26 03:11:22
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Finish hacking on summary tool.

All of the queries seem to report accurate data. Summation of segments
across categories is working; if you run a game that branches into many
categories, then statistics are accumulated across all categories.

更改概述

• modified: bin/summary_main.ml

差异

--- a/bin/summary_main.ml
+++ b/bin/summary_main.ml
@@ -14,6 +14,8 @@ let add_stdev db =
     ~step:(fun w d -> Welford.observe w (Data.to_int_exn d))
     ~final:(fun w -> Data.FLOAT (Welford.stddev w))
 
+let duration_of_float f = Duration.to_string (int_of_float f) 3
+
 let () =
   match Sys.get_argv () with
   | [| _; db_path |] ->
@@ -33,25 +35,24 @@ let () =
                    (Data.to_string_exn row.(1))
                    (Duration.to_string (Data.to_int_exn row.(3)) 3)
                    (Data.to_int_exn row.(2))
-                   (Duration.to_string
-                      (int_of_float (Data.to_float_exn row.(4)))
-                      3)
-                   (Duration.to_string
-                      (int_of_float (Data.to_float_exn row.(5)))
-                      3))))
+                   (duration_of_float (Data.to_float_exn row.(4)))
+                   (duration_of_float (Data.to_float_exn row.(5))))))
   | [| _; db_path; game; category |] ->
       Storage.with_db db_path (fun db ->
           add_stdev db;
           let vals = [ Data.TEXT game; Data.TEXT category ] in
           let stmt =
             prepare db
-              "with path(end, i) as (select starting_at, 0 from routes where \
-               game = ?1 and category = ?2 union select ending_at, path.i + 1 \
-               from segments, path where game = ?1 and category = ?2 and \
+              "with path(start, end, i) as (select segments.starting_at, \
+               segments.ending_at, 0 from segments, routes where routes.game = \
+               ?1 and routes.category = ?2 and segments.starting_at = \
+               routes.starting_at union select starting_at, ending_at, path.i \
+               + 1 from segments, path where game = ?1 and category = ?2 and \
                starting_at = path.end) select starting_at, ending_at, \
                min(duration), avg(duration), stdev(duration) from path, \
-               segments where game = ?1 and category = ?2 and ending_at = \
-               path.end group by starting_at, ending_at order by path.i;"
+               segments where game = ?1 and starting_at = path.start and \
+               ending_at = path.end group by starting_at, ending_at order by \
+               path.i;"
           in
           check_select stmt vals (fun row ->
               print_string
@@ -59,12 +60,8 @@ let () =
                    (Data.to_string_exn row.(0))
                    (Data.to_string_exn row.(1))
                    (Duration.to_string (Data.to_int_exn row.(2)) 3)
-                   (Duration.to_string
-                      (int_of_float (Data.to_float_exn row.(3)))
-                      3)
-                   (Duration.to_string
-                      (int_of_float (Data.to_float_exn row.(4)))
-                      3))))
+                   (duration_of_float (Data.to_float_exn row.(3)))
+                   (duration_of_float (Data.to_float_exn row.(4))))))
   | [| _; db_path; game; category; attempt |] ->
       Storage.with_db db_path (fun db ->
           let vals =
@@ -75,13 +72,17 @@ let () =
             ]
           in
           let stmt =
+            (* XXX SELECT DISTINCT required because path sometimes repeats i *)
             prepare db
-              "with path(end, i) as (select 'New Game', 0 union select \
-               ending_at, path.i + 1 from segments, path where game = ?1 and \
-               category = ?2 and attempt = ?3 and starting_at = path.end) \
-               select starting_at, ending_at, duration from path, segments \
-               where game = ?1 and category = ?2 and attempt = ?3 and \
-               ending_at = path.end order by path.i;"
+              "with path(start, end, i) as (select segments.starting_at, \
+               segments.ending_at, 0 from segments, routes where routes.game = \
+               ?1 and routes.category = ?2 and segments.starting_at = \
+               routes.starting_at union select starting_at, ending_at, path.i \
+               + 1 from segments, path where game = ?1 and category = ?2 and \
+               attempt = ?3 and starting_at = path.end) select distinct \
+               starting_at, ending_at, duration from path, segments where game \
+               = ?1 and category = ?2 and attempt = ?3 and starting_at = \
+               path.start and ending_at = path.end order by path.i;"
           in
           check_select stmt vals (fun row ->
               print_string