Changeset 16500 for branches/2974_Constants_Optimization/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Constants Optimization

Timestamp:

01/04/19 17:37:13 (6 years ago)

Author:

mkommend

Message:

#2974: Added intermediate version of new constants optimization for profiling.

Location:

branches/2974_Constants_Optimization

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Constants Optimization/IConstantsOptimizer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Constants Optimization/LMConstantsOptimizer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Constants Optimization/Util.cs (modified) (5 diffs)

branches/2974_Constants_Optimization

@@ -1 +1 @@
 packages
+TestResults

@@ -1 +1 @@
 packages
+TestResults

branches/2974_Constants_Optimization/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Constants Optimization/Util.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using static HeuristicLab.Problems.DataAnalysis.Symbolic.TreeToAutoDiffTermConverter;
@@ -48 +49 @@
     }
 
-    public static Dictionary<DataForVariable, AutoDiff.Variable> ExtractParameters(IDataset dataset) {
-      var parameters = new Dictionary<DataForVariable, AutoDiff.Variable>();
+    public static List<DataForVariable> GenerateVariables(IDataset dataset) {
+      var variables = new List<DataForVariable>();
       foreach (var doubleVariable in dataset.DoubleVariables) {
         var data = new DataForVariable(doubleVariable, string.Empty, 0);
-        var param = new AutoDiff.Variable();
-        parameters.Add(data, param);
+        variables.Add(data);
       }
 
@@ -59 +59 @@
         foreach (var stringValue in dataset.GetStringValues(stringVariable).Distinct()) {
           var data = new DataForVariable(stringVariable, stringValue, 0);
-          var param = new AutoDiff.Variable();
-          parameters.Add(data, param);
+          variables.Add(data);
         }
       }
-      return parameters;
+      return variables;
+    }
+
+    public static List<DataForVariable> ExtractLaggedVariables(ISymbolicExpressionTree tree) {
+      var variables = new HashSet<DataForVariable>();
+      foreach (var laggedNode in tree.IterateNodesPrefix().OfType<ILaggedTreeNode>()) {
+        var laggedVariableTreeNode = laggedNode as LaggedVariableTreeNode;
+        if (laggedVariableTreeNode != null) {
+          var data = new DataForVariable(laggedVariableTreeNode.VariableName, string.Empty, laggedVariableTreeNode.Lag);
+          if (!variables.Contains(data)) variables.Add(data);
+        }
+      }
+      return variables.ToList();
     }
 
@@ -79 +90 @@
           for (int j = 0; j < factorVarTreeNode.Weights.Length; j++)
             constants.Add(factorVarTreeNode.Weights[j]);
-        }        
+        } else throw new NotSupportedException(string.Format("Terminal nodes of type {0} are not supported.", node.GetType().GetPrettyName()));
       }
       return constants.ToArray();
@@ -97 +108 @@
           for (int j = 0; j < factorVarTreeNode.Weights.Length; j++)
             factorVarTreeNode.Weights[j] = constants[i++];
-        }
+        } else throw new NotSupportedException(string.Format("Terminal nodes of type {0} are not supported.", node.GetType().GetPrettyName()));
       }
     }

@@ -1 +1 @@
 packages
+TestResults