Merge lp:~tapaal-dist-ctl/verifypn/arbitrary_query_count_support into lp:~verifypn-maintainers/verifypn/trunk

[Søren Moss Nielsen]

fixes an issue if the query file contains less than 16 queries and no -x option is specified.

This branch should fix the issue of the engine complaining, when less than 16 queries are committed without the -x flag.

There will still be an overflow, when more than 16 queries are committed, but this will require more work work to fix, and should have its own branch when the other branches are merged.

[Jiri Srba (srba)]

OK, for now but a more generic design would be better.

review: Approve

=== modified file 'VerifyPN.cpp'
--- VerifyPN.cpp	2016-05-20 07:40:05 +0000
+++ VerifyPN.cpp	2016-08-04 10:06:28 +0000
@@ -871,7 +871,7 @@
                 cout<<"FORMULA "<<meta_d->model_name<<"-"<<(xmlquery-1)<<" "<<pRes<<" "<<technique_str<<endl;
             }
             else{
-                for(int i = 0; i < 16; i++){
+                for(int i = 0; i < meta_d->numberof_queries; i++){
                     string pRes = (retval[i])?"FALSE" : "TRUE";
                     cout<<"FORMULA "<<meta_d->model_name<<"-"<<i<<" "<<pRes<<" "<<technique_str<<endl;
                 }