Diabled CR for reachability queries. To avoid test issues in two cases

src/model_objects/component.rs

@@ -202,24 +202,23 @@ impl Component {
         let mut equivalent_clock_groups: Vec<HashSet<String>> = vec![used_clocks.clone()];
 
         for edge in &self.edges {
-            let local_equivalences = self.find_local_equivalences(edge);
+            let local_equivalences = self.find_local_equivalences(edge).expect("Could not find local equivalences");
             self.update_global_groups(&mut equivalent_clock_groups, &local_equivalences);
         }
         equivalent_clock_groups
     }
-    fn find_local_equivalences(&self, edge: &Edge) -> HashMap<String, u32> {
+    fn find_local_equivalences(&self, edge: &Edge) -> Result<HashMap<String, u32>, String> {
         let mut local_equivalence_map = HashMap::new();
         match &edge.update.clone() {
             Some(updates) => {
                 for update in updates {
-                    local_equivalence_map.insert(update.variable.clone(), update.expression.get_evaluated_int().unwrap() as u32);
+                    local_equivalence_map.insert(update.variable.clone(), update.expression.get_evaluated_int()? as u32);
                 }
             }
             None => {}
         }
-        local_equivalence_map
+        Ok(local_equivalence_map)
     }
-    //New Commit
 
     fn update_global_groups(
         &self,
@@ -528,10 +527,7 @@ mod tests{
 
     }
 
-    fn test_get_or_insert<>(){
-
-    }
-
+    #[test]
     fn test_compress_dcls(){
 
     }

src/tests/refinement/helper.rs

@@ -2,7 +2,9 @@ use crate::data_reader::component_loader::{JsonProjectLoader, XmlProjectLoader};
 use crate::data_reader::parse_queries;
 use crate::extract_system_rep::ExecutableQueryError;
 use crate::logging::setup_logger;
+use crate::model_objects::expressions::QueryExpression;
 use crate::model_objects::Query;
+use crate::parse_queries::Rule::reachability;
 use crate::system::extract_system_rep::create_executable_query;
 use crate::system::query_failures::QueryResult;
 use crate::transition_systems::transition_system::component_loader_to_transition_system;
@@ -63,7 +65,23 @@ pub fn json_run_query(path: &str, query: &str) -> Result<QueryResult, Executable
     };
     // After implementing clock reduction on component level, a few tests are failing due to
     // inconsistencies with initial state and global clock. Turn boolean true to ignore inconsistencies
-    project_loader.get_settings_mut().disable_clock_reduction = true;
+    if let Some(query_type) = q.get_query() {
+        match query_type {
+            QueryExpression::Reachability{ .. } => {
+                project_loader.get_settings_mut().disable_clock_reduction = true;
+            }
+            , QueryExpression::Refinement(_,_)
+            | QueryExpression::Consistency(_)
+            | QueryExpression::Implementation(_)
+            | QueryExpression::Determinism(_)
+            | QueryExpression::Specification(_)
+            | QueryExpression::BisimMinim(_)
+            | QueryExpression::GetComponent(_)
+            | QueryExpression::Prune(_) => {
+                project_loader.get_settings_mut().disable_clock_reduction = false;
+            },
+        }
+    }
 
     let mut comp_loader = project_loader.to_comp_loader();
     let query = create_executable_query(&q, &mut *comp_loader)?;