added some consts to track the YAML_FOLDER

cps-sei · Jan 24, 2019 · d8f266e · d8f266e
1 parent 5cd5fe9
commit d8f266e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/include/pladapt/SDPAdaptationManager.h b/include/pladapt/SDPAdaptationManager.h
@@ -102,6 +102,7 @@ class SDPAdaptationManager : public AdaptationManager
  static const char* REACH_PREFIX;
  static const char* REACH_MODEL;
  static const char* REACH_SCOPE;
+ static const char* YAML_FOLDER;
 
  SDPAdaptationManager();
 

diff --git a/src/SDPAdaptationManager.cpp b/src/SDPAdaptationManager.cpp
@@ -46,6 +46,7 @@ const char* SDPAdaptationManager::REACH_PATH = "reachPath";
 const char* SDPAdaptationManager::REACH_PREFIX = "reachPrefix";
 const char* SDPAdaptationManager::REACH_MODEL = "reachModel";
 const char* SDPAdaptationManager::REACH_SCOPE = "reachScope";
+const char* SDPAdaptationManager::YAML_FOLDER = "yamlFolder";
 
 
 SDPAdaptationManager::SDPAdaptationManager() {
@@ -91,13 +92,19 @@ void SDPAdaptationManager::loadImmediateReachabilityRelation() {
 
  pImmediateReachabilityRelation.reset(new ReachabilityRelation(pConfigMgr->getConfigurationSpace()));
 
- string outputPath = getAlloyOutputPath(true);
- string command = getAlloyCommand(true, outputPath);
+ string outputPath("");
+ if (params[YAML_FOLDER].IsDefined()) {
+ outputPath = params[YAML_FOLDER].as<string>();
+ outputPath += ".i.yaml";
+ } else {
+ outputPath = getAlloyOutputPath(true);
+ string command = getAlloyCommand(true, outputPath);
 
- cout << "invoking " << command << endl;
+  cout << "invoking " << command << endl;
 
- if (system(command.c_str()) != 0) {
- throw runtime_error(string("Generation of immediate reachability function failed: ") + command.c_str());
+ if (system(command.c_str()) != 0) {
+ throw runtime_error(string("Generation of immediate reachability function failed: ") + command.c_str());
+ }
  }
 
  pImmediateReachabilityRelation->load(outputPath, *pConfigMgr);
@@ -127,13 +134,19 @@ void SDPAdaptationManager::loadReachabilityRelation() {
  // the underlying StepReachabilityRelation is the identity
  pStepReachabilityRelation->makeIdentity();
  } else {
- string outputPath = getAlloyOutputPath(false);
- string command = getAlloyCommand(false, outputPath);
-
- cout << "invoking " << command << endl;
-
- if (system(command.c_str()) != 0) {
- throw runtime_error(string("Generation of step reachability function failed: ") + command.c_str());
+ string outputPath("");
+ if (params[YAML_FOLDER].IsDefined()) {
+ outputPath = params[YAML_FOLDER].as<string>();
+ outputPath += ".yaml";
+ } else {
+ outputPath = getAlloyOutputPath(false);
+ string command = getAlloyCommand(false, outputPath);
+
+ cout << "invoking " << command << endl;
+
+ if (system(command.c_str()) != 0) {
+ throw runtime_error(string("Generation of step reachability function failed: ") + command.c_str());
+ }
  }
 
  pStepReachabilityRelation->load(outputPath, *pConfigMgr);