Merge pull request #54 from haslab/v2.1

Electrum V2.1

.gitignore

@@ -37,3 +37,5 @@ org.alloytools.alloy.application/src/main/java/edu/mit/csail/sdg/alloy4compiler/
 *.out
 *.app
 
+.idea
+*.iml

.travis.yml

@@ -1,20 +1,12 @@
-dist: trusty
-sudo: false
+dist: focal
 language: java
-jdk:
-- oraclejdk8
-install: "./gradlew --version"
-script: ./gradlew --no-daemon -DGRADLE_OPTS="-Xms128m" --stacktrace build -i
-after_success:
-- git status
-- echo $REPOSITORY_USERNAME
-- echo $TRAVIS_PULL_REQUEST
-- echo $TRAVIS_BRANCH
-- if [ master == $TRAVIS_BRANCH -a $TRAVIS_PULL_REQUEST == false -a  ${REPOSITORY_USERNAME:=X}
-  != X ]; then ./gradlew -DGRADLE_OPTS="-Xms128m" release -i; fi
+before_install:
+  - curl -L "http://nusmv.fbk.eu/distrib/NuSMV-2.6.0-zchaff-linux64.tar.gz" | tar --extract --gzip --strip-components=2 -C $HOME/bin "NuSMV-2.6.0-Linux/bin/NuSMV" || true
+  - curl -N -L "http://es-static.fbk.eu/tools/nuxmv/downloads/nuXmv-2.0.0-linux64.tar.gz" | tar --extract --gzip --strip-components=2 -C $HOME/bin "nuXmv-2.0.0-Linux/bin/nuXmv" || true
+install: 
+  - "gradle --version"
+script: travis_wait gradle --no-daemon -DGRADLE_OPTS="-Xms128m" --stacktrace build -i
 cache:
   directories:
   - "$HOME/.gradle"
-env:
-  secure: "iMLby/ptj+UObydTJmFj2VO3QoYOiLmNC6kl7HOeSek7Jeo1LNV/+PXZ01o72t2QszFVux2gDcUBlaZKFXsvN585rT0JGRf7R9EA5qiRzetPmWJaA4vdY+GSZR4O0DiOuBcp+KGS5rBHmi3NoKlLAeO/CrHLFyAv2qjofsECUwmsRsS47aCepC7qllla+8PiQbyse6wytJKIqvk4n7BDXXOfQLM6Y5LZ/5uFs6PKyiLlXBmlG5LzdMtxlEED1nOEmLKak7ZjP2VwpJ3KSFGyu7/l9lf+IFnnXAIZaGvARbTDUhF3cyoZgP2Ab5yWJEB1uYzkoNwczmW5ARfalKkjBAV8DuZJFSe39K7XcWVvWRMGTpUSUKA20BpD+wW3q1x8s8Vw+CLuRzCO6QD3uG+JZX2URIBt4F50SpS07HHAd0c6hzv9M4cjd5l9wBYH2nFX1uUuza6znuk3DJ69bM9INMQ+8A5fkSUaXEw/7ym3a+GQINrFtYftcDm915wAznS5Sa86tK2icDtV4vCdTikXLtu6xmYJ4raliGN0E3yL9agW0J1dMjzK+D6l6zXo/qVT+qjwN8+KSFaaYpGYGotqYT4ZnzR9gE85LZWAYLKgsyOOvMopl9MxRVDSKPomUW48aLpG4G80r2NDG3paxA8xS7esDJTBPNCYKuh7Gn3Cp8s="
-
+  - "$HOME/bin"

README.md

