From 8a22d95e43e0f22382cc9d1cbee1afcb1e3cf23e Mon Sep 17 00:00:00 2001 From: Luis Borjas Reyes Date: Sun, 27 Dec 2020 16:19:06 -0500 Subject: [PATCH 1/2] minute whitespace fix --- test/Ephemeris/AspectSpec.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Ephemeris/AspectSpec.hs b/test/Ephemeris/AspectSpec.hs index a060a50..8e03164 100644 --- a/test/Ephemeris/AspectSpec.hs +++ b/test/Ephemeris/AspectSpec.hs @@ -24,7 +24,7 @@ spec = do , (sq, (Longitude 95, Longitude 10), Just (Applying, 5)) , (sq, (Longitude 100, Longitude 10), Just (Exact, 0)) , (sq, (Longitude 130, Longitude 10), Nothing) - , (cnj, (Longitude 270, Longitude 270), Just (Exact, 0) ) + , (cnj, (Longitude 270, Longitude 270), Just (Exact, 0)) ] sq = Aspect{ aspectType = Major, aspectName = Square, angle = 90.0, maxOrb = 10.0, temperament = Analytical } cnj = Aspect{ aspectType = Major, aspectName = Conjunction, angle = 0.0, maxOrb = 10.0, temperament = Analytical } From 3c4de0652da7c7267a411d0e84271a0536eac142 Mon Sep 17 00:00:00 2001 From: Luis Borjas Reyes Date: Sun, 27 Dec 2020 16:38:49 -0500 Subject: [PATCH 2/2] =?UTF-8?q?Remove=20na=C3=AFve=20strictness=20annotati?= =?UTF-8?q?ons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Anecdotally, this actually _helps_ speed?? --- src/Ephemeris/Types.hs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Ephemeris/Types.hs b/src/Ephemeris/Types.hs index 7933561..1189450 100644 --- a/src/Ephemeris/Types.hs +++ b/src/Ephemeris/Types.hs @@ -274,25 +274,25 @@ data HoroscopeData = HoroscopeData data TransitData = TransitData { - natalPlanetPositions :: ![PlanetPosition] - , natalAngles :: !Angles - , natalHouses :: ![House] - , natalHouseSystem :: !HouseSystem - , transitingPlanetPositions :: ![PlanetPosition] - , transitingHouses :: ![House] - , transitingAngles :: !Angles - , transitingHouseSystem :: !HouseSystem - , planetaryTransits :: ![(PlanetaryAspect, PlanetaryTransit)] - , angleTransits :: ![(AngleAspect, AngleTransit)] + natalPlanetPositions :: [PlanetPosition] + , natalAngles :: Angles + , natalHouses :: [House] + , natalHouseSystem :: HouseSystem + , transitingPlanetPositions :: [PlanetPosition] + , transitingHouses :: [House] + , transitingAngles :: Angles + , transitingHouseSystem :: HouseSystem + , planetaryTransits :: [(PlanetaryAspect, PlanetaryTransit)] + , angleTransits :: [(AngleAspect, AngleTransit)] } deriving (Eq, Show) data Transit a = Transit { - transiting :: !PlanetPosition - , transited :: !a - , transitStarts :: !(Maybe UTCTime) - , transitEnds :: !(Maybe UTCTime) - , immediateTriggers :: ![UTCTime] + transiting :: PlanetPosition + , transited :: a + , transitStarts :: (Maybe UTCTime) + , transitEnds :: (Maybe UTCTime) + , immediateTriggers :: [UTCTime] } deriving stock (Eq, Show) type PlanetaryTransit = Transit PlanetPosition