Implement MulDivAssign with Ratio on RHS

iliekturtles · Sep 1, 2022 · d536b67 · d536b67
1 parent bc48048
commit d536b67
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/system.rs b/src/system.rs
@@ -553,6 +553,22 @@ macro_rules! system {
                     }
                 }
 
+                impl<D, Ul, Ur, V> $crate::lib::ops::$MulDivAssignTrait<Quantity<DimensionOne, Ur, V>> for Quantity<D, Ul, V>
+                where
+                    D: Dimension + ?Sized,
+                    D::Kind: $crate::marker::$MulDivAssignTrait,
+                    Ul: Units<V> + ?Sized,
+                    Ur: Units<V> + ?Sized,
+                    V: $crate::num::Num + $crate::Conversion<V>
+                        + $crate::lib::ops::$MulDivAssignTrait<V>,
+                {
+                    #[inline(always)]
+                    fn $muldivassign_fun(&mut self, rhs: Quantity<DimensionOne, Ur, V>) {
+                        self.value $muldivassign_op rhs.value;
+                        // change_base is needed for autoconvert! version
+                    }
+                }
+
                 #[doc(hidden)]
                 mod $Mod {
                     storage_types! {

diff --git a/src/tests/impl_ops.rs b/src/tests/impl_ops.rs
@@ -150,10 +150,10 @@ mod vv {
     test!(   div_ratio_right          m(6.)   /  ratio(2.),        m(3.)); //      6    c.f. BBB below
     test!(   mul_ratio_right_p        m(4.)   *   pct(50.),        m(2.)); //      6    c.f. CCC below
     test!(   div_ratio_right_p        m(4.)   /   pct(50.),        m(8.)); //      6    c.f. DDD below
- // test!(   mul_assign_ratio    [    m(4.) ] *= ratio(2.),        m(8.)); //  ERR      c.f. AAA above
- // test!(   div_assign_ratio    [    m(6.) ] /= ratio(2.),        m(3.)); //  ERR      c.f. BBB above
- // test!(   mul_assign_ratio_p  [    m(4.) ] *=  pct(50.),        m(2.)); //  ERR      c.f. CCC above
- // test!(   div_assign_ratio_p  [    m(4.) ] /=  pct(50.),        m(8.)); //  ERR      c.f. DDD above
+    test!(   mul_assign_ratio    [    m(4.) ] *= ratio(2.),        m(8.)); //           c.f. AAA above
+    test!(   div_assign_ratio    [    m(6.) ] /= ratio(2.),        m(3.)); //           c.f. BBB above
+    test!(   mul_assign_ratio_p  [    m(4.) ] *=  pct(50.),        m(2.)); //           c.f. CCC above
+    test!(   div_assign_ratio_p  [    m(4.) ] /=  pct(50.),        m(8.)); //           c.f. DDD above
     test!(   mul_bare_right           m(4.)   *        2. ,        m(8.)); //       7
     test!(   div_bare_right           m(6.)   /        2. ,        m(3.)); //       7
     test!(   mul_assign_bare     [    m(2.) ] *=       3. ,        m(6.)); //        8