Merge lp:~tapaal-contributor/tapaal/broken-boundedness-check-games-2006111 into lp:tapaal/3.9

[Lena Ernstsen]

Fixed boundedness check error for game nets

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/dk/aau/cs/verification/VerificationResult.java'
--- src/dk/aau/cs/verification/VerificationResult.java	2023-01-09 11:11:07 +0000
+++ src/dk/aau/cs/verification/VerificationResult.java	2023-02-06 11:17:40 +0000
@@ -36,12 +36,14 @@
 		this.stats = stats;
 		this.rawOutput = rawOutput;
 
-		String[] lines = rawOutput.split(System.getProperty("line.separator"));
-		for (String line : lines) {
-            Matcher matcher = Pattern.compile("\\s*-k\\s*(\\d+)\\s*").matcher(line);
-            if (matcher.find()) {
-                this.bound = Integer.parseInt(matcher.group(1));
-                break;
+		if (rawOutput != null) {
+            String[] lines = rawOutput.split(System.getProperty("line.separator"));
+            for (String line : lines) {
+                Matcher matcher = Pattern.compile("\\s*-k\\s*(\\d+)\\s*").matcher(line);
+                if (matcher.find()) {
+                    this.bound = Integer.parseInt(matcher.group(1));
+                    break;
+                }
             }
         }
 	}
 
=== modified file 'src/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPNOptions.java'
--- src/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPNOptions.java	2020-07-13 13:58:47 +0000
+++ src/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPNOptions.java	2023-02-06 11:17:40 +0000
@@ -23,6 +23,7 @@
 			TraceOption traceOption,
 			SearchOption search,
 			boolean symmetry,
+			boolean gcd,
 			boolean timeDarts,
 			boolean pTrie,
 			boolean enableOverApproximation,
@@ -30,7 +31,7 @@
 			int approximationDenominator,
 			boolean stubbornReduction
 	) {
-		this(extraTokens, traceOption, search, symmetry, true, timeDarts, pTrie, false, false, new InclusionPlaces(), WorkflowMode.NOT_WORKFLOW, 0, enableOverApproximation, enableUnderApproximation, approximationDenominator, stubbornReduction);
+		this(extraTokens, traceOption, search, symmetry, gcd, timeDarts, pTrie, false, false, new InclusionPlaces(), WorkflowMode.NOT_WORKFLOW, 0, enableOverApproximation, enableUnderApproximation, approximationDenominator, stubbornReduction);
 		this.dontUseDeadPlaces = dontUseDeadPlaces;
 	}
 
 
=== modified file 'src/pipe/gui/KBoundAnalyzer.java'
--- src/pipe/gui/KBoundAnalyzer.java	2021-10-02 16:01:49 +0000
+++ src/pipe/gui/KBoundAnalyzer.java	2023-02-06 11:17:40 +0000
@@ -71,7 +71,8 @@
 		} else if(modelChecker instanceof VerifyTAPN){
 			return new VerifyTAPNOptions(k, TraceOption.NONE, SearchOption.BFS, true, false, true, false, false, 1);
 		} else if(modelChecker instanceof VerifyTAPNDiscreteVerification){
-			return new VerifyDTAPNOptions(true, k, TraceOption.NONE, SearchOption.BFS, true, !tapnNetwork.hasUrgentTransitions(), true, false, false, 1, false);
+		    boolean isGame = CreateGui.getCurrentTab().getLens().isGame();
+			return new VerifyDTAPNOptions(true, k, TraceOption.NONE, SearchOption.BFS, true, !isGame, !tapnNetwork.hasUrgentTransitions(), true, false, false, 1, false);
 		}
 		return null;
 	}