Merge branch 'prism'

Author: davexparker

prism-tests/bugfixes/trafileinit.auto

@@ -0,0 +1,2 @@
+-importmodel trafileinit.tra,lab -exportmodel trafileinit.tra,lab
+-importmodel trafileinit.tra,lab -exportmodel trafileinit.tra,lab -ex

prism-tests/bugfixes/trafileinit.lab

@@ -0,0 +1,4 @@
+0="init" 1="deadlock" 2="p2win" 3="done" 4="p1win"
+0: 2 3
+1: 0
+3: 3 4

prism-tests/bugfixes/trafileinit.tra

@@ -0,0 +1,10 @@
+4 6 9
+0 0 0 1 p
+1 0 2 1 a21
+1 1 2 1 a22
+2 0 1 0.5 a11
+2 0 2 0.5 a11
+2 1 0 0.3 a12
+2 1 2 0.3 a12
+2 1 3 0.4 a12
+3 0 3 1 p

prism/etc/jars/build.gradle

@@ -18,6 +18,16 @@ configurations {
     testRunner
 }
 
+configurations.all {
+    // Detect conflicts in JAR dependencies
+    resolutionStrategy {
+        failOnVersionConflict()
+        // Resolve JAR issue (JAS 2.7.200 may pull in too new log4j)
+        force 'org.apache.logging.log4j:log4j-api:2.24.0'
+        force 'org.apache.logging.log4j:log4j-core:2.24.0'
+    }
+}
+
 // Libraries not on Maven Central
 // Get from prismmodelchecker.org and cache in local-libs
 
@@ -52,24 +62,32 @@ tasks.register('downloadPrismJars') {
 
 dependencies {
 
+    // Colt (random number generation for simulator)
     implementation 'colt:colt:1.2.0'
-	implementation("de.uni-mannheim.rz.krum:jas:2.7.90")
-    implementation 'org.jfree:jfreechart:1.0.14'
-    implementation 'org.jfree:jcommon:1.0.17'
-	//implementation("com.martiansoftware:nailgun-server:0.9.1")
-    implementation 'it.unimi.dsi:fastutil:8.5.15'
+    // JAS: Java Algebra System (parametric engine)
+    implementation("de.uni-mannheim.rz.krum:jas:2.7.200")
+    // GSON (JSON reading/writing for UMB)
+    implementation 'com.google.code.gson:gson:2.11.0'
+    // Compression libraries (for import/export, e.g., UMB)
     implementation 'org.apache.commons:commons-compress:1.24.0'
 	implementation 'org.apache.commons:commons-math3:3.3'
     implementation 'org.tukaani:xz:1.10'
-    implementation 'com.google.code.gson:gson:2.11.0'
-    implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
-    implementation 'org.apache.logging.log4j:log4j-core:2.17.1'
+    // fastutil (fast data structures, e.g., UMB import/export)
+    implementation 'it.unimi.dsi:fastutil:8.5.15'
+    // JFreeChart (graph plotting in GUI)
+    implementation 'org.jfree:jfreechart:1.0.14'
+    
+    // Log4j (needed by JAS, possibly others)
+    implementation 'org.apache.logging.log4j:log4j-api:2.24.0'
+    implementation 'org.apache.logging.log4j:log4j-core:2.24.0'
+    
+    //implementation("com.martiansoftware:nailgun-server:0.9.1")
 
     // JUnit: for simplicity, don't put in separate test group for now
     implementation 'org.junit.platform:junit-platform-console-standalone:1.7.2'
     //testRunner 'org.junit.platform:junit-platform-console-standalone:1.9.3'
 
-	// Grab anything we can't find online from our local stash
+    // Grab anything we can't find online from our local stash
     implementation fileTree(dir: 'local-libs', include: ['*.jar'])
 }
 

prism/lib/README.md

@@ -3,24 +3,23 @@ This folder contains the following libraries:
 ```
 +--- colt:colt:1.2.0
 |    \--- concurrent:concurrent:1.3.4
-+--- de.uni-mannheim.rz.krum:jas:2.7.90
-|    \--- org.apache.logging.log4j:log4j-api:2.13.2 -> 2.17.1
++--- de.uni-mannheim.rz.krum:jas:2.7.200
+|    \--- org.apache.logging.log4j:log4j-api:[2.17.1,) -> 2.24.0
++--- com.google.code.gson:gson:2.11.0
+|    \--- com.google.errorprone:error_prone_annotations:2.27.0
++--- org.apache.commons:commons-compress:1.24.0
++--- org.apache.commons:commons-math3:3.3
++--- org.tukaani:xz:1.10
++--- it.unimi.dsi:fastutil:8.5.15
 +--- org.jfree:jfreechart:1.0.14
 |    +--- org.jfree:jcommon:1.0.17
 |    +--- xml-apis:xml-apis:1.3.04
 |    \--- com.lowagie:itext:2.1.5
 |         +--- bouncycastle:bcmail-jdk14:138
 |         \--- bouncycastle:bcprov-jdk14:138
-+--- org.jfree:jcommon:1.0.17
-+--- it.unimi.dsi:fastutil:8.5.15
-+--- org.apache.commons:commons-compress:1.24.0
-+--- org.apache.commons:commons-math3:3.3
-+--- org.tukaani:xz:1.10
-+--- com.google.code.gson:gson:2.11.0
-|    \--- com.google.errorprone:error_prone_annotations:2.27.0
-+--- org.apache.logging.log4j:log4j-api:2.17.1
-+--- org.apache.logging.log4j:log4j-core:2.17.1
-|    \--- org.apache.logging.log4j:log4j-api:2.17.1
++--- org.apache.logging.log4j:log4j-api:2.24.0
++--- org.apache.logging.log4j:log4j-core:2.24.0
+|    \--- org.apache.logging.log4j:log4j-api:2.24.0
 \--- org.junit.platform:junit-platform-console-standalone:1.7.2
 ```