Changeset 11883 for branches/DataAnalysis.ComplexityAnalyzer/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Timestamp:

02/04/15 11:16:41 (10 years ago)

Author:

mkommend

Message:

#2175: Additional calculation of results for EuroCast 2015.

File:

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

branches/DataAnalysis.ComplexityAnalyzer/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisModelComplexityAnalyzer.cs

@@ -53 +53 @@
             for (int i = 0; i < node.SubtreeCount; i++) {
               var nodeComplexity = CalculateComplexity(node.GetSubtree(i));
-              complexity *=  nodeComplexity > 2 ? nodeComplexity : 2;
-              
+              complexity *= nodeComplexity > 2 ? nodeComplexity : 2;
             }
-            return complexity == 1 ? node.SubtreeCount : complexity;
+            return complexity;
           }
         case OpCodes.Div: {
@@ -64 +63 @@
               complexity *= nodeComplexity > 2 ? nodeComplexity : 2;
             }
-            return complexity == 1 ? node.SubtreeCount : complexity;
+            return complexity;
           }
         case OpCodes.Sin: {
             double complexity = CalculateComplexity(node.GetSubtree(0));
-            return Math.Exp(complexity);
+            return Math.Pow(complexity, 2.0);
           }
         case OpCodes.Cos: {
             double complexity = CalculateComplexity(node.GetSubtree(0));
-            return Math.Exp(complexity);
+            return Math.Pow(2.0, complexity);
           }
         case OpCodes.Tan: {
             double complexity = CalculateComplexity(node.GetSubtree(0));
-            return Math.Exp(complexity);
+            return Math.Pow(2.0, complexity); ;
           }
         case OpCodes.Exp: {
             double complexity = CalculateComplexity(node.GetSubtree(0));
-          return Math.Exp(complexity);
-        }
+            return Math.Pow(2.0, complexity);
+          }
         case OpCodes.Log: {
             double complexity = CalculateComplexity(node.GetSubtree(0));
-            return Math.Exp(complexity);
+            return Math.Pow(2.0, complexity);
           }
         case OpCodes.Square: {