Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
211 changes: 204 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ members = ["fluido-generation", "fluido", "fluido-parse", "fluido-ir", "fluido-c
[workspace.dependencies]
anyhow = "1.0.79"
clap = "4.5.0"
egg = "0.9.5"
egg = { git = "https://github.com/kayagokalp/egg", branch = "kayagokalp/generic-define-language" }
petgraph = "0.6.4"
thiserror = "1.0.57"
serde = "1.0.202"
10 changes: 5 additions & 5 deletions e2e-tests/src/harness.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::str::FromStr;

use fluido_core::{search_mixer_design, Config};
use fluido_types::fluid::Fluid;
use fluido_types::fluid::{Fluid, Number};

use crate::{manifest::TestManifest, util::run_and_capture_output};

Expand All @@ -23,7 +23,7 @@ pub async fn run_saturation(
// Convert the error into anyhow error.
Fluid::from_str(&fluid_str).map_err(|err| err.into())
})
.collect::<anyhow::Result<Vec<Fluid>>>()?;
.collect::<anyhow::Result<Vec<Fluid<Number>>>>()?;
let target_fluids = setup
.target
.values()
Expand All @@ -35,11 +35,11 @@ pub async fn run_saturation(
// Convert the error into anyhow error.
Fluid::from_str(&fluid_str).map_err(|err| err.into())
})
.collect::<anyhow::Result<Vec<Fluid>>>()?;
.collect::<anyhow::Result<Vec<Fluid<Number>>>>()?;

let target_concentration = target_fluids[0].concentration().clone();
let target_concentration: Number = *target_fluids[0].concentration();
let mixer_design =
search_mixer_design(config, target_concentration, input_fluids.as_ref())?;
search_mixer_design::<Number>(config, target_concentration, input_fluids.as_ref())?;

let mut result = true;
if let Some(mixer_sequence) = &expected.mixer_sequence {
Expand Down
Loading