eliminate redundant "targetWeight" field

1 files changed, 17 insertions, 27 deletions

diff --git a/repgoal.hs b/repgoal.hs
index 51f853f..5533098 100755
--- a/repgoal.hs
+++ b/repgoal.hs
@@ -68,23 +68,22 @@ data Performance = Achieved {
   achievedWeight :: Rational
 }
 
-data LiftTarget = LiftTarget {
+data LiftRecord = LiftRecord {
   liftName :: Text,
-  targetWeight :: Rational,
   stats :: [Performance]
 }
 
-initial :: [LiftTarget]
+initial :: [LiftRecord]
 initial =
   [
-    LiftTarget "Squat"    255 [Achieved 6 270, Achieved 8 255, Achieved 5 285, Achieved 10 255],
-    LiftTarget "Bench"    180 [Achieved 7 190, Achieved 9 180, Achieved 4 205, Achieved 11 180],
-    LiftTarget "Deadlift" 340 [Achieved 5 360, Achieved 9 315, Achieved 8 345, Achieved 7 360],
-    LiftTarget "Press"    120 [Achieved 6 130, Achieved 9 120, Achieved 4 135]
+    LiftRecord "Squat"    [Achieved 6 270, Achieved 8 255, Achieved 5 285, Achieved 10 255],
+    LiftRecord "Bench"    [Achieved 7 190, Achieved 9 180, Achieved 4 205, Achieved 11 180],
+    LiftRecord "Deadlift" [Achieved 5 360, Achieved 9 315, Achieved 8 345, Achieved 7 360],
+    LiftRecord "Press"    [Achieved 6 130, Achieved 9 120, Achieved 4 135]
   ]
 
-computeRepGoal :: LiftTarget -> (Integer)
-computeRepGoal LiftTarget{..} = head $ filter isPR [2..]
+computeRepGoal :: Rational -> [Performance] -> (Integer)
+computeRepGoal targetWeight stats = head $ filter isPR [2..]
   where
     isPR n = computeOneRepMax (Achieved n targetWeight) > computeOneRepMax (bestPerformance stats)
 
@@ -106,7 +105,7 @@ drawUI (St lifts) = [vCenter $ vBox [hCenter oneRepMaxTable, hCenter lastSetTabl
   where
     lastSetTable = renderTable $ table $ map (padLeftRight 1 . str) ["Lift", "Week", "Last Set", "Goal", "Goal+1"] : concatMap toWeekRows lifts
     oneRepMaxTable = renderTable $ table $ map (padLeftRight 1 . str) ["Lift", "Achieved Best", "Computed 1RM"] : map toRow lifts
-    toRow LiftTarget{..} =
+    toRow LiftRecord{..} =
       let best@Achieved{..} = bestPerformance stats
       in
       map (padLeftRight 2)
@@ -116,11 +115,13 @@ drawUI (St lifts) = [vCenter $ vBox [hCenter oneRepMaxTable, hCenter lastSetTabl
         str $ showRational $ computeOneRepMax best
       ]
     toWeekRows lift = (flip map) [1,2,3::Int] $ \week -> toWeekRow week lift
-    toWeekRow :: Int -> LiftTarget -> [Widget n]
-    toWeekRow week target@LiftTarget{..} =
+    toWeekRow :: Int -> LiftRecord -> [Widget n]
+    toWeekRow week LiftRecord{..} =
       let best              = bestPerformance stats
-          programWeight     = (* (percentage week)) $ (* (90 % 100)) $ computeOneRepMax best
-          repGoal           = computeRepGoal target
+          targetReps        = case week of 1 -> 5; 2 -> 3; 3 -> 1; _ -> undefined :: Int
+          targetPercentage  = case week of 1 -> 85; 2 -> 90; 3 -> 95; _ -> undefined
+          targetWeight      = (* (targetPercentage % 100)) $ (* (90 % 100)) $ computeOneRepMax best
+          repGoal           = computeRepGoal targetWeight stats
           goalTo1RM g       = computeOneRepMax $ Achieved g targetWeight
           showGoal g        = printf "%d @ %s ≈ 1 @ %s" g (showRational targetWeight) (showRational (goalTo1RM g))
       in
@@ -128,30 +129,19 @@ drawUI (St lifts) = [vCenter $ vBox [hCenter oneRepMaxTable, hCenter lastSetTabl
       [
         txt $ (if week == 1 then liftName else " "),
         str $ show week,
-        str $ printf "%d @ %d" (targetReps week) (ceilingN 5 programWeight),
+        str $ printf "%d @ %d" targetReps (ceilingN 5 targetWeight),
         -- str $ showRational $ (* (percentage week)) $ (* (90 % 100)) $ computeOneRepMax best,
         str $ showGoal repGoal,
         str $ showGoal (repGoal + 1)
       ]
 
-    targetReps :: Int -> Int
-    targetReps 1 = 5
-    targetReps 2 = 3
-    targetReps 3 = 1
-    targetReps _ = undefined
-
-    percentage 1 = 85 % 100
-    percentage 2 = 90 % 100
-    percentage 3 = 95 % 100
-    percentage _ = undefined
-
 ceilingN :: Integer -> Rational -> Integer
 ceilingN n x = ceiling (x / toRational n) * n
 
 -- TODO: State contains chosen repmax formula
 -- TODO: State contains performances
 data St = St {
-  lifts :: [LiftTarget]
+  lifts :: [LiftRecord]
 }
 
 -- TODO: Event for inotify on edited text file (as input interface)