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

Timestamp:

11/17/15 15:57:52 (8 years ago)

Author:

mkommend

Message:

#2175: Removed unused features from complexity analysis.

File:

• branches/DataAnalysis.ComplexityAnalyzer/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolution.cs (modified) (4 diffs)

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

@@ -64 +64 @@
     }
 
-    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; }
@@ -123 +118 @@
       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();
     }
@@ -133 +127 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      if (!ContainsKey("Complexity")) Add(new Result("Complexity", "", new DoubleValue()));
       if (!ContainsKey(EstimationLimitsResultsResultName)) {
         ResultCollection estimationLimitResults = new ResultCollection();
@@ -156 +149 @@
       ModelLength = Model.SymbolicExpressionTree.Length;
       ModelDepth = Model.SymbolicExpressionTree.Depth;
-      ModelComplexity = SymbolicDataAnalysisModelComplexityAnalyzer.CalculateComplexity(Model.SymbolicExpressionTree.Root.GetSubtree(0).GetSubtree(0));
 
       EstimationLimits.Lower = Model.LowerEstimationLimit;