Skip to content

Commit

Permalink
Fixed with exploration messages
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rojods
Rojods committed Aug 10, 2023
1 parent 8e335d4 commit 6e7003a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 116 deletions.
2 changes: 1 addition & 1 deletion IDeSyDeLibrary.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def try_explore(
args, shell=(True if os.name == "nt" else False), stdout=subprocess.PIPE
) as child:
for line in child.stdout:
logger.console(line)
# logger.console(line)
logger.debug(line)
# if os.name == "nt":
# logger.console(subprocess.check_output(args, shell=True))
Expand Down
114 changes: 0 additions & 114 deletions rust-orchestration/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1085,74 +1085,6 @@ impl IdentificationModule for ExternalServerIdentificationModule {
.collect()
})
.unwrap_or(Vec::new())
// if let Ok(mut server_guard) = self.get_process().lock() {
// let server = server_guard.deref_mut();
// if let Some(out) = &mut server.stdout {
// return BufReader::new(out)
// .lines()
// .flatten()
// .map(|line| {
// if line.contains("DECISION INLINE") {
// let payload = &line[15..].trim();
// let mes = DecisionModelMessage::from_json_str(payload);
// if let Some(message) = mes {
// let boxed =
// Arc::new(OpaqueDecisionModel::from_decision_message(&message))
// as Arc<dyn DecisionModel>;
// return Some(boxed);
// }
// } else if !line.trim().eq_ignore_ascii_case("FINISHED") {
// warn!(
// "Ignoring non-compliant identification result by module {}: {}",
// self.unique_identifier(),
// line
// );
// debug!(
// "module {} error: {}",
// self.unique_identifier(),
// self.read_all_err()
// .unwrap_or("Unable to capture".to_string())
// )
// }
// None
// })
// .take_while(|x| x.is_some())
// .flatten()
// .collect();
// }
// }
// Vec::new()
// return std::iter::repeat_with(|| self.read_line_from_output())
// .inspect(|line| print!("{}", line.to_owned().unwrap_or("Shit is empty".to_string())))
// .flatten()
// .map(|line| {
// if line.contains("DECISION INLINE") {
// let payload = &line[15..].trim();
// let mes = DecisionModelMessage::from_json_str(payload);
// if let Some(message) = mes {
// let boxed = Arc::new(OpaqueDecisionModel::from_decision_message(&message))
// as Arc<dyn DecisionModel>;
// return Some(boxed);
// }
// } else if !line.trim().eq_ignore_ascii_case("FINISHED") {
// warn!(
// "Ignoring non-compliant identification result by module {}: {}",
// self.unique_identifier(),
// line
// );
// debug!(
// "module {} error: {}",
// self.unique_identifier(),
// self.read_all_err()
// .unwrap_or("Unable to capture".to_string())
// )
// }
// None
// })
// .inspect(|x| println!("result is {}", x.is_some()))
// .take_while(|x| x.is_some())
// .flatten()
// .collect();
}

fn reverse_identification(
Expand Down Expand Up @@ -1197,51 +1129,5 @@ impl IdentificationModule for ExternalServerIdentificationModule {
.collect()
})
.unwrap_or(Vec::new())
// return std::iter::repeat_with(|| self.read_line_from_output())
// .flatten()
// .map(|line| {
// if line.contains("DESIGN") {
// let payload = &line[6..].trim();
// let h = DesignModelHeader::from_file(std::path::Path::new(payload));
// if let Some(header) = h {
// let boxed = Box::new(header) as Box<dyn DesignModel>;
// return Some(boxed);
// }
// } else if !line.trim().eq_ignore_ascii_case("FINISHED") {
// warn!(
// "Ignoring non-compliant integration result by module {}: {}",
// self.unique_identifier(),
// line
// );
// }
// None
// })
// .take_while(|x| x.is_some())
// .flatten()
// .collect();
// if let Some(integrated_line) = self.read_line_from_output() {
// let num_models = integrated_line[10..].trim().parse().ok().unwrap_or(0usize);
// for _ in 0..num_models {
// if let Some(design_model_line) = self.read_line_from_output() {
// if design_model_line.contains("DESIGN") {
// let payload = &design_model_line[6..].trim();
// let h = DesignModelHeader::from_file(std::path::Path::new(payload));
// if let Some(header) = h {
// let boxed = Box::new(header) as Box<dyn DesignModel>;
// if !integrated.contains(&boxed) {
// integrated.push(boxed);
// }
// }
// } else {
// warn!(
// "Ignoring non-compliant identification result by module {}: {}",
// self.unique_identifier(),
// design_model_line
// )
// }
// }
// }
// }
// integrated
}
}
5 changes: 4 additions & 1 deletion scala-blueprints/src/main/scala/idesyde/blueprints/StandaloneIdentificationModule.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,10 @@ trait StandaloneIdentificationModule
// uniqueIdentifier
// )
sendOutputLine(
"DECISION INLINE " + DecisionModelMessage.fromDecisionModel(m).withEscapedNewLinesText
"DECISION INLINE " + DecisionModelMessage
.fromDecisionModel(m)
.withEscapedNewLinesText
.asText
)
}
sendOutputLine("FINISHED")
Expand Down

0 comments on commit 6e7003a

Please sign in to comment.