Changeset 2447 for trunk/sources

Timestamp:

10/27/09 09:47:03 (15 years ago)

Author:

gkronber

Message:

Added until test project for HeuristicLab.GP plugins. #791 (Tests for GP operators and structure identification evaluators)

Location:

trunk/sources

Files:

• HeuristicLab.GP.Operators/3.3/Initialization/ProbabilisticTreeCreator.cs (modified) (2 diffs)
• HeuristicLab.GP.Tests (added)
• HeuristicLab.GP.Tests/HL3TreeEvaluatorTest.cs (added)
• HeuristicLab.GP.Tests/HeuristicLab.GP.Tests.csproj (added)
• HeuristicLab.GP.Tests/ProbabilisticTreeCreatorTest.cs (added)
• HeuristicLab.GP.Tests/Properties (added)
• HeuristicLab.GP.Tests/Properties/AssemblyInfo.cs (added)
• HeuristicLab.GP.Tests/SymbolicExpressionImporter.cs (added)
• HeuristicLab.GP.Tests/Token.cs (added)
• HeuristicLab.GP.Tests/Util.cs (added)
• HeuristicLab.sln (modified) (4 diffs)

trunk/sources/HeuristicLab.GP.Operators/3.3/Initialization/ProbabilisticTreeCreator.cs

@@ -27 +27 @@
 namespace HeuristicLab.GP.Operators {
   public class ProbabilisticTreeCreator : OperatorBase {
-    private int MAX_TRIES { get { return 100; } }
+    private static int MAX_TRIES { get { return 100; } }
 
     public override string Description {
@@ -50 +50 @@
       int maxTreeHeight = GetVariableValue<IntData>("MaxTreeHeight", scope, true).Data;
 
-      int treeSize = random.Next(minTreeSize, maxTreeSize + 1);
-      IFunctionTree root;
-      int tries = 0;
-      TreeGardener gardener = new TreeGardener(random, funLibrary);
-      do {
-        root = gardener.PTC2(treeSize, maxTreeHeight);
-        if (tries++ >= MAX_TRIES) {
-          // try a different size
-          treeSize = random.Next(minTreeSize, maxTreeSize + 1);
-          tries = 0;
-        }
-      } while (root.GetSize() > maxTreeSize || root.GetHeight() > maxTreeHeight);
-
+      IFunctionTree root = Create(random, funLibrary, minTreeSize, maxTreeSize, maxTreeHeight);
       scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("FunctionTree"), new GeneticProgrammingModel(root)));
       return Util.CreateInitializationOperation(TreeGardener.GetAllSubTrees(root), scope);
     }
 
- }
+
+    public static IFunctionTree Create(IRandom random, FunctionLibrary funLib, int minSize, int maxSize, int maxHeight) {
+      int treeSize = random.Next(minSize, maxSize + 1);
+      IFunctionTree root;
+      int tries = 0;
+      TreeGardener gardener = new TreeGardener(random, funLib);
+      do {
+        root = gardener.PTC2(treeSize, maxHeight);
+        if (tries++ >= MAX_TRIES) {
+          // try a different size
+          treeSize = random.Next(minSize, maxSize + 1);
+          tries = 0;
+        }
+      } while (root.GetSize() > maxHeight || root.GetHeight() > maxHeight);
+      return root;
+    }
+  }
 }

trunk/sources/HeuristicLab.sln

@@ -252 +252 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ALGLIB", "ALGLIB\ALGLIB.csproj", "{44456535-5DB5-454A-BE2B-7426DA6700B6}"
 EndProject
-Global
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.GP.Tests", "HeuristicLab.GP.Tests\HeuristicLab.GP.Tests.csproj", "{6EDEE199-61FC-48E1-AEDA-AF1C2E722063}"EndProjectGlobal
   GlobalSection(SolutionConfigurationPlatforms) = preSolution
     CEDMA Debug|Any CPU = CEDMA Debug|Any CPU
@@ -4013 +4013 @@
     {44456535-5DB5-454A-BE2B-7426DA6700B6}.Modeling Debug|Any CPU.Build.0 = Debug|Any CPU
     {44456535-5DB5-454A-BE2B-7426DA6700B6}.Modeling Debug|x64.ActiveCfg = Debug|Any CPU
