Skip to content

haskell-gargantext
haskell-gargantext
Verified Commit 1606c306 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski
Browse files
Options

[phylo] fix golden tests and date phylo tests 

This is because I adjusted start time for date diff to be 0001-01-01
instead of 0000-00-00.
parent 5446b7f8
Pipeline #7840 failed with stages
          in 37 minutes and 24 seconds
          Hide whitespace changes
          Inline Side-by-side
          Showing with 164 additions and 165 deletions
          test-data/phylo/small-phylo.golden.json
          View file @ 1606c306
          ...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
          "_phylo_computeTime": null, "_phylo_computeTime": null,
          "_phylo_counts": { "_phylo_counts": {
          "coocByDate": { "coocByDate": {
          "24201": [ "24189": [
          [ [
          [ [
          0, 0,
          ...@@ -1075,9 +1075,9 @@ ...@@ -1075,9 +1075,9 @@
          1 1
          ] ]
          ], ],
          "24202": [], "24190": [],
          "24203": [], "24191": [],
          "24204": [ "24192": [
          [ [
          [ [
          1, 1,
          ...@@ -6413,10 +6413,10 @@ ...@@ -6413,10 +6413,10 @@
          1 1
          ] ]
          ], ],
          "24205": [], "24193": [],
          "24206": [], "24194": [],
          "24207": [], "24195": [],
          "24208": [ "24196": [
          [ [
          [ [
          1, 1,
          ...@@ -12748,14 +12748,14 @@ ...@@ -12748,14 +12748,14 @@
          ] ]
          }, },
          "docsByDate": { "docsByDate": {
          "24201": 1, "24189": 1,
          "24202": 0, "24190": 0,
          "24203": 0, "24191": 0,
          "24204": 4, "24192": 4,
          "24205": 0, "24193": 0,
          "24206": 0, "24194": 0,
          "24207": 0, "24195": 0,
          "24208": 4 "24196": 4
          }, },
          "lastRootsFreq": { "lastRootsFreq": {
          "1": 1.1627906976744186e-2, "1": 1.1627906976744186e-2,
          ...@@ -12912,7 +12912,7 @@ ...@@ -12912,7 +12912,7 @@
          "94": 1 "94": 1
          }, },
          "rootsCountByDate": { "rootsCountByDate": {
          "24201": { "24189": {
          "0": 1, "0": 1,
          "1": 1, "1": 1,
          "10": 1, "10": 1,
          ...@@ -12931,9 +12931,9 @@ ...@@ -12931,9 +12931,9 @@
          "8": 1, "8": 1,
          "9": 1 "9": 1
          }, },
          "24202": {}, "24190": {},
          "24203": {}, "24191": {},
          "24204": { "24192": {
          "1": 1, "1": 1,
          "10": 4, "10": 4,
          "11": 4, "11": 4,
          ...@@ -12994,10 +12994,10 @@ ...@@ -12994,10 +12994,10 @@
          "65": 1, "65": 1,
          "66": 1 "66": 1
          }, },
          "24205": {}, "24193": {},
          "24206": {}, "24194": {},
          "24207": {}, "24195": {},
          "24208": { "24196": {
          "1": 1, "1": 1,
          "10": 3, "10": 3,
          "11": 3, "11": 3,
          ...@@ -13256,8 +13256,8 @@ ...@@ -13256,8 +13256,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13268,8 +13268,8 @@ ...@@ -13268,8 +13268,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13280,8 +13280,8 @@ ...@@ -13280,8 +13280,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -13290,8 +13290,8 @@ ...@@ -13290,8 +13290,8 @@
          [ [
          [ [
          [ [
          24202, 24190,
          24204 24192
          ], ],
          1 1
          ], ],
          ...@@ -13300,8 +13300,8 @@ ...@@ -13300,8 +13300,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13312,8 +13312,8 @@ ...@@ -13312,8 +13312,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -13322,8 +13322,8 @@ ...@@ -13322,8 +13322,8 @@
          [ [
          [ [
          [ [
          24202, 24190,
          24204 24192
          ], ],
          1 1
          ], ],
          ...@@ -13332,8 +13332,8 @@ ...@@ -13332,8 +13332,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13344,8 +13344,8 @@ ...@@ -13344,8 +13344,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -13354,8 +13354,8 @@ ...@@ -13354,8 +13354,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -13364,8 +13364,8 @@ ...@@ -13364,8 +13364,8 @@
          [ [
          [ [
          [ [
          24202, 24190,
          24204 24192
          ], ],
          1 1
          ], ],
          ...@@ -13374,8 +13374,8 @@ ...@@ -13374,8 +13374,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13386,8 +13386,8 @@ ...@@ -13386,8 +13386,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13398,8 +13398,8 @@ ...@@ -13398,8 +13398,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13410,8 +13410,8 @@ ...@@ -13410,8 +13410,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -13420,8 +13420,8 @@ ...@@ -13420,8 +13420,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13432,8 +13432,8 @@ ...@@ -13432,8 +13432,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -13442,8 +13442,8 @@ ...@@ -13442,8 +13442,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -13452,8 +13452,8 @@ ...@@ -13452,8 +13452,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13464,8 +13464,8 @@ ...@@ -13464,8 +13464,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13476,8 +13476,8 @@ ...@@ -13476,8 +13476,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13488,8 +13488,8 @@ ...@@ -13488,8 +13488,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -13498,8 +13498,8 @@ ...@@ -13498,8 +13498,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -13510,8 +13510,8 @@ ...@@ -13510,8 +13510,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -13520,8 +13520,8 @@ ...@@ -13520,8 +13520,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -13532,8 +13532,8 @@ ...@@ -13532,8 +13532,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13544,8 +13544,8 @@ ...@@ -13544,8 +13544,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13556,8 +13556,8 @@ ...@@ -13556,8 +13556,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -13568,8 +13568,8 @@ ...@@ -13568,8 +13568,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -13578,8 +13578,8 @@ ...@@ -13578,8 +13578,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -13590,8 +13590,8 @@ ...@@ -13590,8 +13590,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13602,8 +13602,8 @@ ...@@ -13602,8 +13602,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13614,8 +13614,8 @@ ...@@ -13614,8 +13614,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -13626,8 +13626,8 @@ ...@@ -13626,8 +13626,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13638,8 +13638,8 @@ ...@@ -13638,8 +13638,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13727,13 +13727,13 @@ ...@@ -13727,13 +13727,13 @@
          "_phylo_periods": [ "_phylo_periods": [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          { {
          "_phylo_periodPeriod": [ "_phylo_periodPeriod": [
          24201, 24189,
          24203 24191
          ], ],
          "_phylo_periodPeriodStr": [ "_phylo_periodPeriodStr": [
          "2016-10-31", "2016-10-31",
          ...@@ -13743,8 +13743,8 @@ ...@@ -13743,8 +13743,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -13754,8 +13754,8 @@ ...@@ -13754,8 +13754,8 @@
          [ [
          [ [
          [ [
          24201, 24189,
          24203 24191
          ], ],
          1 1
          ], ],
          ...@@ -14873,8 +14873,8 @@ ...@@ -14873,8 +14873,8 @@
          16 16
          ], ],
          "_phylo_groupPeriod": [ "_phylo_groupPeriod": [
          24201, 24189,
          24203 24191
          ], ],
          "_phylo_groupPeriod'": [ "_phylo_groupPeriod'": [
          "2016-10-31", "2016-10-31",
          ...@@ -14913,8 +14913,8 @@ ...@@ -14913,8 +14913,8 @@
          ] ]
          ], ],
          "_phylo_scalePeriod": [ "_phylo_scalePeriod": [
          24201, 24189,
          24203 24191
          ], ],
          "_phylo_scalePeriodStr": [ "_phylo_scalePeriodStr": [
          "2016-10-31", "2016-10-31",
          ...@@ -14928,13 +14928,13 @@ ...@@ -14928,13 +14928,13 @@
          ], ],
          [ [
          [ [
          24202, 24190,
          24204 24192
          ], ],
          { {
          "_phylo_periodPeriod": [ "_phylo_periodPeriod": [
          24202, 24190,
          24204 24192
          ], ],
          "_phylo_periodPeriodStr": [ "_phylo_periodPeriodStr": [
          "2017-01-01", "2017-01-01",
          ...@@ -14944,8 +14944,8 @@ ...@@ -14944,8 +14944,8 @@
          [ [
          [ [
          [ [
          24202, 24190,
          24204 24192
          ], ],
          1 1
          ], ],
          ...@@ -14955,8 +14955,8 @@ ...@@ -14955,8 +14955,8 @@
          [ [
          [ [
          [ [
          24202, 24190,
          24204 24192
          ], ],
          1 1
          ], ],
          ...@@ -15031,8 +15031,8 @@ ...@@ -15031,8 +15031,8 @@
          12 12
          ], ],
          "_phylo_groupPeriod": [ "_phylo_groupPeriod": [
          24202, 24190,
          24204 24192
          ], ],
          "_phylo_groupPeriod'": [ "_phylo_groupPeriod'": [
          "2017-01-01", "2017-01-01",
          ...@@ -15113,8 +15113,8 @@ ...@@ -15113,8 +15113,8 @@
          ] ]
          ], ],
          "_phylo_scalePeriod": [ "_phylo_scalePeriod": [
          24202, 24190,
          24204 24192
          ], ],
          "_phylo_scalePeriodStr": [ "_phylo_scalePeriodStr": [
          "2017-01-01", "2017-01-01",
          ...@@ -15128,13 +15128,13 @@ ...@@ -15128,13 +15128,13 @@
          ], ],
          [ [
          [ [
          24203, 24191,
          24205 24193
          ], ],
          { {
          "_phylo_periodPeriod": [ "_phylo_periodPeriod": [
          24203, 24191,
          24205 24193
          ], ],
          "_phylo_periodPeriodStr": [ "_phylo_periodPeriodStr": [
          "", "",
          ...@@ -15144,16 +15144,16 @@ ...@@ -15144,16 +15144,16 @@
          [ [
          [ [
          [ [
          24203, 24191,
          24205 24193
          ], ],
          1 1
          ], ],
          { {
          "_phylo_scaleGroups": [], "_phylo_scaleGroups": [],
          "_phylo_scalePeriod": [ "_phylo_scalePeriod": [
          24203, 24191,
          24205 24193
          ], ],
          "_phylo_scalePeriodStr": [ "_phylo_scalePeriodStr": [
          "", "",
          ...@@ -15167,13 +15167,13 @@ ...@@ -15167,13 +15167,13 @@
          ], ],
          [ [
          [ [
          24204, 24192,
          24206 24194
          ], ],
          { {
          "_phylo_periodPeriod": [ "_phylo_periodPeriod": [
          24204, 24192,
          24206 24194
          ], ],
          "_phylo_periodPeriodStr": [ "_phylo_periodPeriodStr": [
          "", "",
          ...@@ -15183,16 +15183,16 @@ ...@@ -15183,16 +15183,16 @@
          [ [
          [ [
          [ [
          24204, 24192,
          24206 24194
          ], ],
          1 1
          ], ],
          { {
          "_phylo_scaleGroups": [], "_phylo_scaleGroups": [],
          "_phylo_scalePeriod": [ "_phylo_scalePeriod": [
          24204, 24192,
          24206 24194
          ], ],
          "_phylo_scalePeriodStr": [ "_phylo_scalePeriodStr": [
          "", "",
          ...@@ -15206,13 +15206,13 @@ ...@@ -15206,13 +15206,13 @@
          ], ],
          [ [
          [ [
          24205, 24193,
          24207 24195
          ], ],
          { {
          "_phylo_periodPeriod": [ "_phylo_periodPeriod": [
          24205, 24193,
          24207 24195
          ], ],
          "_phylo_periodPeriodStr": [ "_phylo_periodPeriodStr": [
          "", "",
          ...@@ -15222,16 +15222,16 @@ ...@@ -15222,16 +15222,16 @@
          [ [
          [ [
          [ [
          24205, 24193,
          24207 24195
          ], ],
          1 1
          ], ],
          { {
          "_phylo_scaleGroups": [], "_phylo_scaleGroups": [],
          "_phylo_scalePeriod": [ "_phylo_scalePeriod": [
          24205, 24193,
          24207 24195
          ], ],
          "_phylo_scalePeriodStr": [ "_phylo_scalePeriodStr": [
          "", "",
          ...@@ -15245,13 +15245,13 @@ ...@@ -15245,13 +15245,13 @@
          ], ],
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          { {
          "_phylo_periodPeriod": [ "_phylo_periodPeriod": [
          24206, 24194,
          24208 24196
          ], ],
          "_phylo_periodPeriodStr": [ "_phylo_periodPeriodStr": [
          "2017-05-01", "2017-05-01",
          ...@@ -15261,8 +15261,8 @@ ...@@ -15261,8 +15261,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -15272,8 +15272,8 @@ ...@@ -15272,8 +15272,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -15563,8 +15563,8 @@ ...@@ -15563,8 +15563,8 @@
          56 56
          ], ],
          "_phylo_groupPeriod": [ "_phylo_groupPeriod": [
          24206, 24194,
          24208 24196
          ], ],
          "_phylo_groupPeriod'": [ "_phylo_groupPeriod'": [
          "2017-05-01", "2017-05-01",
          ...@@ -15643,8 +15643,8 @@ ...@@ -15643,8 +15643,8 @@
          [ [
          [ [
          [ [
          24206, 24194,
          24208 24196
          ], ],
          1 1
          ], ],
          ...@@ -15877,8 +15877,8 @@ ...@@ -15877,8 +15877,8 @@
          70 70
          ], ],
          "_phylo_groupPeriod": [ "_phylo_groupPeriod": [
          24206, 24194,
          24208 24196
          ], ],
          "_phylo_groupPeriod'": [ "_phylo_groupPeriod'": [
          "2017-05-01", "2017-05-01",
          ...@@ -15955,8 +15955,8 @@ ...@@ -15955,8 +15955,8 @@
          ] ]
          ], ],
          "_phylo_scalePeriod": [ "_phylo_scalePeriod": [
          24206, 24194,
          24208 24196
          ], ],
          "_phylo_scalePeriodStr": [ "_phylo_scalePeriodStr": [
          "2017-05-01", "2017-05-01",
          ......
          test/Test/Core/Phylo.hs
          View file @ 1606c306
          ...@@ -23,13 +23,13 @@ test :: Spec ...@@ -23,13 +23,13 @@ test :: Spec
          test = do test = do
          describe "phylo tools works" $ do describe "phylo tools works" $ do
          it "toMonths works" $ do it "toMonths works" $ do
          toMonths 2025 1 1 `shouldBe` 24300 toMonths 2025 1 1 `shouldBe` 24288
          toMonths 2025 2 1 `shouldBe` 24301 toMonths 2025 2 1 `shouldBe` 24289
          toMonths 2025 4 1 `shouldBe` 24303 toMonths 2025 4 1 `shouldBe` 24291
          it "toDays works" $ do it "toDays works" $ do
          toDays 2025 1 1 `shouldBe` 739617 toDays 2025 1 1 `shouldBe` 739251
          toDays 2025 1 2 `shouldBe` 739618 toDays 2025 1 2 `shouldBe` 739252
          toDays 2025 1 4 `shouldBe` 739620 toDays 2025 1 4 `shouldBe` 739254
          it "toHours works" $ do it "toHours works" $ do
          toHours (UTCTimeR { year = 2025, month = 1, day = 1, hour = 0, minute = 0, sec = 0 }) `shouldBe` 17742024 toHours (UTCTimeR { year = 2025, month = 1, day = 1, hour = 0, minute = 0, sec = 0 }) `shouldBe` 17742024
          toHours (UTCTimeR { year = 2025, month = 1, day = 1, hour = 1, minute = 0, sec = 0 }) `shouldBe` 17742025 toHours (UTCTimeR { year = 2025, month = 1, day = 1, hour = 1, minute = 0, sec = 0 }) `shouldBe` 17742025
          ......
          test/Test/Offline/Phylo.hs
          View file @ 1606c306
          {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
          {-# LANGUAGE TupleSections #-}
          {-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeApplications #-}
          module Test.Offline.Phylo (tests) where module Test.Offline.Phylo (tests) where
          ......
          Markdown is supported
          0% or
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment