Changeset 13220 for branches/DataAnalysis.ComplexityAnalyzer/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisModelComplexityCalculator.cs

Timestamp:

11/17/15 15:45:55 (8 years ago)

Author:

mkommend

Message:

#2175: Improve source code and usability of complexity calculator.

File:

• branches/DataAnalysis.ComplexityAnalyzer/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisModelComplexityCalculator.cs (moved) (moved from branches/DataAnalysis.ComplexityAnalyzer/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisModelComplexityAnalyzer.cs) (2 diffs)

branches/DataAnalysis.ComplexityAnalyzer/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisModelComplexityCalculator.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
-  public class SymbolicDataAnalysisModelComplexityAnalyzer {
-    public static double CalculateComplexity(ISymbolicExpressionTreeNode node) {
+  public static class SymbolicDataAnalysisModelComplexityCalculator {
+    public static double CalculateComplexity(ISymbolicExpressionTree tree) {
+      return CalculateComplexity(tree.Root);
+    }
+    public static double CalculateComplexity(ISymbolicExpressionTreeNode treeNode) {
+      var node = treeNode;
+      if (node.Symbol is ProgramRootSymbol) node = node.GetSubtree(0);
+      if (node.Symbol is StartSymbol) node = node.GetSubtree(0);
+
       switch (OpCodes.MapSymbolToOpCode(node)) {
         case OpCodes.Constant: {
@@ -61 +68 @@
             for (int i = 0; i < node.SubtreeCount; i++) {
               var nodeComplexity = CalculateComplexity(node.GetSubtree(i));
-              complexity *= nodeComplexity +1;
+              complexity *= nodeComplexity + 1;
             }
             return complexity;