Changeset 12547 for branches/DataAnalysis.ComplexityAnalyzer/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisModelComplexityAnalyzer.cs
- Timestamp:
- 06/30/15 12:32:08 (9 years ago)
- Location:
- branches/DataAnalysis.ComplexityAnalyzer/HeuristicLab.Problems.DataAnalysis.Symbolic
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DataAnalysis.ComplexityAnalyzer/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
-
branches/DataAnalysis.ComplexityAnalyzer/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisModelComplexityAnalyzer.cs
r12187 r12547 53 53 for (int i = 0; i < node.SubtreeCount; i++) { 54 54 var nodeComplexity = CalculateComplexity(node.GetSubtree(i)); 55 complexity *= nodeComplexity > 2 ? nodeComplexity : 2;55 complexity *= nodeComplexity + 1; 56 56 } 57 57 return complexity; … … 61 61 for (int i = 0; i < node.SubtreeCount; i++) { 62 62 var nodeComplexity = CalculateComplexity(node.GetSubtree(i)); 63 complexity *= nodeComplexity > 2 ? nodeComplexity : 2;63 complexity *= nodeComplexity +1; 64 64 } 65 65 return complexity; … … 75 75 case OpCodes.Tan: { 76 76 double complexity = CalculateComplexity(node.GetSubtree(0)); 77 return Math.Pow(2.0, complexity); ;77 return Math.Pow(2.0, complexity); 78 78 } 79 79 case OpCodes.Exp: {
Note: See TracChangeset
for help on using the changeset viewer.