Refactor for query results and failures, new protobuf protocol, fixing simulation/reachability

.gitmodules

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

benches/simulation_bench.rs

@@ -20,13 +20,15 @@ fn create_step_request(
     last_response: &SimulationStartRequest,
 ) -> SimulationStepRequest {
     let cache = ModelCache::default();
-    helper::create_step_request(
+    helper::create_step_requests(
         component_names,
         components_path,
         composition,
         ConcreteEcdarBackend::handle_start_simulation(last_response.clone(), cache)
             .map(Response::new),
     )
+    .next()
+    .unwrap()
 }
 
 fn start_simulation(c: &mut Criterion, id: &str, request: SimulationStartRequest) {

benches/threadpool_bench.rs

@@ -55,7 +55,6 @@ fn create_query_request(json: &[String], query: &str, hash: u32) -> Request<Quer
             components: create_components(json),
             components_hash: hash,
         }),
-        ignored_input_outputs: None,
         settings: None,
     })
 }

samples/json/Actions/Components/CorrectComponent.json

@@ -1,5 +1,5 @@
 {
-  "name": "Researcher",
+  "name": "CorrectComponent",
   "declarations": "clock x;",
   "locations": [
     {

samples/json/Actions/Components/NonConsistent.json

@@ -1,5 +1,5 @@
 {
-  "name": "notConsistent",
+  "name": "NonConsistent",
   "declarations": "clock u;",
   "locations": [
     {

samples/json/Actions/Components/NonDeterministic1.json

@@ -1,5 +1,5 @@
 {
-  "name": "NonDeterminismCom",
+  "name": "NonDeterministic1",
   "declarations": "",
   "locations": [
     {

samples/json/Actions/Components/NonDeterministic2.json

@@ -1,5 +1,5 @@
 {
-  "name": "Component2",
+  "name": "NonDeterministic2",
   "declarations": "",
   "locations": [
     {

src/DataReader/component_loader.rs

@@ -114,6 +114,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());
             component
         } else {
             panic!("The component '{}' could not be retrieved", component_name);
@@ -212,6 +213,7 @@ impl ComponentLoader for JsonProjectLoader {
         }
 
         if let Some(component) = self.loaded_components.get(component_name) {
+            assert_eq!(component_name, component.get_name());
             component
         } else {
             panic!("The component '{}' could not be retrieved", component_name);
@@ -292,6 +294,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());
             component
         } else {
             panic!("The component '{}' could not be retrieved", component_name);

src/DataReader/mod.rs

@@ -5,6 +5,5 @@ pub mod parse_edge;
 pub mod parse_invariant;
 pub mod parse_queries;
 pub mod proto_reader;
-pub mod proto_writer;
 pub mod serialization;
 pub mod xml_parser;

src/DataReader/parse_edge.rs

@@ -64,7 +64,7 @@ impl Update {
     }
 }
 
-pub fn parse(edge_attribute_str: &str) -> Result<EdgeAttribute, Error<Rule>> {
+pub fn parse(edge_attribute_str: &str) -> Result<EdgeAttribute, Box<Error<Rule>>> {
     let mut pairs = EdgeParser::parse(Rule::edgeAttribute, edge_attribute_str)
         .unwrap_or_else(|e| panic!("Could not parse as rule with error: {}", e));
     let pair = pairs.next().unwrap();

src/DataReader/parse_invariant.rs

@@ -9,7 +9,7 @@ use pest::Parser;
 #[grammar = "DataReader/grammars/invariant_grammar.pest"]
 pub struct InvariantParser;
 
-pub fn parse(edge_attribute_str: &str) -> Result<BoolExpression, Error<Rule>> {
+pub fn parse(edge_attribute_str: &str) -> Result<BoolExpression, Box<Error<Rule>>> {
     let mut pairs = InvariantParser::parse(Rule::invariant, edge_attribute_str)
         .unwrap_or_else(|e| panic!("Could not parse as rule with error: {}", e));
     let pair = pairs.next().unwrap();