Information logger

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "Ecdar-ProtoBuf"]
 	path = Ecdar-ProtoBuf
 	url = https://github.com/Ecdar/Ecdar-ProtoBuf.git
-	branch = futureproof2
+	branch = futureproof1

samples/xml/ConsTests.xml

@@ -28,4 +28,4 @@ IO G21 { i?, o! }
 IO G22 { o! }
 IO G23 { o! }
 IO G24 { i?, o! }
-IO G25 { i?, o! }</system></nta>
+IO G25 { i?, o! }</system></nta>

src/DataReader/component_loader.rs

@@ -125,7 +125,7 @@ pub struct ComponentContainer {
 impl ComponentLoader for ComponentContainer {
     fn get_component(&mut self, component_name: &str) -> &Component {
         if let Some(component) = self.loaded_components.get(component_name) {
-            assert_eq!(component_name, component.get_name());
+            assert_eq!(component_name, component.name);
             component
         } else {
             panic!("The component '{}' could not be retrieved", component_name);
@@ -161,10 +161,10 @@ impl ComponentContainer {
     pub fn from_components(components: Vec<Component>) -> ComponentContainer {
         let mut comp_hashmap = HashMap::<String, Component>::new();
         for mut component in components {
-            log::trace!("Adding comp {} to container", component.get_name());
+            log::trace!("Adding comp {} to container", component.name);
             let inputs: Vec<_> = component.get_input_actions();
             input_enabler::make_input_enabled(&mut component, &inputs);
-            comp_hashmap.insert(component.get_name().to_string(), component);
+            comp_hashmap.insert(component.name.to_string(), component);
         }
         ComponentContainer::new(Arc::new(comp_hashmap))
     }
@@ -224,7 +224,7 @@ impl ComponentLoader for JsonProjectLoader {
         }
 
         if let Some(component) = self.loaded_components.get(component_name) {
-            assert_eq!(component_name, component.get_name());
+            assert_eq!(component_name, component.name);
             component
         } else {
             panic!("The component '{}' could not be retrieved", component_name);
@@ -234,7 +234,7 @@ impl ComponentLoader for JsonProjectLoader {
     fn save_component(&mut self, component: Component) {
         component_to_json_file(&self.project_path, &component);
         self.loaded_components
-            .insert(component.get_name().clone(), component);
+            .insert(component.name.clone(), component);
     }
 
     fn get_settings(&self) -> &Settings {
@@ -279,7 +279,7 @@ impl JsonProjectLoader {
 
         let opt_inputs = self
             .get_declarations()
-            .get_component_inputs(component.get_name());
+            .get_component_inputs(&component.name);
         if let Some(inputs) = opt_inputs {
             input_enabler::make_input_enabled(&mut component, inputs);
         }
@@ -304,7 +304,7 @@ pub struct XmlProjectLoader {
 impl ComponentLoader for XmlProjectLoader {
     fn get_component(&mut self, component_name: &str) -> &Component {
         if let Some(component) = self.loaded_components.get(component_name) {
-            assert_eq!(component_name, component.get_name());
+            assert_eq!(component_name, component.name);
             component
         } else {
             panic!("The component '{}' could not be retrieved", component_name);
@@ -344,12 +344,12 @@ impl XmlProjectLoader {
 
         let mut map = HashMap::<String, Component>::new();
         for mut component in comps {
-            let opt_inputs = system_declarations.get_component_inputs(component.get_name());
+            let opt_inputs = system_declarations.get_component_inputs(&component.name);
             if let Some(opt_inputs) = opt_inputs {
                 input_enabler::make_input_enabled(&mut component, opt_inputs);
             }
 
-            let name = String::from(component.get_name());
+            let name = String::from(&component.name);
             map.insert(name, component);
         }
 

src/DataReader/json_writer.rs

@@ -6,7 +6,7 @@ pub fn component_to_json_file(project_path: &str, component: &Component) {
         "{0}{1}Components{1}{2}.json",
         project_path,
         std::path::MAIN_SEPARATOR,
-        component.get_name()
+        component.name
     );
     let file = File::create(path).expect("Couldnt open file");
 

src/DataReader/proto_reader.rs

@@ -169,8 +169,7 @@ mod tests {
             "Zones are not equal"
         );
         assert_eq!(
-            *state1.get_location(),
-            *state2.get_location(),
+            state1.decorated_locations, state2.decorated_locations,
             "Location trees are not equal"
         );
     }

src/EdgeEval/constraint_applyer.rs

@@ -155,9 +155,9 @@ fn replace_vars(expr: &ArithExpression, decls: &Declarations) -> Result<ArithExp
         )),
         ArithExpression::Clock(x) => Ok(ArithExpression::Clock(*x)),
         ArithExpression::VarName(name) => {
-            if let Some(x) = decls.get_clocks().get(name.as_str()).copied() {
+            if let Some(x) = decls.clocks.get(name.as_str()).copied() {
                 Ok(ArithExpression::Clock(x))
-            } else if let Some(x) = decls.get_ints().get(name.as_str()).copied() {
+            } else if let Some(x) = decls.ints.get(name.as_str()).copied() {
                 Ok(ArithExpression::Int(x))
             } else {
                 Err(name.to_string())
@@ -171,7 +171,7 @@ fn get_const(expr: &ArithExpression, decls: &Declarations) -> i32 {
     match expr {
         ArithExpression::Int(x) => *x,
         ArithExpression::Clock(_) => 0,
-        ArithExpression::VarName(name) => decls.get_ints().get(name).copied().unwrap_or(0),
+        ArithExpression::VarName(name) => decls.ints.get(name).copied().unwrap_or(0),
         ArithExpression::Difference(l, r) => get_const(l, decls) - get_const(r, decls),
         ArithExpression::Addition(l, r) => get_const(l, decls) + get_const(r, decls),
         ArithExpression::Multiplication(l, r) => get_const(l, decls) * get_const(r, decls),

src/ModelObjects/Expressions/arith_expression.rs

@@ -392,20 +392,15 @@ impl ArithExpression {
     }
 
     /// Finds the clock names used in the expression
-    pub fn get_varnames(&self) -> Vec<&str> {
+    pub fn has_varname(&self, name: &String) -> bool {
         match self {
             ArithExpression::Difference(a1, a2)
             | ArithExpression::Addition(a1, a2)
             | ArithExpression::Multiplication(a1, a2)
             | ArithExpression::Division(a1, a2)
-            | ArithExpression::Modulo(a1, a2) => a1
-                .get_varnames()
-                .iter()
-                .chain(a2.get_varnames().iter())
-                .copied()
-                .collect(),
-            ArithExpression::Clock(_) | ArithExpression::Int(_) => vec![],
-            ArithExpression::VarName(name) => vec![name.as_str()],
+            | ArithExpression::Modulo(a1, a2) => a1.has_varname(name) || a2.has_varname(name),
+            ArithExpression::Clock(_) | ArithExpression::Int(_) => false,
+            ArithExpression::VarName(n) => name == n,
         }
     }
 

src/ModelObjects/Expressions/bool_expression.rs

@@ -396,25 +396,17 @@ impl BoolExpression {
     }
 
     /// Finds the clock names used in the expression
-    pub fn get_varnames(&self) -> Vec<&str> {
+    pub fn has_varname(&self, name: &String) -> bool {
         match self {
-            BoolExpression::AndOp(p1, p2) | BoolExpression::OrOp(p1, p2) => p1
-                .get_varnames()
-                .iter()
-                .chain(p2.get_varnames().iter())
-                .copied()
-                .collect(),
+            BoolExpression::AndOp(p1, p2) | BoolExpression::OrOp(p1, p2) => {
+                p1.has_varname(name) || p2.has_varname(name)
+            }
             BoolExpression::LessEQ(a1, a2)
             | BoolExpression::GreatEQ(a1, a2)
             | BoolExpression::LessT(a1, a2)
             | BoolExpression::GreatT(a1, a2)
-            | BoolExpression::EQ(a1, a2) => a1
-                .get_varnames()
-                .iter()
-                .chain(a2.get_varnames().iter())
-                .copied()
-                .collect(),
-            BoolExpression::Bool(_) => vec![],
+            | BoolExpression::EQ(a1, a2) => a1.has_varname(name) || a2.has_varname(name),
+            BoolExpression::Bool(_) => false,
         }
     }
 
@@ -462,6 +454,12 @@ impl BoolExpression {
     }
 }
 
+impl Default for BoolExpression {
+    fn default() -> Self {
+        BoolExpression::Bool(true)
+    }
+}
+
 fn var_from_naming(
     naming: &HashMap<ClockIndex, String>,
     index: ClockIndex,