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

Proposed by Søren Moss Nielsen on 2016-08-04
Status: Merged
Approved by: Jiri Srba on 2016-08-07
Approved revision: 92
Merged at revision: 94
Proposed branch: lp:~tapaal-dist-ctl/verifypn/arbitrary_query_count_support
Merge into: lp:~verifypn-maintainers/verifypn/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
VerifyPN.cpp (+1/-1)
To merge this branch: bzr merge lp:~tapaal-dist-ctl/verifypn/arbitrary_query_count_support
Reviewer Review Type Date Requested Status
Jiri Srba 2016-08-04 Approve on 2016-08-07
Review via email:

Commit message

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

Description of the change

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.

To post a comment you must log in.
Jiri Srba (srba) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'VerifyPN.cpp'
2--- VerifyPN.cpp 2016-05-20 07:40:05 +0000
3+++ VerifyPN.cpp 2016-08-04 10:06:28 +0000
4@@ -871,7 +871,7 @@
5 cout<<"FORMULA "<<meta_d->model_name<<"-"<<(xmlquery-1)<<" "<<pRes<<" "<<technique_str<<endl;
6 }
7 else{
8- for(int i = 0; i < 16; i++){
9+ for(int i = 0; i < meta_d->numberof_queries; i++){
10 string pRes = (retval[i])?"FALSE" : "TRUE";
11 cout<<"FORMULA "<<meta_d->model_name<<"-"<<i<<" "<<pRes<<" "<<technique_str<<endl;
12 }


People subscribed via source and target branches