diff options
Diffstat (limited to 'Solvers')
4 files changed, 24 insertions, 20 deletions
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/.classpath b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/.classpath index de68b5f7..25b7f16f 100644 --- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/.classpath +++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/.classpath | |||
@@ -1,11 +1,15 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <classpath> | 2 | <classpath> |
3 | <classpathentry kind="src" path="xtend-gen"/> | 3 | <classpathentry kind="src" path="xtend-gen"/> |
4 | <classpathentry kind="src" path="queries"/> | 4 | <classpathentry kind="src" path="queries"/> |
5 | <classpathentry kind="src" path="vql-gen"/> | 5 | <classpathentry kind="src" path="vql-gen"/> |
6 | <classpathentry exported="true" kind="lib" path="lib/alloy4.2_2015-02-22.jar"/> | 6 | <classpathentry exported="true" kind="lib" path="lib/alloy4.2_2015-02-22.jar"/> |
7 | <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> | 7 | <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> |
8 | <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> | 8 | <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> |
9 | <classpathentry kind="src" path="src"/> | 9 | <classpathentry kind="src" path="src"> |
10 | <classpathentry kind="output" path="bin"/> | 10 | <attributes> |
11 | </classpath> | 11 | <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="hu.bme.mit.inf.dlsreasoner.alloy.reasoner/lib"/> |
12 | </attributes> | ||
13 | </classpathentry> | ||
14 | <classpathentry kind="output" path="bin"/> | ||
15 | </classpath> | ||
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/META-INF/MANIFEST.MF b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/META-INF/MANIFEST.MF index b944302b..75581def 100644 --- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/META-INF/MANIFEST.MF +++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/META-INF/MANIFEST.MF | |||
@@ -20,7 +20,8 @@ Require-Bundle: com.google.guava, | |||
20 | org.eclipse.viatra.query.runtime.base.itc;bundle-version="1.3.0", | 20 | org.eclipse.viatra.query.runtime.base.itc;bundle-version="1.3.0", |
21 | hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0", | 21 | hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0", |
22 | org.eclipse.viatra.query.runtime;bundle-version="2.0.0" | 22 | org.eclipse.viatra.query.runtime;bundle-version="2.0.0" |
23 | Import-Package: org.apache.log4j;version="1.2.15" | ||
24 | Automatic-Module-Name: hu.bme.mit.inf.dlsreasoner.alloy.reasoner | ||
25 | Bundle-ActivationPolicy: lazy | ||
26 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 | 23 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 |
24 | Bundle-ActivationPolicy: lazy | ||
25 | Bundle-NativeCode: libminisat.so;osname=Linux;processor=x86_64 | ||
26 | Automatic-Module-Name: hu.bme.mit.inf.dlsreasoner.alloy.reasoner | ||
27 | Import-Package: org.apache.log4j;version="1.2.15" | ||
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend index 5e442ca7..f19ac30f 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend | |||
@@ -59,15 +59,14 @@ class NeighbourhoodBasedPartialInterpretationStateCoder<ModelRep, NodeRep> exten | |||
59 | override doCreateActivationCode(IPatternMatch match) { | 59 | override doCreateActivationCode(IPatternMatch match) { |
60 | val size = match.specification.parameters.size | 60 | val size = match.specification.parameters.size |
61 | val res = new ArrayList(size) | 61 | val res = new ArrayList(size) |
62 | var int index = 0 | ||
63 | var int equivalenceHash = 0 | 62 | var int equivalenceHash = 0 |
64 | val prime = 31 | 63 | val prime = 31 |
65 | 64 | ||
66 | while (index < size) { | 65 | for (var int index = 0; index < size; index++) { |
67 | res.add(getCode(match.get(index))) | 66 | val matchArgument = match.get(index) |
68 | index++ | 67 | res.add(getCode(matchArgument)) |
69 | for (var i = 0; i < index; i++) { | 68 | for (var i = 0; i < index; i++) { |
70 | val number = if (match.get(index) === match.get(i)) { | 69 | val number = if (matchArgument === match.get(i)) { |
71 | 1 | 70 | 1 |
72 | } else { | 71 | } else { |
73 | 0 | 72 | 0 |
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend index 6f38d261..c0a71c85 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend | |||
@@ -55,7 +55,7 @@ class ViatraReasonerConfiguration extends LogicSolverConfiguration { | |||
55 | */ | 55 | */ |
56 | public var SearchSpaceConstraint searchSpaceConstraints = new SearchSpaceConstraint | 56 | public var SearchSpaceConstraint searchSpaceConstraints = new SearchSpaceConstraint |
57 | 57 | ||
58 | public var ScopePropagatorStrategy scopePropagatorStrategy = new ScopePropagatorStrategy.Polyhedral( | 58 | public var ScopePropagatorStrategy scopePropagatorStrategy = ScopePropagatorStrategy.Polyhedral( |
59 | PolyhedralScopePropagatorConstraints.Relational, PolyhedralScopePropagatorSolver.Clp) | 59 | PolyhedralScopePropagatorConstraints.Relational, PolyhedralScopePropagatorSolver.Clp) |
60 | 60 | ||
61 | public var List<LinearTypeConstraintHint> hints = newArrayList | 61 | public var List<LinearTypeConstraintHint> hints = newArrayList |