diff options
author | Kristóf Marussy <kris7topher@gmail.com> | 2019-08-01 14:54:13 +0200 |
---|---|---|
committer | Kristóf Marussy <kris7topher@gmail.com> | 2019-08-01 14:54:13 +0200 |
commit | 9f133ae7abf273324033789c6582327bc61e5cb3 (patch) | |
tree | ccc7c05052f02dafed6a9c98af4e8c5d37855c3a /Solvers | |
parent | [Stochastic] Remove fault tree support for now (diff) | |
parent | https://github.com/kris7t graph width calculation -> (diff) | |
download | VIATRA-Generator-9f133ae7abf273324033789c6582327bc61e5cb3.tar.gz VIATRA-Generator-9f133ae7abf273324033789c6582327bc61e5cb3.tar.zst VIATRA-Generator-9f133ae7abf273324033789c6582327bc61e5cb3.zip |
Merge remote-tracking branch 'origin/master' into kris
Diffstat (limited to 'Solvers')
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 | |||
131 | } | 131 | } |
132 | newAdded = newAdded || (newElementNeigbours.size > elementNeigbours.size) | 132 | newAdded = newAdded || (newElementNeigbours.size > elementNeigbours.size) |
133 | } | 133 | } |
134 | |||
135 | width += 1 | 134 | width += 1 |
136 | } while (newAdded) | 135 | } while (newAdded) |
137 | return width | 136 | return width |
138 | } | 137 | } |
139 | |||
140 | /** | 138 | /** |
141 | * Creates a neighbourhood representation with traces | 139 | * Creates a neighbourhood representation with traces |
142 | * @param model The model to be represented. | 140 | * @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, | |||
27 | org.apache.batik.util.gui;bundle-version="[1.6.0,1.6.1]", | 27 | org.apache.batik.util.gui;bundle-version="[1.6.0,1.6.1]", |
28 | org.apache.xerces;bundle-version="2.9.0", | 28 | org.apache.xerces;bundle-version="2.9.0", |
29 | org.w3c.dom.svg;bundle-version="1.1.0", | 29 | org.w3c.dom.svg;bundle-version="1.1.0", |
30 | org.w3c.css.sac;bundle-version="1.3.1", | 30 | org.w3c.css.sac;bundle-version="1.3.1" |
31 | org.eclipse.m2e.maven.runtime.slf4j.simple;bundle-version="1.10.0" | ||
32 | Import-Package: com.eclipsesource.v8;version="4.6.0", | 31 | Import-Package: com.eclipsesource.v8;version="4.6.0", |
33 | com.eclipsesource.v8.debug;version="4.6.0", | 32 | com.eclipsesource.v8.debug;version="4.6.0", |
34 | com.eclipsesource.v8.utils;version="4.6.0", | 33 | com.eclipsesource.v8.utils;version="4.6.0", |