Changeset 2616 for trunk/sources/HeuristicLab.GP.Tests/Util.cs

Timestamp:

01/08/10 18:31:40 (15 years ago)

Author:

gkronber

Message:

Initial commit of plugin for GP based network or equation modeling. #833

File:

• trunk/sources/HeuristicLab.GP.Tests/Util.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.GP.Tests/Util.cs

@@ -172 +172 @@
     }
 
+    public static IFunctionTree[] CreateRandomTrees(MersenneTwister twister, Dataset dataset, FunctionLibrary funLib, int popSize) {
+      return CreateRandomTrees(twister, dataset, funLib, popSize, 1, 200);
+    }
+
     public static IFunctionTree[] CreateRandomTrees(MersenneTwister twister, Dataset dataset, int popSize) {
       return CreateRandomTrees(twister, dataset, popSize, 1, 200);
@@ -177 +181 @@
 
     public static IFunctionTree[] CreateRandomTrees(MersenneTwister twister, Dataset dataset, int popSize, int minSize, int maxSize) {
+      return CreateRandomTrees(twister, dataset, Util.CreateFunctionLibrary(), popSize, minSize, maxSize);
+    }
+
+    public static IFunctionTree[] CreateRandomTrees(MersenneTwister twister, Dataset dataset, FunctionLibrary funLib, int popSize, int minSize, int maxSize) {
       IFunctionTree[] randomTrees = new IFunctionTree[popSize];
-      FunctionLibrary funLib = Util.CreateFunctionLibrary();
       for (int i = 0; i < randomTrees.Length; i++) {
         randomTrees[i] = ProbabilisticTreeCreator.Create(twister, funLib, minSize, maxSize, maxSize + 1);