feat: implement fractional numbers and serialization tests (#47)

* feat: implement fractional numbers

* refactor: move fluid types into fluid module

* add more tests

* remove unused generation function

fluido-core/src/lib.rs

@@ -9,12 +9,11 @@ use fluido_ir::{
 };
 use fluido_parse::parser::Parse;
 use fluido_types::{
-    concentration::Concentration,
     error::{
         FluidoError, IRGenerationError, InterefenceGraphGenerationError, MixerGenerationError,
     },
     expr::Expr,
-    fluid::Fluid,
+    fluid::{Concentration, Fluid},
 };
 
 /// A mixer generator for a specific target concentration from a given input space.

fluido-generation/src/lib.rs

@@ -1,8 +1,7 @@
 use egg::{rewrite as rw, *};
 use fluido_types::{
-    concentration::{Concentration, LimitedFloat, Volume},
     error::MixerGenerationError,
-    fluid::Fluid,
+    fluid::{Concentration, Fluid, LimitedFloat, Volume},
 };
 use std::{collections::HashSet, time::Duration};
 
@@ -372,22 +371,6 @@ fn concentration_valid(
     }
 }
 
-/// Generate all possible fluids with given start and end with step sizes.
-pub fn generate_all_fluids() -> Vec<Fluid> {
-    let epsilon = Concentration::EPSILON;
-    let end = (1.0 / epsilon) as usize;
-
-    let mut result = Vec::with_capacity(end);
-    for i in 0..end {
-        let concentrationtion = Concentration::new(i as i64);
-        let volume = 1.0.into();
-        let fluid = Fluid::new(concentrationtion, volume);
-        result.push(fluid);
-    }
-
-    result
-}
-
 fn normalize_expr_by_min_volume(expr: &RecExpr<MixLang>) -> String {
     // Find the smallest volume in the expression
     let mut min_volume: Option<f64> = None;

fluido-parse/src/parser.rs

@@ -1,6 +1,8 @@
 #![allow(clippy::empty_docs)]
 use fluido_types::{
-    concentration::LimitedFloat, error::IRGenerationError, expr::Expr, fluid::Fluid,
+    error::IRGenerationError,
+    expr::Expr,
+    fluid::{Fluid, LimitedFloat},
 };
 use pest::Parser;
 use pest_derive::Parser;
@@ -56,9 +58,8 @@ fn build_ast(pairs: pest::iterators::Pairs<Rule>) -> Result<Expr, IRGenerationEr
 mod tests {
     use crate::parser::Parse;
     use fluido_types::{
-        concentration::{Concentration, Volume},
         expr::Expr,
-        fluid::Fluid,
+        fluid::{Concentration, Fluid, Volume},
     };
 
     #[test]

fluido-types/Cargo.toml

@@ -8,3 +8,6 @@ anyhow = { workspace = true }
 egg = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 thiserror = { workspace = true } 
+
+[dev-dependencies]
+serde_test = "1.0.176"

fluido-types/src/error.rs

@@ -1,4 +1,4 @@
-use crate::concentration::Concentration;
+use crate::fluid::Concentration;
 use thiserror::Error;
 
 #[derive(Error, Debug)]

fluido-types/src/expr.rs

@@ -1,8 +1,8 @@
-use crate::{concentration::LimitedFloat, fluid::Fluid};
+use crate::fluid::{Concentration, Fluid};
 
 #[derive(Debug, PartialEq, Clone, Eq, Hash)]
 pub enum Expr {
     Mix(Box<Expr>, Box<Expr>),
-    LimitedFloat(LimitedFloat),
+    LimitedFloat(Concentration),
     Fluid(Fluid),
 }

fluido-types/src/fluid.rs

@@ -1,6 +1,8 @@
 use std::{fmt::Display, num::ParseFloatError, str::FromStr};
 
-use crate::concentration::{Concentration, Volume};
+pub use crate::number::LimitedFloat;
+pub type Concentration = LimitedFloat;
+pub type Volume = LimitedFloat;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct Fluid {
@@ -123,12 +125,9 @@ impl Fluid {
 
 #[cfg(test)]
 mod tests {
+    use super::*;
     use std::str::FromStr;
 
-    use crate::concentration::{Concentration, Volume};
-
-    use super::Fluid;
-
     #[test]
     fn mix_two_equal_volume_fluids() {
         let concentration_a = Concentration::from(0.1);

fluido-types/src/lib.rs

@@ -1,4 +1,4 @@
-pub mod concentration;
 pub mod error;
 pub mod expr;
 pub mod fluid;
+pub mod number;