Changeset 18132 for trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisSolutionImpactValuesCalculator.cs

Timestamp:

12/15/21 11:50:57 (3 years ago)

Author:

gkronber

Message:

#3140: merged r18091:18131 from branch to trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisSolutionImpactValuesCalculator.cs (modified) (2 diffs)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisSolutionImpactValuesCalculator.cs

@@ -59 +59 @@
         tempModelParentNode.RemoveSubtree(i);
 
-        var constantNode = new ConstantTreeNode(new Constant()) { Value = repValue };
-        tempModelParentNode.InsertSubtree(i, constantNode);
+        var numberNode = new NumberTreeNode(new Number()) { Value = repValue };
+        tempModelParentNode.InsertSubtree(i, numberNode);
 
         newQualityForImpactsCalculation = CalculateQualityForImpacts(tempModel, problemData, rows);
@@ -79 +79 @@
     protected IEnumerable<double> CalculateReplacementValues(ISymbolicExpressionTreeNode node, ISymbolicExpressionTree sourceTree, ISymbolicDataAnalysisExpressionTreeInterpreter interpreter,
       IDataset dataset, IEnumerable<int> rows) {
-      //optimization: constant nodes return always the same value
-      ConstantTreeNode constantNode = node as ConstantTreeNode;
+      var numberNode = node as INumericTreeNode;
       BinaryFactorVariableTreeNode binaryFactorNode = node as BinaryFactorVariableTreeNode;
       FactorVariableTreeNode factorNode = node as FactorVariableTreeNode;
-      if (constantNode != null) {
-        yield return constantNode.Value;
+      if (numberNode != null) {
+        yield return numberNode.Value;
       } else if (binaryFactorNode != null) {
         // valid replacements are either all off or all on