Merge lp:~yrke/tapaal/tapaal-fix-1855675-notWorkingWithLatestUPPAAL into lp:tapaal

[Kenneth Yrke Jørgensen]

Merged tapaal-fix-1855675-notWorkingWithLatestUPPAAL, Fixes bug #1855675

[Kenneth Yrke Jørgensen (yrke)]

I don't like the fact that it duplicates the version check code, this should really be extracted to a function. But as a bugfix this works.

Also changes the requred version of UPPAAL to 4.1.23 (latest), I made a request to UPPAAL devs if the can give us a version number based on the rev number.

[lp:~yrke/tapaal/tapaal-fix-1855675-notWorkingWithLatestUPPAAL]

1034. By Kenneth Yrke Jørgensen on 2019-12-12

Updated uppaal version number to match rev. 5648.

[Kenneth Yrke Jørgensen (yrke)]

Latest version set UPPAAL version to 4.1.19 to match rev. 5648

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/dk/aau/cs/verification/UPPAAL/Verifyta.java'
--- src/dk/aau/cs/verification/UPPAAL/Verifyta.java	2019-03-27 08:54:41 +0000
+++ src/dk/aau/cs/verification/UPPAAL/Verifyta.java	2019-12-12 08:15:25 +0000
@@ -134,11 +134,20 @@
 			resetVerifyta();
 			return false;
 		} else {
-			int version = Integer.parseInt(versionAsString);
-
-			if (version < Pipe.verifytaMinRev) {
-				return false;
+
+			String[] version = getVersion().split("\\.");
+			String[] targetversion = Pipe.verifytaMinRev.split("\\.");
+
+			for (int i = 0; i < targetversion.length; i++) {
+				if (version.length < i + 1) version[i] = "0";
+				int diff = Integer.parseInt(version[i]) - Integer.parseInt(targetversion[i]);
+				if (diff > 0) {
+					break;
+				} else if (diff < 0) {
+					return false;
+				}
 			}
+
 		}
 
 		return true;
@@ -165,8 +174,8 @@
 		} catch (IOException e) {
 			result = null;
 		}
-		
-		Pattern pattern = Pattern.compile("\\((?:rev. )?(\\d+)\\)");
+
+		Pattern pattern = Pattern.compile("(\\d+\\.\\d+\\.\\d+)");
 		Matcher m = pattern.matcher(versioninfo);
 		m.find();
 		result = m.group(1);
 
=== modified file 'src/pipe/gui/Pipe.java'
--- src/pipe/gui/Pipe.java	2019-10-23 14:12:48 +0000
+++ src/pipe/gui/Pipe.java	2019-12-12 08:15:25 +0000
@@ -77,7 +77,7 @@
 	public static Color QUERY_NOT_SATISFIED_COLOR = new Color(204, 0, 0);
 	public static Color QUERY_INCONCLUSIVE_COLOR = new Color(255, 153, 0);
 
-	public static final int verifytaMinRev = 5648;
+	public static final String verifytaMinRev = "4.1.19";
 	public static final String verifytapnMinRev = "1.3.0";
 	public static final String verifydtapnMinRev = "3.3.0";
 	public static final String verifypnMinRev = "3.0.2";