Changeset 9840 for trunk/sources

Timestamp:

08/02/13 13:13:34 (11 years ago)

Author:

mkommend

Message:

#2021: Fixed a bug node impact caluclation code and adapted the cloner to include a method to get the matching cloned object given the original one.

Location:

trunk/sources

Files:

• HeuristicLab.Common/3.3/Cloner.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolutionImpactValuesCalculator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Common/3.3/Cloner.cs

@@ -67 +67 @@
     }
 
+    /// <summary>
+    /// Returns the clone of an deeply cloned item, if it was already cloned.
+    /// </summary>
+    /// <param name="original">The original object.</param>
+    /// <returns>The clone of the given object, if it was already cloned; null otherwise</returns>
+    public IDeepCloneable GetClone(IDeepCloneable original) {
+      IDeepCloneable clone = null;
+      mapping.TryGetValue(original, out clone);
+      return clone;
+    }
+
   }
 }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolutionImpactValuesCalculator.cs

@@ -49 +49 @@
       var replacementValue = CalculateReplacementValue(regressionModel, node, regressionProblemData, rows);
       var constantNode = new ConstantTreeNode(new Constant()) { Value = replacementValue };
+
       var cloner = new Cloner();
-      cloner.RegisterClonedObject(node, constantNode);
       var tempModel = cloner.Clone(regressionModel);
+      var tempModelNode = (ISymbolicExpressionTreeNode)cloner.GetClone(node);
+
+      var tempModelParentNode = tempModelNode.Parent;
+      int i = tempModelParentNode.IndexOfSubtree(tempModelNode);
+      tempModelParentNode.RemoveSubtree(i);
+      tempModelParentNode.InsertSubtree(i, constantNode);
 
       var estimatedValues = tempModel.GetEstimatedValues(dataset, rows);