Changeset 2151 for trunk

Timestamp:

07/09/09 01:06:32 (15 years ago)

Author:

dtraxing

Message:

FixedOperatorBase: added better exception text
FixedSGAMain: removed explicit constructor call, because it also works implicit
FixedSAMain: initial commit; simulated annealing with fixed operators
(ticket #580)

Location:

trunk/sources/HeuristicLab.FixedOperators/3.2

Files:

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

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

@@ -125 +125 @@
           }
           catch (Exception ex) {
-            throw new InvalidOperationException("Invalid Operation occured in FixedBase.Execute");
+            throw new InvalidOperationException("Invalid Operation occured in FixedBase.Execute " + ex.InnerException);
           }
           if (next != null)

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

@@ -321 +321 @@
     }
     //long[] timesExecuteCreateChildren;
-    public FixedSGAMain()
-      : base() {
+    public FixedSGAMain() {
       Name = "FixedSGAMain";
     }
@@ -401 +400 @@
       } // try
       catch (CancelException) {
-        //Console.WriteLine("Micro engine aborted by cancel flag.");
         return new AtomicOperation(this, scope);
-      }
-      catch (Exception ex) {
-        ex.ToString();
       }
 

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

@@ -103 +103 @@
     <Compile Include="FixedOperatorBase.cs" />
     <Compile Include="FixedOSGAMain.cs" />
+    <Compile Include="FixedSAMain.cs" />
     <Compile Include="FixedSGAMain.cs" />
     <Compile Include="HeuristicLabFixedOperatorsPlugin.cs" />
@@ -188 +189 @@
       <Project>{9EF75B49-D507-44E0-BC5D-C200FDA53B9B}</Project>
       <Name>HeuristicLab.Routing.TSP-3.2</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.SA\3.2\HeuristicLab.SA-3.2.csproj">
+      <Project>{F0F97CBA-61A2-471C-9973-F099202B3BE5}</Project>
+      <Name>HeuristicLab.SA-3.2</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Selection.OffspringSelection\3.2\HeuristicLab.Selection.OffspringSelection-3.2.csproj">