Changeset 3145 for trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3

Timestamp:

03/20/10 20:16:18 (14 years ago)

Author:

abeham

Message:

fixed some things in trajectory based algorithms #933

Location:

trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3

Files:

• TabuSearch.cs (modified) (1 diff)
• TabuSearchMainLoop.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearch.cs

@@ -128 +128 @@
 
     [StorableConstructor]
-    public TabuSearch(bool deserializing) : base() { }
+    private TabuSearch(bool deserializing) : base() { }
     public TabuSearch()
       : base() {

trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearchMainLoop.cs

@@ -86 +86 @@
     #endregion
 
+    [StorableConstructor]
+    private TabuSearchMainLoop(bool deserializing) : base() { }
     public TabuSearchMainLoop()
       : base() {
+      Initialize();
+    }
+
+    private void Initialize() {
       #region Create parameters
       Parameters.Add(new ValueLookupParameter<IRandom>("Random", "A pseudo random number generator."));
@@ -97 +103 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("MaximumIterations", "The maximum number of generations which should be processed."));
       Parameters.Add(new ValueLookupParameter<IntValue>("TabuTenure", "The length of the tabu list, and also means the number of iterations a move is kept tabu"));
-      
+
       Parameters.Add(new ValueLookupParameter<IOperator>("MoveGenerator", "The operator that generates the moves."));
       Parameters.Add(new ValueLookupParameter<IOperator>("MoveMaker", "The operator that performs a move and updates the quality."));
@@ -192 +198 @@
       bestAverageWorstMoveQualityCalculator.QualityParameter.ActualName = MoveQualityParameter.Name;
       bestAverageWorstMoveQualityCalculator.WorstQualityParameter.ActualName = "Worst Move Quality";
-      
+
       valuesCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Best Move Quality"));
       valuesCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Average Move Quality"));