diff options
author | OszkarSemerath <oszka@152.66.252.189> | 2017-10-27 17:43:50 +0200 |
---|---|---|
committer | OszkarSemerath <oszka@152.66.252.189> | 2017-10-27 17:43:50 +0200 |
commit | 53a60207431153d0080104078c50f01add47df96 (patch) | |
tree | 28059b361ffeef34b8a75d3490263fd70490a58a /Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme | |
parent | Added a set of mutated queries to yakindu (diff) | |
download | VIATRA-Generator-53a60207431153d0080104078c50f01add47df96.tar.gz VIATRA-Generator-53a60207431153d0080104078c50f01add47df96.tar.zst VIATRA-Generator-53a60207431153d0080104078c50f01add47df96.zip |
Diverse Solution Store runs with hash code of the representation
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme')
-rw-r--r-- | Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionStoreWithDiversityDescriptor.xtend | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionStoreWithDiversityDescriptor.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionStoreWithDiversityDescriptor.xtend index ca39cada..bcdc8423 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionStoreWithDiversityDescriptor.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionStoreWithDiversityDescriptor.xtend | |||
@@ -1,19 +1,16 @@ | |||
1 | package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse | 1 | package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse |
2 | 2 | ||
3 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.AbstractNodeDescriptor | ||
4 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.NeighbourhoodWithTraces | ||
5 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.PartialInterpretation2ImmutableTypeLattice | 3 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.PartialInterpretation2ImmutableTypeLattice |
6 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation | 4 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation |
7 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.DiversityDescriptor | 5 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.DiversityDescriptor |
8 | import java.util.LinkedList | 6 | import java.util.LinkedList |
9 | import java.util.List | 7 | import java.util.List |
10 | import java.util.Map | ||
11 | import org.eclipse.viatra.dse.base.ThreadContext | 8 | import org.eclipse.viatra.dse.base.ThreadContext |
12 | 9 | ||
13 | class SolutionStoreWithDiversityDescriptor { | 10 | class SolutionStoreWithDiversityDescriptor { |
14 | val DiversityDescriptor descriptor | 11 | val DiversityDescriptor descriptor |
15 | val PartialInterpretation2ImmutableTypeLattice solutionCoder = new PartialInterpretation2ImmutableTypeLattice | 12 | val PartialInterpretation2ImmutableTypeLattice solutionCoder = new PartialInterpretation2ImmutableTypeLattice |
16 | val List<NeighbourhoodWithTraces<Map<? extends AbstractNodeDescriptor, Integer>, AbstractNodeDescriptor>> solutionCodeList = new LinkedList | 13 | val List<Integer> solutionCodeList = new LinkedList |
17 | 14 | ||
18 | var long runtime | 15 | var long runtime |
19 | var int allCheck | 16 | var int allCheck |
@@ -43,7 +40,7 @@ class SolutionStoreWithDiversityDescriptor { | |||
43 | descriptor.parallels, | 40 | descriptor.parallels, |
44 | descriptor.maxNumber, | 41 | descriptor.maxNumber, |
45 | descriptor.relevantTypes, | 42 | descriptor.relevantTypes, |
46 | descriptor.relevantRelations) | 43 | descriptor.relevantRelations).modelRepresentation.hashCode |
47 | val isDifferent = solutionCodeList.forall[previous | ! code.equals(previous)] | 44 | val isDifferent = solutionCodeList.forall[previous | ! code.equals(previous)] |
48 | runtime += System.nanoTime - start | 45 | runtime += System.nanoTime - start |
49 | allCheck++ | 46 | allCheck++ |
@@ -69,7 +66,7 @@ class SolutionStoreWithDiversityDescriptor { | |||
69 | descriptor.parallels, | 66 | descriptor.parallels, |
70 | descriptor.maxNumber, | 67 | descriptor.maxNumber, |
71 | descriptor.relevantTypes, | 68 | descriptor.relevantTypes, |
72 | descriptor.relevantRelations) | 69 | descriptor.relevantRelations).modelRepresentation.hashCode |
73 | solutionCodeList += code | 70 | solutionCodeList += code |
74 | runtime += System.nanoTime - start | 71 | runtime += System.nanoTime - start |
75 | } | 72 | } |