Changeset 15136

Timestamp:

07/06/17 10:47:26 (7 years ago)

Author:

gkronber

Message:

#2686: merged r14946 and r14951 from trunk to stable

File:

• stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionConstantOptimizationEvaluator.cs (modified) (3 diffs)

stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionConstantOptimizationEvaluator.cs

@@ -245 +245 @@
         foreach (var kvp in parameterEntries) {
           var info = kvp.Key;
-          int lag = info.lag;
           if (ds.VariableHasType<double>(info.variableName)) {
-            x[row, col] = ds.GetDoubleValue(info.variableName, r + lag);
+            x[row, col] = ds.GetDoubleValue(info.variableName, r + info.lag);
           } else if (ds.VariableHasType<string>(info.variableName)) {
             x[row, col] = ds.GetStringValue(info.variableName, r) == info.variableValue ? 1 : 0;
@@ -269 +268 @@
         alglib.lsfitfit(state, function_cx_1_func, function_cx_1_grad, null, null);
         alglib.lsfitresults(state, out retVal, out c, out rep);
-      } catch (ArithmeticException) {
+      }
+      catch (ArithmeticException) {
         return originalQuality;
-      } catch (alglib.alglibexception) {
+      }
+      catch (alglib.alglibexception) {
         return originalQuality;
       }
@@ -291 +292 @@
       foreach (var node in tree.Root.IterateNodesPrefix().OfType<SymbolicExpressionTreeTerminalNode>()) {
         ConstantTreeNode constantTreeNode = node as ConstantTreeNode;
-        VariableTreeNode variableTreeNode = node as VariableTreeNode;
-        BinaryFactorVariableTreeNode binFactorVarTreeNode = node as BinaryFactorVariableTreeNode;
+        VariableTreeNodeBase variableTreeNodeBase = node as VariableTreeNodeBase;
         FactorVariableTreeNode factorVarTreeNode = node as FactorVariableTreeNode;
         if (constantTreeNode != null)
           constantTreeNode.Value = constants[i++];
-        else if (updateVariableWeights && variableTreeNode != null)
-          variableTreeNode.Weight = constants[i++];
-        else if (updateVariableWeights && binFactorVarTreeNode != null)
-          binFactorVarTreeNode.Weight = constants[i++];
+        else if (updateVariableWeights && variableTreeNodeBase != null)
+          variableTreeNodeBase.Weight = constants[i++];
         else if (factorVarTreeNode != null) {
           for (int j = 0; j < factorVarTreeNode.Weights.Length; j++)