Merge lp:~verifydtapn-contributers/verifydtapn/af-games into lp:verifydtapn

Proposed by Jiri Srba
Status: Merged
Approved by: Jiri Srba
Approved revision: 382
Merged at revision: 340
Proposed branch: lp:~verifydtapn-contributers/verifydtapn/af-games
Merge into: lp:verifydtapn
Diff against target: 17 lines (+3/-1)
1 file modified
src/DiscreteVerification/VerificationTypes/SafetySynthesis.cpp (+3/-1)
To merge this branch: bzr merge lp:~verifydtapn-contributers/verifydtapn/af-games
Reviewer Review Type Date Requested Status
Jiri Srba Approve
Review via email: mp+392067@code.launchpad.net

Commit message

Fixes problem with control AF queries caused by collision in uniqueness check w. null value

To post a comment you must log in.
Revision history for this message
Jiri Srba (srba) wrote :

Tested and it fixes the problems.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/DiscreteVerification/VerificationTypes/SafetySynthesis.cpp'
--- src/DiscreteVerification/VerificationTypes/SafetySynthesis.cpp 2020-08-30 19:06:41 +0000
+++ src/DiscreteVerification/VerificationTypes/SafetySynthesis.cpp 2020-10-09 17:07:10 +0000
@@ -333,10 +333,12 @@
333333
334 std::sort(successors.begin(), successors.end());334 std::sort(successors.begin(), successors.end());
335 size_t unique = 0;335 size_t unique = 0;
336 bool first = true;
336 store_t::Pointer *child = nullptr;337 store_t::Pointer *child = nullptr;
337 for(auto p : successors) {338 for(auto p : successors) {
338 if(p == child) continue;339 if(p == child && !first) continue;
339 else child = p;340 else child = p;
341 first = false;
340 ++unique;342 ++unique;
341343
342 SafetyMeta &childmeta = store->get_meta(child);344 SafetyMeta &childmeta = store->get_meta(child);

Subscribers

People subscribed via source and target branches