[from now] 2014/04/10 04:24:58

[36mdiff --git a/src/Meal.hs b/src/Meal.hs[m
[36mindex 42a5182..faa22de 100644[m
[36m--- a/src/Meal.hs[m
[36m+++ b/src/Meal.hs[m
[34m@@ -42,9 +42,9 @@[m[32m [m[33mcMinus nu c = calorie nu `nMinus'` c[m
[32m data NurietKind = Protein | Carbon | Fat deriving Eq[m
[32m calorieCal :: NurietKind -> NutrientQuantity -> NutrientQuantity[m
[32m calorieCal _ Nothing = Nothing[m
[1m-calorieCal Protein (Just n) = Just ( 4 * n )[m
[1m-calorieCal Carbon (Just n) = Just ( 4 * n )[m
[1m-calorieCal Fat (Just n) = Just ( 9 * n )[m
[4m+[m[4mcalorieCal Protein jn = fmap (4*) jn[m
[4m+[m[4mcalorieCal Carbon  jn = fmap (4*) jn[m
[4m+[m[4mcalorieCal Fat     jn = fmap (9*) jn[m
[32m [m
[32m defaultNutrient :: Nutrient[m
[32m defaultNutrient = Nutrient{calorie = Nothing, protein = Nothing, fat = Nothing, carbon = Nothing}[m