Merge pull request #24 from OSCPS-Project/fix-thermo-test-fail

Fix thermo test fail

Author: bhargavakula01

oscps-gui/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "oscps-gui"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+iced = "0.13.1"

oscps-gui/src/main.rs

@@ -0,0 +1,32 @@
+#[derive(Default)]
+struct Counter {
+    value: i8,
+}
+#[derive(Debug, Clone, Copy)]
+pub enum Message {
+    Increment,
+    Decrement,
+}
+use iced::widget::{button, row, text, Row};
+impl Counter {
+    pub fn view(&self) -> Row<Message> {
+        row![
+            button("+").on_press(Message::Increment),
+            text(self.value).size(50),
+            button("-").on_press(Message::Decrement),
+        ]
+    }
+    pub fn update(&mut self, message: Message) {
+        match message {
+            Message::Increment => {
+                self.value += 1;
+            }
+            Message::Decrement => {
+                self.value -= 1;
+            }
+        }
+    }
+}
+fn main() -> iced::Result {
+    iced::run("A cool counter", Counter::update, Counter::view)
+}

oscps-lib/src/component.rs

@@ -6,6 +6,8 @@ extern crate uom;
 
 extern crate pubchem;
 use anyhow::Result;
+use std::{thread,time::Duration};
+
 
 #[allow(dead_code)]
 /// This will hold the list of chemicals used within the simulation
@@ -43,9 +45,23 @@ impl Chemical {
             ChemicalIdentifier::PubchemID(id) => pubchem::Compound::new(id),
             ChemicalIdentifier::CompoundName(name) => pubchem::Compound::with_name(name.as_str()),
         };
-
-        let cid_vec = pubchem_chemical_object.cids().unwrap();
-        let cid: i32 = cid_vec[0];
+        let mut request_counter = 0;
+        let mut cid_vec = None;
+        while request_counter <= 10 {
+            match pubchem_chemical_object.cids(){
+                Ok(cid_list) => {
+                    cid_vec = Some(cid_list);
+                    break;
+                },
+                _ => {
+                    request_counter = request_counter + 1;
+                    thread::sleep(Duration::from_secs(10));
+                }
+            };
+        }
+
+        // let cid_vec = pubchem_chemical_object.cids().unwrap();
+        let cid: i32 = cid_vec.unwrap()[0];
         let prop = ChemicalProperties::new(cid).unwrap();
         return Ok(Chemical {
             pubchem_obj: pubchem_chemical_object,
@@ -93,14 +109,16 @@ impl ChemicalProperties {
 #[cfg(test)]
 mod chemical_species_tests {
     use crate::component::{Chemical, ChemicalIdentifier};
+    use std::{thread,time::Duration};
 
     #[test]
     fn test_create_chemical_from_pubchem_id() {
         // Using a known PubChem ID, e.g., 7732 (water)
         let identifier = ChemicalIdentifier::PubchemID(7732);
 
         let chemical = Chemical::new(identifier);
-
+        thread::sleep(Duration::from_secs(10));
+        
         assert!(
             chemical.is_ok(),
             "Failed to create chemical from PubChem ID"
@@ -119,6 +137,8 @@ mod chemical_species_tests {
         let identifier = ChemicalIdentifier::CompoundName(String::from("Water"));
 
         let chemical = Chemical::new(identifier);
+        thread::sleep(Duration::from_secs(10));
+
 
         assert!(chemical.is_ok(), "Failed to create chemical from name");
         let chemical = chemical.unwrap();

oscps-lib/src/thermodynamics.rs

@@ -93,7 +93,7 @@ impl ThermoState {
         ThermoState {
             pressure: Pressure::new::<pascal>(pressure),
             temperature: ThermodynamicTemperature::new::<kelvin>(temperature),
-            mass_list: mass_list,
+            mass_list,
         }
     }
 
@@ -132,6 +132,7 @@ mod thermo_tests {
     use uom::si::mass::kilogram;
     use uom::si::pressure::pascal;
     use uom::si::thermodynamic_temperature::kelvin;
+    use std::{thread,time::Duration};
 
     #[test]
     ///Test case generates an instance of the 'ThermoState' struct
@@ -146,6 +147,7 @@ mod thermo_tests {
                 acentric_factor: 0.344,    // example
             },
         };
+        thread::sleep(Duration::from_secs(10));
         let water_mass = Mass::new::<kilogram>(2.0);
         let water_species_pair = SpeciesListPair {
             chemical_species: water,
@@ -164,6 +166,8 @@ mod thermo_tests {
         assert_eq!(thermo_state.temperature.get::<kelvin>(), 298.15);
         assert_eq!(thermo_state.mass_list.len(), 1); // Should contain one mole fraction entry
 
+        
+
         // Check that the mole fraction's chemical is correctly set
         assert_eq!(
             thermo_state.mass_list[0]
@@ -187,6 +191,7 @@ mod thermo_tests {
                 acentric_factor: 0.344,    // example
             },
         };
+        thread::sleep(Duration::from_secs(10));
 
         let anisdine = Chemical {
             pubchem_obj: pubchem::Compound::new(7732),
@@ -197,7 +202,8 @@ mod thermo_tests {
                 acentric_factor: 0.24,    // (approximated)
             },
         };
-
+        thread::sleep(Duration::from_secs(10));
+        
         let water_mass = Mass::new::<kilogram>(2.0);
         let water_species_pair = SpeciesListPair {
             chemical_species: water,