Changeset 2076 for trunk/sources/HeuristicLab.FixedOperators

Timestamp:

06/22/09 12:43:44 (16 years ago)

Author:

dtraxing

Message:

added fixed operator for OSGA and deleted some unused old source files (ticket #580).
OSGA operator is under construction.

Location:

trunk/sources/HeuristicLab.FixedOperators/3.2

Files:

• Copy of FixedOperatorBase.cs (deleted)
• Copy of FixedSGAMain.cs (deleted)
• CreateChildren.cs (deleted)
• CreateChildrenHardWired.cs (deleted)
• CreateReplacement.cs (deleted)
• FixedAllSGAMain.cs (deleted)
• FixedOSGA.cs (added)
• FixedSGAMain.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.FixedOperators/3.2/FixedSGAMain.cs

@@ -44 +44 @@
 
     // Shared
-    Sorter sorter;
+    protected Sorter sorter;
 
     // CreateChildren
-    Counter counter;
-    IRandom random;
-    DoubleData probability;
-    ChildrenInitializer ci;
-    OperatorBase crossover;
-    OperatorBase mutator;
-    OperatorBase evaluator;
-    SubScopesRemover sr;
-    StochasticBranch sb;
-
-    OperatorBase selector;
+    protected Counter counter;
+    protected IRandom random;
+    protected DoubleData probability;
+    protected ChildrenInitializer ci;
+    protected OperatorBase crossover;
+    protected OperatorBase mutator;
+    protected OperatorBase evaluator;
+    protected SubScopesRemover sr;
+    protected StochasticBranch sb;
+
+    protected OperatorBase selector;
 
     // CreateReplacement
-    LeftSelector ls;
-    RightReducer rr;
-    RightSelector rs;
-    LeftReducer lr;
-    MergingReducer mr;
-
-    Thread executionThread;
-    Thread cancelThread;
-    
-    // for testing only
-    QualityLogger ql;
-    BestAverageWorstQualityCalculator bawqc;
-    DataCollector dc;
-    ItemList<StringData> names;
-    LinechartInjector lci;
+    protected LeftSelector ls;
+    protected RightReducer rr;
+    protected RightSelector rs;
+    protected LeftReducer lr;
+    protected MergingReducer mr;
 
     //long[] timesExecuteCreateChildren;
@@ -107 +97 @@
     }
 
-    protected void InitCreateChildren() {
+    private void InitCreateChildren() {
       // variables for create children
       ci = new ChildrenInitializer();
@@ -146 +136 @@
       IntData maxGenerations = GetVariableValue<IntData>("MaximumGenerations", scope, true);
       IntData nrOfGenerations = GetVariableValue<IntData>("Generations", scope, true);
-    
+
       IntData subscopeNr;
       try {
@@ -157 +147 @@
 
       ci = new ChildrenInitializer();
-      
+
 
       GetOperatorsFromScope(scope);
@@ -241 +231 @@
     /// </summary>
     /// <param name="scope"></param>
-    private void GetOperatorsFromScope(IScope scope) {
+    protected void GetOperatorsFromScope(IScope scope) {
       selector = (OperatorBase)GetVariableValue("Selector", scope, true);
       crossover = (OperatorBase)GetVariableValue("Crossover", scope, true);
@@ -272 +262 @@
     } // CreateChildren
 
-    private void DoReplacement(IScope scope) {
+    protected void DoReplacement(IScope scope) {
       //// SequentialSubScopesProcessor
       Execute(ls, scope.SubScopes[0]);