Changeset 14251 for branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators

Timestamp:

08/10/16 20:10:25 (8 years ago)

Author:

gkronber

Message:

#2650:

• extended non-linear regression to work with factors
• fixed bugs in constants optimizer and tree interpreter
• improved simplification of factor variables
• added support for factors to ERC view
• added support for factors to solution comparison view
• activated view for all factors

File:

• branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionConstantOptimizationEvaluator.cs (modified) (4 diffs)

branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionConstantOptimizationEvaluator.cs

@@ -194 +194 @@
         terminalNodes = tree.Root.IterateNodesPrefix().OfType<SymbolicExpressionTreeTerminalNode>().ToList();
       else
-        terminalNodes = new List<SymbolicExpressionTreeTerminalNode>(tree.Root.IterateNodesPrefix().OfType<ConstantTreeNode>());
+        terminalNodes = new List<SymbolicExpressionTreeTerminalNode>
+          (tree.Root.IterateNodesPrefix()
+          .OfType<SymbolicExpressionTreeTerminalNode>()
+          .Where(node => node is ConstantTreeNode || node is FactorVariableTreeNode));
 
       //extract inital constants
@@ -214 +217 @@
             c[i++] = binFactorVarTreeNode.Weight;
           else if (factorVarTreeNode != null) {
+            // gkronber: a factorVariableTreeNode holds a category-specific constant therefore we can consider factors to be the same as constants
             foreach (var w in factorVarTreeNode.Weights) c[i++] = w;
           }
@@ -252 +256 @@
         alglib.lsfitfit(state, function_cx_1_func, function_cx_1_grad, null, null);
         alglib.lsfitresults(state, out info, out c, out rep);
-      } catch (ArithmeticException) {
+      }
+      catch (ArithmeticException) {
         return originalQuality;
-      } catch (alglib.alglibexception) {
+      }
+      catch (alglib.alglibexception) {
         return originalQuality;
       }
@@ -284 +290 @@
           binFactorVarTreeNode.Weight = constants[i++];
         else if (factorVarTreeNode != null) {
-          foreach (var w in factorVarTreeNode.Weights) constants[i++] = w;
+          for (int j = 0; j < factorVarTreeNode.Weights.Length; j++)
+            factorVarTreeNode.Weights[j] = constants[i++];
         }
       }