Merge remote-tracking branch 'origin/master' into kris

3 files changed, 2 insertions, 5 deletions

diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/lib/alloy4.2_2015-02-22.jar_GoesHere.txt b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/lib/alloy4.2_2015-02-22.jar_GoesHere.txt
index 0df6fddc..960aa5d8 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/lib/alloy4.2_2015-02-22.jar_GoesHere.txt
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/lib/alloy4.2_2015-02-22.jar_GoesHere.txt
@@ -1 +1 @@
-Download alloy4.2_2015-02-22.jar from http://alloy.mit.edu/alloy/downloads/alloy4.2_2015-02-22.jar and place here.
\ No newline at end of file
+Download alloy4.2_2015-02-22.jar from http://alloytools.org/download/alloy4.2_2015-02-22.jar and place here.
\ No newline at end of file
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend
index 54b0f54a..a0382e8e 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend
@@ -131,12 +131,10 @@ abstract class PartialInterpretation2NeighbourhoodRepresentation<ModelRepresenta
                                 }

                                 newAdded = newAdded || (newElementNeigbours.size > elementNeigbours.size)

                         }

-

                         width += 1

                 } while (newAdded)

                 return width

         }

-

         /**

          * Creates a neighbourhood representation with traces

          * @param model The model to be represented.

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
index 2abc6d50..754ff55d 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
@@ -27,8 +27,7 @@ Require-Bundle: com.google.guava,
  org.apache.batik.util.gui;bundle-version="[1.6.0,1.6.1]",

  org.apache.xerces;bundle-version="2.9.0",

  org.w3c.dom.svg;bundle-version="1.1.0",

- org.w3c.css.sac;bundle-version="1.3.1",

- org.eclipse.m2e.maven.runtime.slf4j.simple;bundle-version="1.10.0"

+ org.w3c.css.sac;bundle-version="1.3.1"

 Import-Package: com.eclipsesource.v8;version="4.6.0",

  com.eclipsesource.v8.debug;version="4.6.0",

  com.eclipsesource.v8.utils;version="4.6.0",