From e2a9a87c4f441edcdeb7ed7575da2c4666617566 Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Wed, 7 Nov 2018 13:17:16 +0100 Subject: Solver gives partial solutions even if it fails due to timeout or unsat --- .../mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver') diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend index dfd8ca1a..6639e5f3 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend @@ -31,6 +31,8 @@ import org.eclipse.viatra.dse.api.DesignSpaceExplorer import org.eclipse.viatra.dse.api.DesignSpaceExplorer.DseLoggingLevel import org.eclipse.viatra.dse.solutionstore.SolutionStore import org.eclipse.viatra.dse.statecode.IStateCoderFactory +import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.SolutionStoreWithDiversityDescriptor +import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.DiversityGranularity class ViatraReasoner extends LogicReasoner{ val PartialInterpretationInitialiser initialiser = new PartialInterpretationInitialiser() @@ -169,12 +171,14 @@ class ViatraReasoner extends LogicReasoner{ return createInsuficientResourcesResult=>[ it.problem = problem it.resourceName="time" + it.representation += strategy.solutionStoreWithCopy.solutions it.statistics = statistics ] } else { if(solutionStore.solutions.empty) { return createInconsistencyResult => [ it.problem = problem + it.representation += strategy.solutionStoreWithCopy.solutions it.statistics = statistics ] } else { -- cgit v1.2.3-54-g00ecf