added neg operator, iter::sum

bumped version
InjectiveLabs · Sep 7, 2023 · 0135909 · 0135909
1 parent fd6f9fe
commit 0135909
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/injective-math/Cargo.toml b/packages/injective-math/Cargo.toml
@@ -6,7 +6,7 @@ license     = "Apache-2.0"
 name        = "injective-math"
 readme      = "README.md"
 repository  = "https://github.com/InjectiveLabs/cw-injective/tree/master/packages/injective-math"
-version     = "0.1.18"
+version     = "0.1.19"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/injective-math/src/fp_decimal/arithmetic.rs b/packages/injective-math/src/fp_decimal/arithmetic.rs
@@ -1,5 +1,6 @@
 /// Arithmetic operators for FPDecimal
 use crate::fp_decimal::{FPDecimal, U256};
+use std::iter;
 use std::ops;
 
 impl FPDecimal {
@@ -162,6 +163,15 @@ impl ops::Div for FPDecimal {
     }
 }
 
+impl<'a> iter::Sum<&'a Self> for FPDecimal {
+    fn sum<I>(iter: I) -> Self
+    where
+        I: Iterator<Item = &'a Self>,
+    {
+        iter.fold(FPDecimal::ZERO, |a, b| a + *b)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::str::FromStr;
@@ -578,4 +588,14 @@ mod tests {
         let ans = lhs.abs_diff(&rhs);
         assert_eq!(FPDecimal::from(3u128), ans);
     }
+    #[test]
+    fn test_chain_sum() {
+        let vector = vec![FPDecimal::ZERO, FPDecimal::ONE, FPDecimal::TWO, FPDecimal::THREE];
+        assert_eq!(FPDecimal::SIX, vector.iter().sum());
+    }
+    #[test]
+    fn test_chain_sum_equal_zero() {
+        let vector = vec![FPDecimal::ZERO, FPDecimal::ONE, FPDecimal::TWO, -FPDecimal::THREE];
+        assert_eq!(FPDecimal::ZERO, vector.iter().sum());
+    }
 }
diff --git a/packages/injective-math/src/fp_decimal/mod.rs b/packages/injective-math/src/fp_decimal/mod.rs
@@ -1,3 +1,4 @@
+use std::ops::Neg;
 use std::str::FromStr;
 
 use bigint::U256;
@@ -77,12 +78,23 @@ impl From<Uint256> for FPDecimal {
     }
 }
 
-// #[cfg(not(target_arch = "wasm32"))]
-// impl convert::From<FPDecimal> for f32 {
-//     fn from(x: FPDecimal) -> f32 {
-//         f32::from_str(&x.to_string()).unwrap()
-//     }
-// }
+impl Neg for FPDecimal {
+    type Output = FPDecimal;
+    fn neg(mut self) -> Self::Output {
+        if self.is_zero() {
+            return self;
+        }
+        match self.sign {
+            0 => {
+                self.sign = 1;
+            }
+            _ => {
+                self.sign = 0;
+            }
+        }
+        self
+    }
+}
 
 impl FPDecimal {
     pub const MAX: FPDecimal = FPDecimal { num: U256::MAX, sign: 1 };
@@ -247,3 +259,21 @@ mod log;
 pub mod scale;
 mod serde;
 mod trigonometry;
+
+#[cfg(test)]
+mod tests {
+    use crate::FPDecimal;
+    #[test]
+    fn test_neg_sign() {
+        let lhs = FPDecimal::ZERO - FPDecimal::ONE;
+        let rhs = -FPDecimal::ONE;
+        assert_eq!(lhs, rhs);
+    }
+
+    #[test]
+    fn test_neg_zero() {
+        let lhs = FPDecimal::ZERO;
+        let rhs = -FPDecimal::ZERO;
+        assert_eq!(lhs, rhs);
+    }
+}