@@ -50,10 +50,7 @@ lift ∷ (Decimal → Decimal) → Quantity → Result
5050lift fn q = (scalar' <<< fn) <$> toScalar' q
5151
5252lift2 ∷ (Decimal → Decimal → Decimal ) → Quantity → Quantity → Result
53- lift2 fn q1 q2 = scalar' <$> (fn <$> toScalar' q1 <*> toScalar' q2)
54-
55- lift2' ∷ (Decimal → Decimal → Decimal ) → Quantity → Quantity → Result
56- lift2' f q1 q2 = do
53+ lift2 f q1 q2 = do
5754 let u = derivedUnit q1
5855 v1 ← q1 `asValueIn'` u
5956 v2 ← q2 `asValueIn'` u
@@ -69,7 +66,7 @@ atan ∷ Quantity → Result
6966atan = lift Decimal .atan
7067
7168atan2 ∷ Quantity → Quantity → Result
72- atan2 = lift2' Decimal .atan2
69+ atan2 = lift2 Decimal .atan2
7370
7471cos ∷ Quantity → Result
7572cos = lift Decimal .cos
@@ -114,13 +111,13 @@ log10 ∷ Quantity → Result
114111log10 = lift Decimal .log10
115112
116113max2 ∷ Quantity → Quantity → Result
117- max2 = lift2' Decimal .max
114+ max2 = lift2 Decimal .max
118115
119116max ∷ NonEmptyList Quantity → Result
120117max xs = foldM max2 (head xs) (tail xs)
121118
122119min2 ∷ Quantity → Quantity → Result
123- min2 = lift2' Decimal .min
120+ min2 = lift2 Decimal .min
124121
125122min ∷ NonEmptyList Quantity → Result
126123min xs = foldM min2 (head xs) (tail xs)
@@ -131,7 +128,7 @@ mean xs = (_ ⊘ n) <$> foldM (⊕) (head xs) (tail xs)
131128 n = scalar' (Decimal .fromInt (length xs))
132129
133130modulo ∷ Quantity → Quantity → Result
134- modulo = lift2' Decimal .modulo
131+ modulo = lift2 Decimal .modulo
135132
136133round ∷ Quantity → Result
137134round = lift Decimal .round
0 commit comments