Merge lp:~tapaal-contributor/verifypn/show-reduced-net into lp:verifypn

Proposed by Thomas Pedersen on 2020-11-13
Status: Merged
Approved by: Jiri Srba on 2020-12-17
Approved revision: 230
Merged at revision: 230
Proposed branch: lp:~tapaal-contributor/verifypn/show-reduced-net
Merge into: lp:verifypn
Diff against target: 17 lines (+0/-7)
1 file modified
src/VerifyPN.cpp (+0/-7)
To merge this branch: bzr merge lp:~tapaal-contributor/verifypn/show-reduced-net
Reviewer Review Type Date Requested Status
Jiri Srba 2020-11-13 Approve on 2020-12-17
Peter Gjøl Jensen 2020-11-13 Approve on 2020-12-14
Review via email: mp+393699@code.launchpad.net

Commit message

Removed restriction preventing the arguments -s OverApprox and -q 0 from being set at the same time.

This change was made to obtain the reduced net from the engine without running query reduction or verification. This relates to the GUI bug for opening the reduced net https://bugs.launchpad.net/tapaal/+bug/1879130

To post a comment you must log in.
Peter Gjøl Jensen (peter-gjoel) wrote :

Looks good to me.

review: Approve
Jiri Srba (srba) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/VerifyPN.cpp'
--- src/VerifyPN.cpp 2020-10-19 19:47:58 +0000
+++ src/VerifyPN.cpp 2020-11-13 10:06:58 +0000
@@ -754,13 +754,6 @@
754 return ErrorCode;754 return ErrorCode;
755 }755 }
756756
757 if (options.strategy == PetriEngine::Reachability::OverApprox && options.queryReductionTimeout == 0)
758 {
759 // Conflicting flags "-s OverApprox" and "-q 0"
760 std::cerr << "Conflicting flags '-s OverApprox' and '-q 0'" << std::endl;
761 return ErrorCode;
762 }
763
764 // simplification. We always want to do negation-push and initial marking check.757 // simplification. We always want to do negation-push and initial marking check.
765 {758 {
766 // simplification. We always want to do negation-push and initial marking check.759 // simplification. We always want to do negation-push and initial marking check.

Subscribers

People subscribed via source and target branches