Changeset 2158

Timestamp:

07/12/09 22:22:29 (15 years ago)

Author:

dtraxing

Message:

FixedGAMainBase: fixed type in operator name; added virtual modifier to GetOperatorsFromScope Method
FixedOperatorBase: removed general exception catching
added fixed operator for evolution strategies
(ticket #580)

Location:

trunk/sources/HeuristicLab.FixedOperators/3.2

Files:

• FixedESMain.cs (added)
• FixedGAMainBase.cs (modified) (2 diffs)
• FixedOperatorBase.cs (modified) (1 diff)
• FixedSAMain.cs (modified) (1 diff)
• HeuristicLab.FixedOperators-3.2.csproj (modified) (2 diffs)

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

@@ -84 +84 @@
       sb = new StochasticBranch();
       sb.GetVariableInfo("Probability").ActualName = "MutationRate";
-      Name = "FixeGAMain";
+      Name = "FixedGAMain";
     } // FixedGABase
 
@@ -163 +163 @@
     /// </summary>
     /// <param name="scope"></param>
-    protected void GetOperatorsFromScope(IScope scope) {
+    protected virtual void GetOperatorsFromScope(IScope scope) {
       selector = (OperatorBase)GetVariableValue("Selector", scope, true);
       crossover = (OperatorBase)GetVariableValue("Crossover", scope, true);

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

@@ -120 +120 @@
           AtomicOperation atomicOperation = (AtomicOperation)operation;
           IOperation next = null;
-          try {
+          //try {
             currentOperator = atomicOperation.Operator;
             next = currentOperator.Execute(atomicOperation.Scope);
-          }
-          catch (Exception ex) {
-            throw new InvalidOperationException("Invalid Operation occured in FixedBase.Execute " + ex.InnerException);
-          }
+          //}
+          //catch (Exception ex) {
+          //  throw new InvalidOperationException("Invalid Operation occured in FixedBase.Execute " + ex.InnerException);
+          //}
           if (next != null)
             executionStack.Push(next);

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

@@ -195 +195 @@
             break;
         } // for nrOfGenerations
-      
+
       } // try
       catch (CancelException) {
         return new AtomicOperation(this, scope);
       }
+      catch (Exception ex) {
+        System.Diagnostics.StackTrace trace = new System.Diagnostics.StackTrace(ex, false);
+
+        foreach (var sf in trace.GetFrames()) {
+          Console.WriteLine(sf.GetMethod().Name);
+          Console.WriteLine("Line: " + sf.GetFileLineNumber());
+          Console.WriteLine("Column: " + sf.GetFileColumnNumber());
+        }
+      }
       return null;
     } // Apply

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

@@ -100 +100 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="FixedESMain.cs" />
     <Compile Include="FixedGAMainBase.cs" />
     <Compile Include="FixedOperatorBase.cs" />
@@ -157 +158 @@
       <Project>{F473D9AF-3F09-4296-9F28-3C65118DAFFA}</Project>
       <Name>HeuristicLab.Data-3.2</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.ES\3.2\HeuristicLab.ES-3.2.csproj">
+      <Project>{2E6112A7-3A94-406D-A28C-38AC2D324DCA}</Project>
+      <Name>HeuristicLab.ES-3.2</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Evolutionary\3.2\HeuristicLab.Evolutionary-3.2.csproj">