From 53a60207431153d0080104078c50f01add47df96 Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Fri, 27 Oct 2017 17:43:50 +0200 Subject: Diverse Solution Store runs with hash code of the representation --- .../reasoner/dse/SolutionStoreWithDiversityDescriptor.xtend | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner') 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 @@ package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse -import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.AbstractNodeDescriptor -import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.NeighbourhoodWithTraces import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.PartialInterpretation2ImmutableTypeLattice import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.DiversityDescriptor import java.util.LinkedList import java.util.List -import java.util.Map import org.eclipse.viatra.dse.base.ThreadContext class SolutionStoreWithDiversityDescriptor { val DiversityDescriptor descriptor val PartialInterpretation2ImmutableTypeLattice solutionCoder = new PartialInterpretation2ImmutableTypeLattice - val List, AbstractNodeDescriptor>> solutionCodeList = new LinkedList + val List solutionCodeList = new LinkedList var long runtime var int allCheck @@ -43,7 +40,7 @@ class SolutionStoreWithDiversityDescriptor { descriptor.parallels, descriptor.maxNumber, descriptor.relevantTypes, - descriptor.relevantRelations) + descriptor.relevantRelations).modelRepresentation.hashCode val isDifferent = solutionCodeList.forall[previous | ! code.equals(previous)] runtime += System.nanoTime - start allCheck++ @@ -69,7 +66,7 @@ class SolutionStoreWithDiversityDescriptor { descriptor.parallels, descriptor.maxNumber, descriptor.relevantTypes, - descriptor.relevantRelations) + descriptor.relevantRelations).modelRepresentation.hashCode solutionCodeList += code runtime += System.nanoTime - start } -- cgit v1.2.3-54-g00ecf