TAPAAL

Merge lp:~tapaal-contributor/tapaal/wrongVerificationAnswers-bug1031666-for-2.1 into lp:tapaal/2.1

  1. wrongVerificationAnswers-bug1031666-for-2.1
  2. Merge into 2.1
Proposed by Jiri Srba
Status: Merged
Merged at revision: 718
Proposed branch: lp:~tapaal-contributor/tapaal/wrongVerificationAnswers-bug1031666-for-2.1
Merge into: lp:tapaal/2.1
Diff against target: 35 lines (+4/-4)
2 files modified
src/dk/aau/cs/verification/QueryResult.java (+2/-2)
src/dk/aau/cs/verification/UPPAAL/UppaalIconSelector.java (+2/-2)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/wrongVerificationAnswers-bug1031666-for-2.1
Reviewer Review Type Date Requested Status
Jiri Srba Approve
Kenneth Yrke Jørgensen Pending
Review via email: mp+117613@code.launchpad.net

Commit message

Fixes bug #1031666 for 2.1

Description of the change

Fixes bug #1031666 for 2.1

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/dk/aau/cs/verification/QueryResult.java'
2--- src/dk/aau/cs/verification/QueryResult.java 2012-03-11 15:28:08 +0000
3+++ src/dk/aau/cs/verification/QueryResult.java 2012-08-01 11:05:22 +0000
4@@ -38,8 +38,8 @@
5
6 private boolean shouldAddExplanation() {
7 return (queryType.equals(QueryType.EF) && !isQuerySatisfied())
8- || (queryType.equals(QueryType.EG) && isQuerySatisfied())
9- || (queryType.equals(QueryType.AF) && !isQuerySatisfied())
10+ || (queryType.equals(QueryType.EG)) // && isQuerySatisfied())
11+ || (queryType.equals(QueryType.AF)) // && !isQuerySatisfied())
12 || (queryType.equals(QueryType.AG) && isQuerySatisfied());
13 }
14
15
16=== modified file 'src/dk/aau/cs/verification/UPPAAL/UppaalIconSelector.java'
17--- src/dk/aau/cs/verification/UPPAAL/UppaalIconSelector.java 2011-05-22 13:00:57 +0000
18+++ src/dk/aau/cs/verification/UPPAAL/UppaalIconSelector.java 2012-08-01 11:05:22 +0000
19@@ -12,14 +12,14 @@
20 public ImageIcon getIconFor(QueryResult result){
21 switch(result.queryType())
22 {
23- case AF:
24 case EF:
25 if(result.isQuerySatisfied()) return satisfiedIcon;
26 break;
27- case EG:
28 case AG:
29 if(!result.isQuerySatisfied()) return notSatisfiedIcon;
30 break;
31+ case EG: return inconclusiveIcon;
32+ case AF: return inconclusiveIcon;
33 default:
34 return null;
35 }

Subscribers

People subscribed via source and target branches