-    {44456535-5DB5-454A-BE2B-7426DA6700B6}.Modeling Debug|x86.ActiveCfg = Debug|Any CPU
-    {44456535-5DB5-454A-BE2B-7426DA6700B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {44456535-5DB5-454A-BE2B-7426DA6700B6}.Modeling Debug|x86.ActiveCfg = Debug|x86
+    {44456535-5DB5-454A-BE2B-7426DA6700B6}.Modeling Debug|x86.Build.0 = Debug|x86   {44456535-5DB5-454A-BE2B-7426DA6700B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {44456535-5DB5-454A-BE2B-7426DA6700B6}.Release|Any CPU.Build.0 = Release|Any CPU
     {44456535-5DB5-454A-BE2B-7426DA6700B6}.Release|x64.ActiveCfg = Release|x64
@@ -4028 +4028 @@
     {44456535-5DB5-454A-BE2B-7426DA6700B6}.Visualization Debug|x64.ActiveCfg = Debug|Any CPU
     {44456535-5DB5-454A-BE2B-7426DA6700B6}.Visualization Debug|x86.ActiveCfg = Debug|Any CPU
-  EndGlobalSection
+    {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.CEDMA Debug|Any CPU.ActiveCfg = Debug|Any CPU    {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.CEDMA Debug|Any CPU.Build.0 = Debug|Any CPU    {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.CEDMA Debug|x64.ActiveCfg = Debug|Any CPU    {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.CEDMA Debug|x86.ActiveCfg = Debug|Any CPU    {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.Debug|Any CPU.ActiveCfg = Debug|Any CPU    {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.Debug|Any CPU.Build.0 = Debug|Any CPU    {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.Debug|x64.ActiveCfg = Debug|Any CPU    {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.Debug|x86.ActiveCfg = Debug|x86    {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.Modeling Debug|Any CPU.ActiveCfg = Debug|Any CPU   {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.Modeling Debug|Any CPU.Build.0 = Debug|Any CPU   {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.Modeling Debug|x64.ActiveCfg = Debug|Any CPU   {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.Modeling Debug|x86.ActiveCfg = Debug|x86   {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.Release|Any CPU.ActiveCfg = Release|Any CPU    {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.Release|Any CPU.Build.0 = Release|Any CPU    {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.Release|x64.ActiveCfg = Release|Any CPU    {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.Release|x86.ActiveCfg = Release|x86    {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.v3.2 Debug|Any CPU.ActiveCfg = Debug|Any CPU   {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.v3.2 Debug|Any CPU.Build.0 = Debug|Any CPU   {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.v3.2 Debug|x64.ActiveCfg = Debug|Any CPU   {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.v3.2 Debug|x86.ActiveCfg = Debug|Any CPU   {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.Visualization Debug|Any CPU.ActiveCfg = Debug|Any CPU    {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.Visualization Debug|Any CPU.Build.0 = Debug|Any CPU    {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.Visualization Debug|x64.ActiveCfg = Debug|Any CPU    {6EDEE199-61FC-48E1-AEDA-AF1C2E722063}.Visualization Debug|x86.ActiveCfg = Debug|Any CPU  EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution
     HideSolutionNode = FALSE
@@ -4122 +4122 @@
     {589BECAE-69B0-4EB1-8C06-C073531762B7} = {410732DB-725A-4824-896B-C298978343C0}
     {44456535-5DB5-454A-BE2B-7426DA6700B6} = {410732DB-725A-4824-896B-C298978343C0}
-    {A9E282EA-180F-4233-B809-AEDF0787545C} = {78982D7C-D63D-4A3D-AE1F-F58AC007603B}
+    {6EDEE199-61FC-48E1-AEDA-AF1C2E722063} = {410732DB-725A-4824-896B-C298978343C0}   {A9E282EA-180F-4233-B809-AEDF0787545C} = {78982D7C-D63D-4A3D-AE1F-F58AC007603B}
     {BF7D9494-A586-457B-8DF9-ED599F9E6A71} = {78982D7C-D63D-4A3D-AE1F-F58AC007603B}
     {C36BD924-A541-4A00-AFA8-41701378DDC5} = {78982D7C-D63D-4A3D-AE1F-F58AC007603B}