Changeset 11861 for branches/DataAnalysis.ComplexityAnalyzer/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers

Timestamp:

02/02/15 16:14:45 (10 years ago)

Author:

mkommend

Message:

#2175: Merged trunk changes.

Location:

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

Files:

• SymbolicDataAnalysisModelComplexityAnalyzer.cs (modified) (2 diffs)
• SymbolicDataAnalysisSingleObjectiveValidationAnalyzer.cs (modified) (2 diffs)

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

@@ -52 +52 @@
             double complexity = 1;
             for (int i = 0; i < node.SubtreeCount; i++) {
-              complexity *= CalculateComplexity(node.GetSubtree(i));
+              var nodeComplexity = CalculateComplexity(node.GetSubtree(i));
+              complexity *=  nodeComplexity > 2 ? nodeComplexity : 2;
+              
             }
             return complexity == 1 ? node.SubtreeCount : complexity;
@@ -59 +61 @@
             double complexity = 1;
             for (int i = 0; i < node.SubtreeCount; i++) {
-              complexity *= CalculateComplexity(node.GetSubtree(i));
+              var nodeComplexity = CalculateComplexity(node.GetSubtree(i));
+              complexity *= nodeComplexity > 2 ? nodeComplexity : 2;
             }
-            return complexity;
+            return complexity == 1 ? node.SubtreeCount : complexity;
           }
         case OpCodes.Sin: {
             double complexity = CalculateComplexity(node.GetSubtree(0));
-            return complexity * 10;
+            return Math.Exp(complexity);
           }
         case OpCodes.Cos: {
             double complexity = CalculateComplexity(node.GetSubtree(0));
-            return complexity * 10;
+            return Math.Exp(complexity);
           }
         case OpCodes.Tan: {
             double complexity = CalculateComplexity(node.GetSubtree(0));
-            return complexity * 10;
+            return Math.Exp(complexity);
           }
         case OpCodes.Exp: {
             double complexity = CalculateComplexity(node.GetSubtree(0));
-            return complexity * 10;
-          }
+          return Math.Exp(complexity);
+        }
         case OpCodes.Log: {
             double complexity = CalculateComplexity(node.GetSubtree(0));
-            return complexity * 10;
+            return Math.Exp(complexity);
           }
         case OpCodes.Square: {
             double complexity = CalculateComplexity(node.GetSubtree(0));
-            return 2 * complexity;
+            return complexity * complexity;
           }
         case OpCodes.SquareRoot: {
             double complexity = CalculateComplexity(node.GetSubtree(0));
-            return 10 * complexity;
+            return complexity * complexity * complexity;
           }
         case OpCodes.Power: {

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

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -36 +37 @@
   [StorableClass]
   public abstract class SymbolicDataAnalysisSingleObjectiveValidationAnalyzer<T, U> : SymbolicDataAnalysisSingleObjectiveAnalyzer,
-    ISymbolicDataAnalysisValidationAnalyzer<T, U>
+    ISymbolicDataAnalysisValidationAnalyzer<T, U>, IStochasticOperator
     where T : class, ISymbolicDataAnalysisSingleObjectiveEvaluator<U>
     where U : class, IDataAnalysisProblemData {