Changeset 10750 for branches/DataAnalysis.ComplexityAnalyzer/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolution.cs

Timestamp:

04/15/14 13:18:14 (10 years ago)

Author:

mkommend

Message:

#2175: Branched DataAnalysis.Symbolic.Regression with local changes.

Location:

branches/DataAnalysis.ComplexityAnalyzer/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression

Files:

• . (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression)
• 3.4/SymbolicRegressionSolution.cs (modified) (4 diffs)

branches/DataAnalysis.ComplexityAnalyzer/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolution.cs

@@ -63 +63 @@
     }
 
+    public double ModelComplexity {
+      get { return ((DoubleValue)this["Complexity"].Value).Value; }
+      private set { ((DoubleValue)this["Complexity"].Value).Value = value; }
+    }
+
     private ResultCollection EstimationLimitsResultCollection {
       get { return (ResultCollection)this[EstimationLimitsResultsResultName].Value; }
@@ -114 +119 @@
       estimationLimitResults.Add(new Result(TestNaNEvaluationsResultName, "", new IntValue()));
       Add(new Result(EstimationLimitsResultsResultName, "Results concerning the estimation limits of symbolic regression solution", estimationLimitResults));
-
+      Add(new Result("Complexity", "", new DoubleValue()));
       RecalculateResults();
     }
@@ -124 +129 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
+      if (!ContainsKey("Complexity")) Add(new Result("Complexity", "", new DoubleValue()));
       if (!ContainsKey(EstimationLimitsResultsResultName)) {
         ResultCollection estimationLimitResults = new ResultCollection();
@@ -146 +152 @@
       ModelLength = Model.SymbolicExpressionTree.Length;
       ModelDepth = Model.SymbolicExpressionTree.Depth;
+      ModelComplexity = SymbolicDataAnalysisModelComplexityAnalyzer.CalculateComplexity(Model.SymbolicExpressionTree.Root.GetSubtree(0).GetSubtree(0));
 
       EstimationLimits.Lower = Model.LowerEstimationLimit;