Property selection

reactics.cc

@@ -23,6 +23,7 @@ int main(int argc, char **argv)
   bool benchmarking = false;
   bool usage_error = false;
   bool print_parsed_sys = false;
+  std::string property_name = "default";
 
   static struct option long_options[] = {
     {"trace-parsing",   no_argument,    0, 0   },
@@ -33,7 +34,7 @@ int main(int argc, char **argv)
   int c;
   int option_index = 0;
 
-  while ((c = getopt_long(argc, argv, "cbBmpPrsStTvxzh", long_options,
+  while ((c = getopt_long(argc, argv, "c:bBmpPrsStTvxzh", long_options,
                           &option_index)) != -1) {
     switch (c) {
       case 0:
@@ -75,6 +76,7 @@ int main(int argc, char **argv)
 
       case 'c':
         rstl_model_checking = true;
+        property_name = optarg;
         break;
 
       case 'm':
@@ -182,10 +184,10 @@ int main(int argc, char **argv)
     if (rstl_model_checking) {
       if (bmc) {
         cout << "Using BDD-based Bounded Model Checking" << endl;
-        mc.checkRSCTLK(driver.getFormRSCTLK());
+        mc.checkRSCTLK(driver.getFormRSCTLK(property_name));
       }
       else {
-        mc.checkRSCTLKfull(driver.getFormRSCTLK());
+        mc.checkRSCTLKfull(driver.getFormRSCTLK(property_name));
       }
     }
   }

rsin_driver.cc

@@ -17,7 +17,6 @@ rsin_driver::rsin_driver(RctSys *rs)
 void rsin_driver::initialise(void)
 {
   rs = nullptr;
-  rsctlkform = nullptr;
   opts = nullptr;
   use_ctx_aut = false;
   use_concentrations = false;
@@ -49,13 +48,18 @@ void rsin_driver::error(const std::string &m)
   std::cerr << m << std::endl;
 }
 
-FormRSCTLK *rsin_driver::getFormRSCTLK(void)
+void rsin_driver::addFormRSCTLK(std::string propertyName, FormRSCTLK *f)
 {
-  if (rsctlkform == nullptr) {
-    FERROR("RSCTLK formula was not supplied!");
+  properties[propertyName] = f;
+};
+
+FormRSCTLK *rsin_driver::getFormRSCTLK(std::string propertyName)
+{
+  if (properties.count(propertyName) == 0) {
+    FERROR("Property/formula label does not exist: " << propertyName);
   }
 
-  return rsctlkform;
+  return properties[propertyName];
 }
 
 //

rsin_driver.hh

@@ -25,9 +25,10 @@ class rsin_driver
     virtual ~rsin_driver();
 
     //std::map<std::string, int> variables;
-    FormRSCTLK *rsctlkform;
     Options *opts;
 
+    std::map<std::string, FormRSCTLK *> properties;
+
     // options in configuration file:
     bool use_ctx_aut;
     bool use_concentrations;
@@ -45,11 +46,9 @@ class rsin_driver
     {
       this->opts = opts;
     };
-    void addFormRSCTLK(std::string propertyName, FormRSCTLK *f)
-    {
-      rsctlkform = f;
-    };
-    FormRSCTLK *getFormRSCTLK(void);
+    void addFormRSCTLK(std::string propertyName, FormRSCTLK *f);
+
+    FormRSCTLK *getFormRSCTLK(std::string propertyName);
 
     void ensureOptionsAllowed(void);
     void useContextAutomaton(void);