Changeset 7724 for branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

Timestamp:

04/12/12 16:42:17 (12 years ago)

Author:

jkarder

Message:

#1331:

• added analyzer
• added parameters and adjusted parameter types
• corrected ReferenceSetUpdateMethod
• changed access levels

File:

• branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs (modified) (7 diffs)

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

@@ -37 +37 @@
 
 namespace HeuristicLab.Algorithms.ScatterSearch {
+  /// <summary>
+  /// A scatter search algorithm.
+  /// </summary>
   [Item("Scatter Search", "A scatter search algorithm.")]
   [Creatable("Algorithms")]
@@ -263 +266 @@
       base.OnProblemChanged();
     }
-
     protected override void Problem_SolutionCreatorChanged(object sender, EventArgs e) {
       ParameterizeStochasticOperator(Problem.SolutionCreator);
@@ -269 +271 @@
       base.Problem_SolutionCreatorChanged(sender, e);
     }
-
     protected override void Problem_EvaluatorChanged(object sender, EventArgs e) {
       ParameterizeStochasticOperator(Problem.Evaluator);
@@ -280 +281 @@
       base.Problem_EvaluatorChanged(sender, e);
     }
-
     protected override void Problem_OperatorsChanged(object sender, EventArgs e) {
       foreach (IOperator op in Problem.Operators) ParameterizeStochasticOperator(op);
@@ -393 +393 @@
         foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>()) {
           foreach (IScopeTreeLookupParameter param in analyzer.Parameters.OfType<IScopeTreeLookupParameter>())
-            param.Depth = 0;
+            param.Depth = 1;
           Analyzer.Operators.Add(analyzer, analyzer.EnabledByDefault);
         }
@@ -409 +409 @@
     private void ParameterizeMainLoop() {
       if (Problem != null) {
-        //MainLoop.BestKnownQualityParameter.ActualName = Problem.BestKnownQualityParameter.Name;
-        //MainLoop.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
-        //MainLoop.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
-      }
-      if (MoveEvaluator != null) ;
-      //MainLoop.MoveQualityParameter.ActualName = MoveEvaluator.MoveQualityParameter.ActualName;
+        MainLoop.BestKnownQualityParameter.ActualName = Problem.BestKnownQualityParameter.Name;
+        MainLoop.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
+        MainLoop.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
+      }
+      if (MoveEvaluator != null)
+        MainLoop.MoveQualityParameter.ActualName = MoveEvaluator.MoveQualityParameter.ActualName;
     }
     private void ParameterizeStochasticOperator(IOperator op) {
@@ -476 +476 @@
       }
     }
-
     private ScatterSearchMainLoop FindMainLoop(IOperator start) {
       IOperator mainLoop = start;