Merge branch 'mistress' into github-page

Author: Charlotte Thomas

.github/workflows/rust-test.yml

@@ -2,7 +2,6 @@ name: Rust
 
 on:
   push:
-    branches: [ "mistress" ]
   pull_request:
     branches: [ "mistress" ]
 

CHANGELOG.md

@@ -1,3 +1,17 @@
+# Version 3.0.0 : Symbolic calculation!
+Version 3.0.0, at last! (if you've seen the PR for it it's been sitting for more
+than three weeks!) 
+
+Symbolic computation was added you can compute expressions with symbols (such as
+x,y,whatever) and more !
+
+# Version 2.13.2 : Bug fix
+Fix #43 
+
+# Version 2.13.1 : Bug fix
+Fix the issue of the function never used (moved implementation to the test
+module)
+
 # Version 2.13.0 : Update!
 You can upgrade the calculator with `mini-calc --update`
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mini-calc"
-version = "2.13.0"
+version = "3.0.0"
 license = "GPL-3.0-or-later"
 description = "A fully-featured minimalistic configurable rust calculator"
 homepage = "https://calc.nwa2coco.fr"

Cargo.toml

@@ -6,3 +6,5 @@ release:
 	cargo build --release
 test:
 	cargo test
+publish:
+	cargo publish

Makefile

@@ -54,7 +54,6 @@ If you prefer a PDF, there is a [manual](https://calc.nwa2coco.fr/assets/manual.
 | [<img src="https://avatars.githubusercontent.com/u/87855546?v=4" style="border-radius: 50%;height:90pt;width:auto">](https://github.com/leana8959)        |Léana 江                  | Help, cleanup            | [Website/Blog](https://earth2077.fr)        |
 | [<img src="https://avatars.githubusercontent.com/u/53050011?v=4" style="border-radius:50%;height:90pt;width:auto">](https://github.com/Sigmaficient)      |Sigmaficient              | Nixify                   | [Website](https://sigmanificient.github.io/)|
 
-
 ## TODO List
 The TODO list is completed so I collapsed it
 <details> 

README.md

@@ -131,7 +131,7 @@ pub fn load_color(string: String) -> Color {
 
 pub fn replace_variable(str: String) -> String {
     str.replace("%author%", "Charlotte Thomas")
-        .replace("%version%", "v2.13.0")
+        .replace("%version%", "v3.0.0")
         .to_string()
 }
 

src/configuration/loader.rs

@@ -1 +1,2 @@
 pub mod rationals;
+pub mod symbolic;

src/exact_math/mod.rs

@@ -2,7 +2,7 @@ use std::{fmt::Display, ops};
 
 use crate::utils::integer_utils::gcd;
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy)]
 pub struct Rationals {
     pub under: i64,
     pub over: i64,
@@ -32,6 +32,17 @@ impl Rationals {
         return self.over == 0;
     }
 
+    pub fn opposite(self) -> Self {
+        Rationals::new(self.under, -1 * self.over)
+    }
+
+    pub fn invert(self) -> Result<Rationals, Rationals> {
+        match self.over {
+            0 => Err(Rationals::new(0, 1)),
+            _ => Ok(Rationals::new(self.over, self.under).reduce()),
+        }
+    }
+
     pub fn reduce(self) -> Self {
         let minus;
         let i1;
@@ -84,7 +95,7 @@ impl Rationals {
 
 impl Display for Rationals {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let fs = self.clone().reduce();
+        let fs = self.reduce();
         if fs.under == 1 {
             write!(f, "{}", fs.over)
         } else {

src/exact_math/rationals.rs

@@ -0,0 +1,121 @@
+use crate::parsing::ast::Parameters;
+use crate::parsing::ast::Parameters::*;
+
+pub fn size(p: &Parameters) -> i32 {
+    match p {
+        Null
+        | Int(_)
+        | Str(_)
+        | Float(_)
+        | Identifier(_)
+        | PlusOperation
+        | MinusOperation
+        | MultiplicationOperation
+        | DivideOperation
+        | Assign
+        | ExpoOperation
+        | GreaterOperation
+        | GreaterOrEqualOperation
+        | LesserOperation
+        | LesserOrEqualOperation
+        | Equal
+        | Bool(_)
+        | Rational(_)
+        | OrOperation
+        | AndOperation
+        | Not
+        | Vector(_)
+        | InterpreterVector(_) => 0,
+        Plus(x, y) => 1 + size(x) + size(y),
+        Var(x, _, _) => 1 + size(x),
+        Mul(x, y) => 1 + size(x) + size(y),
+        Div(x, y) => 1 + size(x) + size(y),
+    }
+}
+
+#[cfg(test)]
+mod test {
+
+    use crate::{
+        exact_math::rationals::Rationals,
+        parsing::ast::{
+            Ast,
+            Parameters::{self, *},
+        },
+    };
+
+    use super::size;
+    #[test]
+    fn test_leaf() {
+        let v = vec![
+            Null,
+            Int(1),
+            Str("".to_string()),
+            Float(1.0),
+            Identifier("".to_string()),
+            PlusOperation,
+            MinusOperation,
+            MultiplicationOperation,
+            DivideOperation,
+            Assign,
+            ExpoOperation,
+            GreaterOperation,
+            GreaterOrEqualOperation,
+            LesserOperation,
+            LesserOrEqualOperation,
+            Equal,
+            Bool(false),
+            Rational(Rationals::new(10, 10)),
+            OrOperation,
+            AndOperation,
+            Not,
+            Vector(Box::from(vec![Ast::Nil])),
+            InterpreterVector(Box::from(vec![Null])),
+        ];
+
+        let should = vec![
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0,
+        ];
+
+        let _ = v
+            .into_iter()
+            .map(|f| size(&f))
+            .zip(should)
+            .for_each(|(x, y)| assert_eq!(x, y));
+    }
+
+    #[test]
+    fn test_size() {
+        let should = 2;
+        let tree = Plus(
+            Box::from(Plus(
+                Box::from(Parameters::Int(1)),
+                Box::from(Parameters::Int(2)),
+            )),
+            Box::from(Parameters::Int(3)),
+        );
+        let result = size(&tree);
+        assert_eq!(result, should);
+    }
+    #[test]
+    fn test_size_mul() {
+        let should = 2;
+        let tree = Mul(
+            Box::from(Plus(
+                Box::from(Parameters::Int(1)),
+                Box::from(Parameters::Int(2)),
+            )),
+            Box::from(Parameters::Int(3)),
+        );
+        let result = size(&tree);
+        assert_eq!(result, should);
+    }
+    #[test]
+    fn test_size_var() {
+        let should = 1;
+        let tree = Var(Box::from(Parameters::Int(1)), 1, "s".to_string());
+        let result = size(&tree);
+        assert_eq!(result, should);
+    }
+}