Changeset 1245 for branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/AlgorithmBase.cs

Timestamp:

03/04/09 16:12:31 (15 years ago)

Author:

gkronber

Message:

• Moved DatasetShuffler from plugin HeuristicLab.GP.StructureIdentification.Classification to plugin HeuristicLab.DataAnalysis.
• Added variants of StandardGP and OffspringSelectionGP for Classification and time-series analysis.

#224 (Simple frontend for GP for non-expert users (similar to HeurisicLab.SGA))

File:

• branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/AlgorithmBase.cs (modified) (7 diffs)

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/AlgorithmBase.cs

@@ -112 +112 @@
     }
 
-    internal virtual CombinedOperator CreateAlgorithm() {
+    protected internal virtual CombinedOperator CreateAlgorithm() {
       CombinedOperator algo = new CombinedOperator();
       algo.Name = "GP";
@@ -164 +164 @@
     }
 
-    internal abstract IOperator CreateSelector();
-
-    internal abstract IOperator CreateCrossover();
-
-    internal abstract IOperator CreateTreeCreator();
-
-    internal abstract IOperator CreateFunctionLibraryInjector();
-
-    internal virtual IOperator CreateGlobalInjector() {
+    protected internal abstract IOperator CreateSelector();
+
+    protected internal abstract IOperator CreateCrossover();
+
+    protected internal abstract IOperator CreateTreeCreator();
+
+    protected internal abstract IOperator CreateFunctionLibraryInjector();
+
+    protected internal virtual IOperator CreateGlobalInjector() {
       VariableInjector injector = new VariableInjector();
       injector.Name = "Global Injector";
@@ -190 +190 @@
     }
 
-    internal abstract IOperator CreateManipulator();
-
-    internal virtual IOperator CreateInitialization() {
+    protected internal abstract IOperator CreateManipulator();
+
+    protected internal virtual IOperator CreateInitialization() {
       CombinedOperator init = new CombinedOperator();
       init.Name = "Initialization";
@@ -231 +231 @@
     }
 
-    internal virtual IOperator CreateMainLoop() {
+    protected internal virtual IOperator CreateMainLoop() {
       CombinedOperator main = new CombinedOperator();
       SequentialProcessor seq = new SequentialProcessor();
@@ -268 +268 @@
     }
 
-    internal virtual IOperator CreateLoggingOperator() {
+    protected internal virtual IOperator CreateLoggingOperator() {
       return new EmptyOperator();
     }
 
-    internal virtual IOperator CreateLoopCondition(IOperator loop) {
+    protected internal virtual IOperator CreateLoopCondition(IOperator loop) {
       SequentialProcessor seq = new SequentialProcessor();
       seq.Name = "Loop Condition";
@@ -289 +289 @@
     }
 
-    internal virtual IOperator CreateBestSolutionProcessor() {
+    protected internal virtual IOperator CreateBestSolutionProcessor() {
       return new EmptyOperator();
     }
 
-    internal virtual IOperator CreateReplacement() {
+    protected internal virtual IOperator CreateReplacement() {
       CombinedOperator replacement = new CombinedOperator();
       replacement.Name = "Replacement";
@@ -327 +327 @@
     }
 
-    internal virtual IOperator CreateChildCreater() {
+    protected internal virtual IOperator CreateChildCreater() {
       CombinedOperator childCreater = new CombinedOperator();
       childCreater.Name = "Create children";