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
=== modified file 'src/dk/aau/cs/verification/QueryResult.java'
--- src/dk/aau/cs/verification/QueryResult.java 2012-03-11 15:28:08 +0000
+++ src/dk/aau/cs/verification/QueryResult.java 2012-08-01 11:05:22 +0000
@@ -38,8 +38,8 @@
38 38
39 private boolean shouldAddExplanation() {39 private boolean shouldAddExplanation() {
40 return (queryType.equals(QueryType.EF) && !isQuerySatisfied()) 40 return (queryType.equals(QueryType.EF) && !isQuerySatisfied())
41 || (queryType.equals(QueryType.EG) && isQuerySatisfied()) 41 || (queryType.equals(QueryType.EG)) // && isQuerySatisfied())
42 || (queryType.equals(QueryType.AF) && !isQuerySatisfied())42 || (queryType.equals(QueryType.AF)) // && !isQuerySatisfied())
43 || (queryType.equals(QueryType.AG) && isQuerySatisfied());43 || (queryType.equals(QueryType.AG) && isQuerySatisfied());
44 }44 }
45 45
4646
=== modified file 'src/dk/aau/cs/verification/UPPAAL/UppaalIconSelector.java'
--- src/dk/aau/cs/verification/UPPAAL/UppaalIconSelector.java 2011-05-22 13:00:57 +0000
+++ src/dk/aau/cs/verification/UPPAAL/UppaalIconSelector.java 2012-08-01 11:05:22 +0000
@@ -12,14 +12,14 @@
12 public ImageIcon getIconFor(QueryResult result){12 public ImageIcon getIconFor(QueryResult result){
13 switch(result.queryType())13 switch(result.queryType())
14 {14 {
15 case AF:
16 case EF:15 case EF:
17 if(result.isQuerySatisfied()) return satisfiedIcon;16 if(result.isQuerySatisfied()) return satisfiedIcon;
18 break;17 break;
19 case EG:
20 case AG:18 case AG:
21 if(!result.isQuerySatisfied()) return notSatisfiedIcon;19 if(!result.isQuerySatisfied()) return notSatisfiedIcon;
22 break;20 break;
21 case EG: return inconclusiveIcon;
22 case AF: return inconclusiveIcon;
23 default:23 default:
24 return null;24 return null;
25 }25 }

Subscribers

People subscribed via source and target branches