@@ -1,5 +1,5 @@
 ![Logo](https://avatars3.githubusercontent.com/u/30268214?v=4&s=200)
-<!--[![Build Status](https://travis-ci.org/AlloyTools/org.alloytools.alloy.svg?branch=master)](https://travis-ci.org/AlloyTools/org.alloytools.alloy)-->
+[![Build Status](https://travis-ci.org/github/haslab/Electrum2?branch=master)](https://travis-ci.org/github/haslab/Electrum2)
 # Electrum and Alloy
 
 Electrum is an extension to the Alloy Analyzer by
@@ -10,11 +10,11 @@ provides an analyzer for Electrum models, a temporal extension to the
 Alloy modeling language. The Analyzer provides both bounded and
 unbounded model checking procedures.
 
-Alloy 4 is a self-contained executable, which includes the Kodkod
-model finder and a variety of SAT solvers, as well as the standard
-Alloy library and a collection of tutorial examples. The same jar file
-can be incorporated into other applications to use Alloy as an API,
-and includes the source code. See the release notes for details of new
+Alloy 5 is a self-contained executable, which includes the Kodkod's extension
+Pardinus model finder and a variety of SAT solvers, as well as the standard
+Alloy library and a collection of tutorial examples. The same jar file can be
+incorporated into other applications to use Alloy as an API, and includes the
+source code. See the release notes for details of new
 features. 
 
 More documentation can be found at: http://alloytools.org/documentation.html.
@@ -63,8 +63,8 @@ The workspace is divided into a number of projects:
 * [org.alloytools.alloy.application](org.alloytools.alloy.application) – Main application code includes the parser, ast, visualiser, and application code
 * [org.alloytools.alloy.dist](org.alloytools.alloy.dist) – Project to create the distribution executable JAR
 * [org.alloytools.alloy.extra](org.alloytools.alloy.extra) – Models and examples
-* [org.alloytools.kodkod.core](org.alloytools.kodkod.core) – Kodkod without native code
-* [org.alloytools.kodkod.native](org.alloytools.kodkod.native) – The native code libraries for kodkod
+* [org.alloytools.pardinus](org.alloytools.pardinus) – Kodkod's temporal extension without native code
+* [org.alloytools.kodkod.native](org.alloytools.kodkod.native) – The native code libraries for Kodkod/Pardinus
 
 ### Relevant Project files
 
@@ -107,7 +107,9 @@ In the root of this workspace type `./gradlew`. This is a script that will downl
 
 ### Continuous Integration
 
-The workspace is setup to build after every commit using Travis. It releases snapshots to `https://oss.sonatype.org/content/repositories/snapshots/org/alloytools/` for every CI build on Travis.
+The workspace is setup to build after every commit using Travis. 
+
+<!--It releases snapshots to `https://oss.sonatype.org/content/repositories/snapshots/org/alloytools/` for every CI build on Travis.-->
 
 ### Building the DMG file for OSX systems
 

cnf/.classpath

@@ -3,4 +3,4 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
-</classpath>
+</classpath>

cnf/build.bnd

@@ -9,8 +9,8 @@ testbin:      			target/test-classes
 target-dir:   			target
 
 javac.source:           1.8
-javac.target:           ${javac.source}
-javac.compliance:       ${javac.source}
+javac.target:           1.8
+javac.compliance:       1.8
 javac.debug:            on
 
 Git-Descriptor:         	${system-allow-fail;git describe --dirty --always}
@@ -22,7 +22,7 @@ Bundle-DocURL: 			http://alloytools.org
 Bundle-License:			MIT
 
 base.version:           5.0.0
-elec.version:           2.0.0
+elec.version:           2.1.0
 Bundle-Version:         ${elec.version}.${tstamp}
 Bundle-Description:		Electrum Analyzer ${Bundle-Version} (forked from Alloy Analyzer ${base.version})
 

cnf/central.xml

@@ -4,7 +4,7 @@
 
 	<groupId>local</groupId>
 	<artifactId>central</artifactId>
-	<version>0.0.0</version>
+	<version>2.1.0</version>
 
 	<packaging>pom</packaging>
 

org.alloytools.alloy.application/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>

org.alloytools.alloy.application/bnd.bnd

@@ -3,20 +3,20 @@
 
 -buildpath: \
 	lib/apple-osx-ui.jar;version=file,\
-	org.alloytools.alloy.core;version=latest,\
 	org.alloytools.pardinus;version=latest,\
+	org.alloytools.alloy.core;version=latest,\
 
 -testpath: \
 	osgi.enroute.junit.wrapper, \
 	osgi.enroute.hamcrest.wrapper, \
     org.sat4j.core, \
-	org.alloytools.pardinus;version=latest,\
     org.alloytools.kodkod.nativesat.amd64-linux, \
     org.alloytools.kodkod.nativesat.util, \
     org.alloytools.kodkod.nativesat.x86-linux, \
     org.alloytools.kodkod.nativesat.x86-mac, \
     org.alloytools.kodkod.nativesat.x86-windows
-
+
+
 Private-Package: \
 	edu.mit.csail.sdg.alloy4graph,\
 	edu.mit.csail.sdg.alloy4viz,\

org.alloytools.alloy.application/src/main/java/edu/mit/csail/sdg/alloy4graph/GraphViewer.java

@@ -694,6 +694,16 @@ public Dimension getPreferredSize() {
         return new Dimension((int) (graph.getTotalWidth() * scale), (int) (graph.getTotalHeight() * scale));
     }
 
+    // [HASLab]
+    public double getScale() {
+        return scale;
+    }
+
+    // [HASLab]
+    public void setScale(double scale) {
+        this.scale = scale;
+    }
+
     /**
      * This method is called by Swing to draw this component.
      */