change type of achievedWeight field to Integer

1 files changed, 6 insertions, 6 deletions

diff --git a/repgoal.hs b/repgoal.hs
index de0ca68..a873e59 100755
--- a/repgoal.hs
+++ b/repgoal.hs
@@ -73,7 +73,7 @@ import Generic.Data.Microsurgery
 
 data Performance = Achieved {
   achievedReps :: Integer,
-  achievedWeight :: Rational
+  achievedWeight :: Integer
 } deriving Generic deriving (Read, Show) via Surgery Derecordify Performance
 
 data LiftRecord = LiftRecord {
@@ -97,7 +97,7 @@ initial' =
     LiftRecord "Overhead Squat" [Achieved 5 65]
   ]
 
-computeRepGoal :: Rational -> [Performance] -> (Integer)
+computeRepGoal :: Integer -> [Performance] -> (Integer)
 computeRepGoal targetWeight stats = head $ filter isPR [2..]
   where
     isPR n = computeOneRepMax (Achieved n targetWeight) > computeOneRepMax (bestPerformance stats)
@@ -108,7 +108,7 @@ bestPerformance = head . sortBy (flip $ comparing computeOneRepMax)
 -- The formula from Jim Wendler's 5-3-1:
 -- 1RM = Weight x Reps x 0.0333 + Weight.
 computeOneRepMax :: Performance -> Rational
-computeOneRepMax Achieved{..} = achievedWeight * (realToFrac achievedReps * 0.0333 + 1)
+computeOneRepMax Achieved{..} = toRational achievedWeight * (realToFrac achievedReps * 0.0333 + 1)
 
 showRational :: Rational -> String
 showRational n = printf format $ (realToFrac :: Rational -> Float) $ n
@@ -126,7 +126,7 @@ drawUI (St lifts _) = [vCenter $ vBox [hCenter oneRepMaxTable, withVScrollBarHan
       map (padLeftRight 2)
       [
         txt $ liftName,
-        str $ printf "%d @ %s" achievedReps (showRational achievedWeight),
+        str $ printf "%d @ %d" achievedReps achievedWeight,
         str $ showRational $ computeOneRepMax best
       ]
     toWeekRows lift = (flip map) [1,2,3::Int] $ \week -> toWeekRow week lift
@@ -137,8 +137,8 @@ drawUI (St lifts _) = [vCenter $ vBox [hCenter oneRepMaxTable, withVScrollBarHan
           targetPercentage  = case week of 1 -> 85; 2 -> 90; 3 -> 95; _ -> undefined
           computedTarget    = (* (targetPercentage % 100)) $ (* (90 % 100)) $ computeOneRepMax best
           targetWeight      = ceilingN 5 computedTarget
-          repGoal           = computeRepGoal (targetWeight % 1) stats
-          goalTo1RM g       = computeOneRepMax $ Achieved g (targetWeight % 1)
+          repGoal           = computeRepGoal targetWeight stats
+          goalTo1RM g       = computeOneRepMax $ Achieved g targetWeight
           showGoal g        = printf "%2d @ %d ≈ 1 @ %s" g targetWeight (showRational (goalTo1RM g))
       in
       map (padLeftRight 2)