fixed issue with loading strategies w/o statevars

petergjoel · petergjoel · commit 1394535ff865 · 2019-06-20T14:04:44.000+02:00
diff --git a/src/SimpleTree.cpp b/src/SimpleTree.cpp
@@ -91,13 +91,15 @@ SimpleTree SimpleTree::parse(std::istream& input, bool simplify, bool subsumptio
     for(auto it = regressors.begin(); it != regressors.end(); ++it)
     {
         auto key = parse_key(it.key());
-        if(key.size() != tree._statevars.size())
+        if(key.size() != tree._statevars.size() && (tree._statevars.size() != 0 || key[0] != 1.0))
         {
             std::cerr << it.key() << std::endl;
             std::cerr << key.size() << std::endl;
             std::cerr << tree._statevars.size() << std::endl;
             throw base_error("Expected cardinality of key does not match cardinality of statevars");
         }
+        else if(tree._statevars.size() == 0)
+            key.clear();
         
 
         if(!it.value().is_object())

Original file line number	Diff line number	Diff line change
`@@ -91,13 +91,15 @@ SimpleTree SimpleTree::parse(std::istream& input, bool simplify, bool subsumptio`
`91`	`91`	`for(auto it = regressors.begin(); it != regressors.end(); ++it)`
`92`	`92`	`{`
`93`	`93`	`auto key = parse_key(it.key());`
`94`		`- if(key.size() != tree._statevars.size())`
	`94`	`+ if(key.size() != tree._statevars.size() && (tree._statevars.size() != 0 \|\| key[0] != 1.0))`
`95`	`95`	`{`
`96`	`96`	`std::cerr << it.key() << std::endl;`
`97`	`97`	`std::cerr << key.size() << std::endl;`
`98`	`98`	`std::cerr << tree._statevars.size() << std::endl;`
`99`	`99`	`throw base_error("Expected cardinality of key does not match cardinality of statevars");`
`100`	`100`	`}`
	`101`	`+ else if(tree._statevars.size() == 0)`
	`102`	`+ key.clear();`
`101`	`103`
`102`	`104`
`103`	`105`	`if(!it.value().is_object())`