updated alloy backend to version 6.1.0

haslab · Jan 16, 2023 · ddb4253 · ddb4253
1 parent 9683c8b
commit ddb4253
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 28 deletions.
diff --git a/api/lib/edu/mit/csail/sdg/Electrum/1.2.1/Electrum-1.2.1.pom b/api/lib/edu/mit/csail/sdg/Electrum/1.2.1/Electrum-1.2.1.pom
diff --git a/api/lib/org/alloytools/Alloy/5.0.0.1/Alloy-5.0.0.1.jar b/api/lib/org/alloytools/Alloy/5.0.0.1/Alloy-5.0.0.1.jar
diff --git a/...ail/sdg/Electrum/1.2.1/Electrum-1.2.1.jar → ...rg/alloytools/Alloy/6.1.0/Alloy-6.1.0.jar b/...ail/sdg/Electrum/1.2.1/Electrum-1.2.1.jar → ...rg/alloytools/Alloy/6.1.0/Alloy-6.1.0.jar
diff --git a/...lloytools/Alloy/5.0.0.1/Alloy-5.0.0.1.pom → ...rg/alloytools/Alloy/6.1.0/Alloy-6.1.0.pom b/...lloytools/Alloy/5.0.0.1/Alloy-5.0.0.1.pom → ...rg/alloytools/Alloy/6.1.0/Alloy-6.1.0.pom
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.alloytoolsy</groupId>
+  <groupId>org.alloytools</groupId>
   <artifactId>Alloy</artifactId>
-  <version>5.0.0.1</version>
-  <description>POM was manually for mfes</description>
-</project>
+  <version>6.1.0</version>
+  <description>POM was created from install:install-file</description>
+</project>
diff --git a/api/lib/org/alloytools/Electrum/2.0.0/Electrum-2.0.0.jar b/api/lib/org/alloytools/Electrum/2.0.0/Electrum-2.0.0.jar
diff --git a/api/lib/org/alloytools/Electrum/2.0.0/Electrum-2.0.0.pom b/api/lib/org/alloytools/Electrum/2.0.0/Electrum-2.0.0.pom
diff --git a/api/pom.xml b/api/pom.xml
@@ -44,8 +44,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.alloytools</groupId>
-			<artifactId>Electrum</artifactId>
-			<version>2.0.0</version>
+			<artifactId>Alloy</artifactId>
+			<version>6.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>

diff --git a/api/src/main/java/pt/haslab/alloy4fun/AlloyGetInstances.java b/api/src/main/java/pt/haslab/alloy4fun/AlloyGetInstances.java
@@ -276,12 +276,12 @@ static private JsonObjectBuilder setToJSON(AlloyInstance answer, AlloySet signat
     	return atomJSON;
 	}
 
-	static private JsonObjectBuilder relToJSON(AlloyInstance answer, AlloyRelation signature) {
+	static private JsonObjectBuilder relToJSON(AlloyInstance answer, AlloyRelation rel) {
 		JsonObjectBuilder atomJSON = Json.createObjectBuilder();
-		atomJSON.add("name", signature.getName());
+		atomJSON.add("name", rel.getName());
 
 		JsonArrayBuilder instancesJSON = Json.createArrayBuilder();
-		for (AlloyTuple atts : answer.relation2tuples(signature)) {
+		for (AlloyTuple atts : answer.relation2tuples(rel)) {
 			JsonArrayBuilder tuple = Json.createArrayBuilder();
 			for (AlloyAtom at : atts.getAtoms())
 				tuple.add(at.toString());