1 files changed, 12 insertions, 0 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionCopier.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionCopier.xtend
index d036257d..38c8f5a1 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionCopier.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionCopier.xtend
@@ -19,12 +19,23 @@ class CopiedSolution {
         @Accessors var boolean current = true
 }
 
+/**
+ * Based on {@link SolutionStore.BestSolutionSaver}.
+ * 
+ * Will also automatically fill any missing numerical values in the saved solutions
+ * using the supplied {@link NumericSolver}.
+ */
 class SolutionCopier {
+        val NumericSolver numericSolver
         val copiedSolutions = new LinkedHashMap<Object, CopiedSolution>
 
         long startTime = System.nanoTime
         @Accessors(PUBLIC_GETTER) long totalCopierRuntime = 0
 
+        new(NumericSolver numericSolver) {
+                this.numericSolver = numericSolver
+        }
+
         def void copySolution(ThreadContext context, Object solutionId) {
                 val existingCopy = copiedSolutions.get(solutionId)
                 if (existingCopy === null) {
@@ -36,6 +47,7 @@ class SolutionCopier {
                         totalCopierRuntime += System.nanoTime - copyStart
                         val copierRuntime = System.nanoTime - startTime
                         val copiedSolution = new CopiedSolution(copiedPartialInterpretation, copier, copierRuntime)
+                        numericSolver.fillSolutionCopy(copiedSolution.trace)
                         copiedSolutions.put(solutionId, copiedSolution)
                 } else {
                         existingCopy.current = true