Changeset 2568 for trunk

Timestamp:

12/21/09 17:11:48 (15 years ago)

Author:

gkronber

Message:

Implemented #821 (Additional model meta data field that stores number of different function symbols that appear in a symbolic regression model)

Location:

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3

Files:

• DefaultStructureIdentificationOperators.cs (modified) (3 diffs)
• Evaluators/TreeComplexityEvaluator.cs (added)
• HeuristicLab.GP.StructureIdentification-3.3.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/DefaultStructureIdentificationOperators.cs

@@ -28 +28 @@
 using HeuristicLab.Selection;
 using HeuristicLab.Data;
+using System.Collections.Generic;
+using System;
 
 namespace HeuristicLab.GP.StructureIdentification {
@@ -177 +179 @@
       model.SetMetaData("TreeSize", gpModel.Size);
       model.SetMetaData("TreeHeight", gpModel.Height);
+      double treeComplexity = TreeComplexityEvaluator.Calculate(gpModel.FunctionTree);
+      model.SetMetaData("TreeComplexity", treeComplexity);
+      model.SetMetaData("AverageNodeComplexity", treeComplexity / gpModel.Size);
       #region variable impacts
       ItemList qualityImpacts = bestModelScope.GetVariableValue<ItemList>(ModelingResult.VariableQualityImpact.ToString(), false);
@@ -195 +200 @@
 
     }
+
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/HeuristicLab.GP.StructureIdentification-3.3.csproj

@@ -85 +85 @@
     <Compile Include="BaseClasses\FunctionTreeBase.cs" />
     <Compile Include="BaseClasses\TreeEvaluatorBase.cs" />
+    <Compile Include="Evaluators\TreeComplexityEvaluator.cs" />
     <Compile Include="FunctionLibraryInjectors\ArithmeticFunctionLibraryInjector.cs" />
     <Compile Include="FunctionLibraryInjectors\SymbolicRegressionFunctionLibraryInjectorAttribute.cs" />