Changeset 3926 for trunk/sources

Timestamp:

06/17/10 14:43:04 (14 years ago)

Author:

mkommend

Message:

removed ScaledSymbolicExpressionTree from the scopes in the ValidationBestScaledSymbolicReressionSolutionAnalyzer and
made SymbolicExpressionTree to work without a root node (ticket #938)

Location:

trunk/sources

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTree.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Analyzers/ValidationBestScaledSymbolicRegressionSolutionAnalyzer.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTree.cs

@@ -53 +53 @@
     public int Size {
       get {
+        if (root == null)
+          return 0;
         return root.GetSize();
       }
@@ -59 +61 @@
     public int Height {
       get {
+        if (root == null)
+          return 0;
         return root.GetHeight();
       }
@@ -73 +77 @@
 
     public IEnumerable<SymbolicExpressionTreeNode> IterateNodesPrefix() {
+      if (root == null)
+        return new SymbolicExpressionTreeNode[0];
       return root.IterateNodesPrefix();
     }
     public IEnumerable<SymbolicExpressionTreeNode> IterateNodesPostfix() {
+      if (root == null)
+        return new SymbolicExpressionTreeNode[0];
       return root.IterateNodesPostfix();
     }
@@ -82 +90 @@
       SymbolicExpressionTree clone = new SymbolicExpressionTree();
       cloner.RegisterClonedObject(this, clone);
-      clone.root = (SymbolicExpressionTreeNode)this.root.Clone();
+      if (root != null)
+        clone.root = (SymbolicExpressionTreeNode)this.root.Clone();
       return clone;
     }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Analyzers/ValidationBestScaledSymbolicRegressionSolutionAnalyzer.cs

@@ -117 +117 @@
 
     [Storable]
+    private UniformSubScopesProcessor subScopesProcessor;
+    [Storable]
+    private SymbolicRegressionSolutionLinearScaler linearScaler;
+    [Storable]
+    private SymbolicRegressionModelQualityAnalyzer modelQualityAnalyzer;
+    [Storable]
+    private SymbolicRegressionMeanSquaredErrorEvaluator validationMseEvaluator;
+    [Storable]
     private BestSymbolicRegressionSolutionAnalyzer bestSolutionAnalyzer;
     [Storable]
-    private UniformSubScopesProcessor subScopesProcessor;
+    private UniformSubScopesProcessor cleaningSubScopesProcessor;
+    [Storable]
+    private Assigner removeScaledExpressionTreeAssigner;
+    [Storable]
+    private BestQualityMemorizer bestKnownQualityMemorizer;
     [Storable]
     private BestAverageWorstQualityCalculator bestAvgWorstValidationQualityCalculator;
     [Storable]
-    private BestQualityMemorizer bestKnownQualityMemorizer;
-    [Storable]
-    private SymbolicRegressionModelQualityAnalyzer modelQualityAnalyzer;
+    private DataTableValuesCollector validationValuesCollector;
+    [Storable]
+    private ResultsCollector resultsCollector;
 
     public ValidationBestScaledSymbolicRegressionSolutionAnalyzer()
@@ -148 +160 @@
       #region operator initialization
       subScopesProcessor = new UniformSubScopesProcessor();
-      SymbolicRegressionSolutionLinearScaler linearScaler = new SymbolicRegressionSolutionLinearScaler();
+      linearScaler = new SymbolicRegressionSolutionLinearScaler();
       modelQualityAnalyzer = new SymbolicRegressionModelQualityAnalyzer();
-      SymbolicRegressionMeanSquaredErrorEvaluator validationMseEvaluator = new SymbolicRegressionMeanSquaredErrorEvaluator();
+      validationMseEvaluator = new SymbolicRegressionMeanSquaredErrorEvaluator();
       bestSolutionAnalyzer = new BestSymbolicRegressionSolutionAnalyzer();
+      cleaningSubScopesProcessor = new UniformSubScopesProcessor();
+      removeScaledExpressionTreeAssigner = new Assigner();
       bestKnownQualityMemorizer = new BestQualityMemorizer();
       bestAvgWorstValidationQualityCalculator = new BestAverageWorstQualityCalculator();
-      DataTableValuesCollector validationValuesCollector = new DataTableValuesCollector();
-      ResultsCollector resultsCollector = new ResultsCollector();
+      validationValuesCollector = new DataTableValuesCollector();
+      resultsCollector = new ResultsCollector();
       #endregion
 
@@ -197 +211 @@
       bestSolutionAnalyzer.UpperEstimationLimitParameter.ActualName = UpperEstimationLimitParameter.Name;
 
+      cleaningSubScopesProcessor.Depth.Value = SymbolicExpressionTreeParameter.Depth;
+
+      removeScaledExpressionTreeAssigner.LeftSideParameter.ActualName = ScaledSymbolicExpressionTreeParameterName;
+      removeScaledExpressionTreeAssigner.RightSideParameter.Value = new SymbolicExpressionTree();
+
       bestAvgWorstValidationQualityCalculator.AverageQualityParameter.ActualName = "Current average validation quality";
       bestAvgWorstValidationQualityCalculator.BestQualityParameter.ActualName = CurrentBestValidationQualityParameterName;
@@ -226 +245 @@
       subScopesProcessor.Successor = modelQualityAnalyzer;
       modelQualityAnalyzer.Successor = bestSolutionAnalyzer;
-      bestSolutionAnalyzer.Successor = bestAvgWorstValidationQualityCalculator;
+      bestSolutionAnalyzer.Successor = cleaningSubScopesProcessor;
+      cleaningSubScopesProcessor.Operator = removeScaledExpressionTreeAssigner;
+      cleaningSubScopesProcessor.Successor = bestAvgWorstValidationQualityCalculator;
       bestAvgWorstValidationQualityCalculator.Successor = bestKnownQualityMemorizer;
       bestKnownQualityMemorizer.Successor = validationValuesCollector;
@@ -252 +273 @@
     private void SymbolicExpressionTreeParameter_DepthChanged(object sender, EventArgs e) {
       subScopesProcessor.Depth.Value = SymbolicExpressionTreeParameter.Depth;
+      cleaningSubScopesProcessor.Depth.Value = SymbolicExpressionTreeParameter.Depth;
       bestSolutionAnalyzer.SymbolicExpressionTreeParameter.Depth = SymbolicExpressionTreeParameter.Depth;
       bestSolutionAnalyzer.QualityParameter.Depth = SymbolicExpressionTreeParameter.Depth;