diff options
Diffstat (limited to '')
-rw-r--r-- | stdlib/source/library/lux/type/unit/scale.lux | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/stdlib/source/library/lux/type/unit/scale.lux b/stdlib/source/library/lux/type/unit/scale.lux index e88ee83e8..b7f598d13 100644 --- a/stdlib/source/library/lux/type/unit/scale.lux +++ b/stdlib/source/library/lux/type/unit/scale.lux @@ -15,9 +15,9 @@ (.type .public (Scale s) (Interface - (is (All (_ u) (-> (//.Qty Any u) (//.Qty s u))) + (is (All (_ u) (-> (//.Measure Any u) (//.Measure s u))) up) - (is (All (_ u) (-> (//.Qty s u) (//.Qty Any u))) + (is (All (_ u) (-> (//.Measure s u) (//.Measure Any u))) down) (is Ratio ratio))) @@ -30,24 +30,24 @@ (|>> //.number (i.* (.int /#numerator)) (i./ (.int /#denominator)) - //.quantity)) + //.measure)) (def down (|>> //.number (i.* (.int /#denominator)) (i./ (.int /#numerator)) - //.quantity)) + //.measure)) (def ratio ratio)))) -(def .public (re_scaled from to quantity) - (All (_ si so u) (-> (Scale si) (Scale so) (//.Qty si u) (//.Qty so u))) +(def .public (re_scaled from to measure) + (All (_ si so u) (-> (Scale si) (Scale so) (//.Measure si u) (//.Measure so u))) (let [(open "/[0]") (ratio./ (at from ratio) (at to ratio))] - (|> quantity + (|> measure //.number (i.* (.int /#numerator)) (i./ (.int /#denominator)) - //.quantity))) + //.measure))) (def .public type (syntax (_ [it <code>.any]) |