Changeset 1693

Timestamp:

04/28/09 15:41:11 (16 years ago)

Author:

dtraxing

Message:

Improved algorithm abortion support. Added support for composite operations in FixedSGAMain. (ticket #580)

Location:

trunk/sources/HeuristicLab.FixedOperators/3.2

Files:

• FixedBase.cs (added)
• FixedSGAMain.cs (modified) (5 diffs)
• HeuristicLab.FixedOperators-3.2.csproj (modified) (1 diff)

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

@@ -35 +35 @@
 
 namespace HeuristicLab.FixedOperators {
-  class FixedSGAMain : CombinedOperator {
+  class FixedSGAMain : FixedBase {
     public override string Description {
       get { return @"Implements the functionality of SGAMain with fixed control structures. Operators like selection, crossover, mutation and evaluation are delegated."; }
@@ -61 +61 @@
 
 
-    long[] timesExecuteCreateChildren;
+    //long[] timesExecuteCreateChildren;
 
     public FixedSGAMain()
@@ -68 +68 @@
       AddVariableInfo(new VariableInfo("MaximumGenerations", "Maximum number of generations to create", typeof(IntData), VariableKind.In));
       AddVariableInfo(new VariableInfo("Generations", "Number of processed generations", typeof(IntData), VariableKind.In | VariableKind.Out));
+      AddVariableInfo(new VariableInfo("ExecutionPointer", "Execution pointer for algorithm abortion", typeof(IntData), VariableKind.New));
+
       Name = "FixedSGAMain";
 
@@ -140 +142 @@
       IntData nrOfGenerations = GetVariableValue<IntData>("Generations", scope, true);
 
+
+      // executionpointer saves the reentry point after engine abort occurs.
+      IntData executionPointer;
+      try 
+      {
+        executionPointer = GetVariableValue<IntData>("ExecutionPointer", scope, true);
+      }
+      catch (Exception)
+      {
+        scope.AddVariable(new Variable("ExecutionPointer", new IntData(-1)));
+        executionPointer = GetVariableValue<IntData>("ExecutionPointer", scope, true);
+      }
+      
+      // fetch variables from scope for create children
       InitializeExecuteCreateChildren(scope);
-      Stopwatch watch = new Stopwatch();
-      long[] times = new long[10];
-      timesExecuteCreateChildren = new long[10];
       for (int i = nrOfGenerations.Data; i < maxGenerations.Data && !Canceled; i++) {
-        watch.Start();
-        selector.Execute(scope);
-        watch.Stop();
-        times[0] += watch.ElapsedTicks;
-        watch.Reset();
-        watch.Start();
-        ExecuteCreateChildrenWithFixedControlStructures(scope.SubScopes[1]);
-        watch.Stop();
-        times[1] += watch.ElapsedTicks;
-        watch.Reset();
-        watch.Start();
-        ExecuteCreateReplacementWithFixedConstrolStructures(scope);
-        watch.Stop();
-        times[2] += watch.ElapsedTicks;
-        watch.Reset();
-        watch.Start();
-        ql.Execute(scope);
-        watch.Stop();
-        times[3] += watch.ElapsedTicks;
-        watch.Reset();
-        watch.Start();
-        bawqc.Execute(scope);
-        watch.Stop();
-        times[4] += watch.ElapsedTicks;
-        watch.Reset();
-        watch.Start();
-        dc.Execute(scope);
-        watch.Stop();
-        times[5] += watch.ElapsedTicks;
-        watch.Reset();
-        watch.Start();
-        lci.Execute(scope);
-        watch.Stop();
-        times[6] += watch.ElapsedTicks;
-        watch.Reset();
-        watch.Start();
-        nrOfGenerations.Data++;
-      }
+        if (Canceled) {
+          executionPointer.Data = -1;
+          continue;
+        }
+        if (executionPointer.Data < 0)
+          Execute(selector, scope);
+
+        if (Canceled) {
+          executionPointer.Data = 0;
+          continue;
+        }
+        if (executionPointer.Data < 1)
+          ExecuteCreateChildrenWithFixedControlStructures(scope.SubScopes[1]);
+
+        if (Canceled) {
+          executionPointer.Data = 1;
+          continue;
+        }
+        if (executionPointer.Data < 2)
+          ExecuteCreateReplacementWithFixedConstrolStructures(scope);
+
+        if (Canceled) {
+          executionPointer.Data = 2;
+          continue;
+        }
+        if (executionPointer.Data < 3) {
+          ql.Execute(scope);
+          bawqc.Execute(scope);
+          dc.Execute(scope);
+          lci.Execute(scope);
+          nrOfGenerations.Data++;
+        }
+        executionPointer.Data = -1;
+      } // for i
+
+      //Stopwatch watch = new Stopwatch();
+      //long[] times = new long[10];
+      //timesExecuteCreateChildren = new long[10];
+      //for (int i = nrOfGenerations.Data; i < maxGenerations.Data && !Canceled; i++) {
+      //  watch.Start();
+      //  selector.Execute(scope);
+      //  watch.Stop();
+      //  times[0] += watch.ElapsedTicks;
+      //  watch.Reset();
+      //  watch.Start();
+      //  ExecuteCreateChildrenWithFixedControlStructures(scope.SubScopes[1]);
+      //  watch.Stop();
+      //  times[1] += watch.ElapsedTicks;
+      //  watch.Reset();
+      //  watch.Start();
+      //  ExecuteCreateReplacementWithFixedConstrolStructures(scope);
+      //  watch.Stop();
+      //  times[2] += watch.ElapsedTicks;
+      //  watch.Reset();
+      //  watch.Start();
+      //  ql.Execute(scope);
+      //  watch.Stop();
+      //  times[3] += watch.ElapsedTicks;
+      //  watch.Reset();
+      //  watch.Start();
+      //  bawqc.Execute(scope);
+      //  watch.Stop();
+      //  times[4] += watch.ElapsedTicks;
+      //  watch.Reset();
+      //  watch.Start();
+      //  dc.Execute(scope);
+      //  watch.Stop();
+      //  times[5] += watch.ElapsedTicks;
+      //  watch.Reset();
+      //  watch.Start();
+      //  lci.Execute(scope);
+      //  watch.Stop();
+      //  times[6] += watch.ElapsedTicks;
+      //  watch.Reset();
+      //  watch.Start();
+      //  nrOfGenerations.Data++;
+      //}
 
       swApply.Stop();
@@ -215 +267 @@
       // UniformSequentialSubScopesProcessor
       foreach (IScope s in scope.SubScopes) {
-        crossover.Execute(s);
+        Execute(crossover, s);
         // Stochastic Branch
         if (random.NextDouble() < probability.Data)
-          mutator.Execute(s);
-        evaluator.Execute(s);
+          Execute(mutator, s);
+        Execute(evaluator, s);
         sr.Execute(s);
         counter.Execute(s);

trunk/sources/HeuristicLab.FixedOperators/3.2/HeuristicLab.FixedOperators-3.2.csproj

@@ -71 +71 @@
     <Compile Include="CreateReplacement.cs" />
     <Compile Include="CreateChildrenHardWired.cs" />
+    <Compile Include="FixedBase.cs" />
     <Compile Include="FixedSGAMain.cs" />
     <Compile Include="HeuristicLabFixedOperatorsPlugin.cs" />