diff options
| author |  OszkarSemerath <oszkar.semerath@gmail.com> | 2018-11-07 13:17:16 +0100 |
|---|---|---|
| committer | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-11-07 13:17:16 +0100 |
| commit | e2a9a87c4f441edcdeb7ed7575da2c4666617566 (patch) | |
| tree | 3b33952d518cde74b5deb2f6bdf8ef3bd531f0e1 /Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit | |
| parent | some missing string support bugs in partial interpretation are fixed (diff) | |
| download | VIATRA-Generator-e2a9a87c4f441edcdeb7ed7575da2c4666617566.tar.gz VIATRA-Generator-e2a9a87c4f441edcdeb7ed7575da2c4666617566.tar.zst VIATRA-Generator-e2a9a87c4f441edcdeb7ed7575da2c4666617566.zip | |
Solver gives partial solutions even if it fails due to timeout or unsat
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit')
| -rw-r--r-- | Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend | 4 |
1 files changed, 4 insertions, 0 deletions
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 | |||
| 31 | import org.eclipse.viatra.dse.api.DesignSpaceExplorer.DseLoggingLevel | 31 | import org.eclipse.viatra.dse.api.DesignSpaceExplorer.DseLoggingLevel |
| 32 | import org.eclipse.viatra.dse.solutionstore.SolutionStore | 32 | import org.eclipse.viatra.dse.solutionstore.SolutionStore |
| 33 | import org.eclipse.viatra.dse.statecode.IStateCoderFactory | 33 | import org.eclipse.viatra.dse.statecode.IStateCoderFactory |
| 34 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.SolutionStoreWithDiversityDescriptor | ||
| 35 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.DiversityGranularity | ||
| 34 | 36 | ||
| 35 | class ViatraReasoner extends LogicReasoner{ | 37 | class ViatraReasoner extends LogicReasoner{ |
| 36 | val PartialInterpretationInitialiser initialiser = new PartialInterpretationInitialiser() | 38 | val PartialInterpretationInitialiser initialiser = new PartialInterpretationInitialiser() |
| @@ -169,12 +171,14 @@ class ViatraReasoner extends LogicReasoner{ | |||
| 169 | return createInsuficientResourcesResult=>[ | 171 | return createInsuficientResourcesResult=>[ |
| 170 | it.problem = problem | 172 | it.problem = problem |
| 171 | it.resourceName="time" | 173 | it.resourceName="time" |
| 174 | it.representation += strategy.solutionStoreWithCopy.solutions | ||
| 172 | it.statistics = statistics | 175 | it.statistics = statistics |
| 173 | ] | 176 | ] |
| 174 | } else { | 177 | } else { |
| 175 | if(solutionStore.solutions.empty) { | 178 | if(solutionStore.solutions.empty) { |
| 176 | return createInconsistencyResult => [ | 179 | return createInconsistencyResult => [ |
| 177 | it.problem = problem | 180 | it.problem = problem |
| 181 | it.representation += strategy.solutionStoreWithCopy.solutions | ||
| 178 | it.statistics = statistics | 182 | it.statistics = statistics |
| 179 | ] | 183 | ] |
| 180 | } else { | 184 | } else { |