Changeset 11975 for branches/ALPS/HeuristicLab.Algorithms.ScatterSearch/3.3

Timestamp:

02/10/15 09:57:29 (10 years ago)

Author:

pfleck

Message:

#2269 merged trunk

Location:

branches/ALPS

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.ScatterSearch/3.3/PopulationRebuildMethod.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs (modified) (3 diffs)
• HeuristicLab.Algorithms.ScatterSearch/3.3/SolutionPoolUpdateMethod.cs (modified) (1 diff)

branches/ALPS/HeuristicLab.Algorithms.ScatterSearch/3.3/PopulationRebuildMethod.cs

@@ -25 +25 @@
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -34 +35 @@
   [Item("PopulationRebuildMethod", "An operator that updates the reference set and rebuilds the population.")]
   [StorableClass]
-  public sealed class PopulationRebuildMethod : SingleSuccessorOperator {
+  public sealed class PopulationRebuildMethod : SingleSuccessorOperator, ISingleObjectiveOperator {
     #region Parameter properties
     public ScopeParameter CurrentScopeParameter {

branches/ALPS/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

@@ -175 +175 @@
       Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The analyzer used to analyze each iteration.", new MultiAnalyzer()));
       Parameters.Add(new ConstrainedValueParameter<ICrossover>("Crossover", "The operator used to cross solutions."));
-      Parameters.Add(new ValueParameter<BoolValue>("ExecutePathRelinking", "True if path relinking should be executed instead of crossover, otherwise false.", new BoolValue(true)));
+      Parameters.Add(new ValueParameter<BoolValue>("ExecutePathRelinking", "True if path relinking should be executed instead of crossover, otherwise false.", new BoolValue(false)));
       Parameters.Add(new ConstrainedValueParameter<IImprovementOperator>("Improver", "The operator used to improve solutions."));
       Parameters.Add(new ValueParameter<IntValue>("MaximumIterations", "The maximum number of iterations which should be processed.", new IntValue(100)));
@@ -309 +309 @@
       base.Problem_OperatorsChanged(sender, e);
     }
+    private void PathRelinkerParameter_ValueChanged(object sender, EventArgs e) {
+      ExecutePathRelinking.Value = PathRelinkerParameter.Value != null;
+    }
     private void SimilarityCalculatorParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeMainLoop();
@@ -322 +325 @@
     #region Helpers
     private void Initialize() {
+      PathRelinkerParameter.ValueChanged += new EventHandler(PathRelinkerParameter_ValueChanged);
       SimilarityCalculatorParameter.ValueChanged += new EventHandler(SimilarityCalculatorParameter_ValueChanged);
       if (Problem != null)

branches/ALPS/HeuristicLab.Algorithms.ScatterSearch/3.3/SolutionPoolUpdateMethod.cs

@@ -36 +36 @@
   [Item("SolutionPoolUpdateMethod", "An operator that updates the solution pool.")]
   [StorableClass]
-  public sealed class SolutionPoolUpdateMethod : SingleSuccessorOperator, ISimilarityBasedOperator {
+  public sealed class SolutionPoolUpdateMethod : SingleSuccessorOperator, ISimilarityBasedOperator, ISingleObjectiveOperator {
     #region ISimilarityBasedOperator Members
     [Storable]