Changeset 17697

Timestamp:

07/23/20 23:27:28 (4 years ago)

Author:

abeham

Message:

#2521: changed parameterization in TSP

Location:

branches/2521_ProblemRefactoring

Files:

• HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.TravelingSalesman/3.3/TSP.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveProblem.cs

@@ -199 +199 @@
         op.QualityVariableName = Evaluator.QualityParameter.ActualName;
       }
+      foreach (var op in Operators.OfType<ISingleObjectiveImprovementOperator>()) {
+        op.SolutionParameter.ActualName = Encoding.Name;
+        op.SolutionParameter.Hidden = true;
+      }
+      foreach (var op in Operators.OfType<ISingleObjectivePathRelinker>()) {
+        op.ParentsParameter.ActualName = Encoding.Name;
+        op.ParentsParameter.Hidden = true;
+      }
     }
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/TSP.cs

@@ -163 +163 @@
 
     public static ITSPData GetDataFromInstance(TSPData input) {
-      ITSPData tspData = null;
+      ITSPData tspData;
       if (input.Dimension <= DistanceMatrixSizeLimit) {
         tspData = new MatrixTSPData(input.Name, input.GetDistanceMatrix(), input.Coordinates) { Description = input.Description };
@@ -208 +208 @@
 
     private void InitializeOperators() {
-      Operators.Add(new TSPImprovementOperator());
-      Operators.Add(new TSPMultipleGuidesPathRelinker());
-      Operators.Add(new TSPPathRelinker());
-      Operators.Add(new TSPSimultaneousPathRelinker());
-
-      Operators.Add(new TSPAlleleFrequencyAnalyzer());
+      var ops = new List<IItem>() { new TSPImprovementOperator(), new TSPMultipleGuidesPathRelinker(),
+        new TSPPathRelinker(), new TSPSimultaneousPathRelinker(), new TSPAlleleFrequencyAnalyzer() };
       foreach (var op in ApplicationManager.Manager.GetInstances<ITSPMoveEvaluator>()) {
-        Encoding.ConfigureOperator(op);
-        Operators.Add(op);
-      }
-      ParameterizeOperators();
-    }
-
-    private void ParameterizeOperators() {
+        ops.Add(op);
+      }
+      Encoding.ConfigureOperators(ops);
+      Operators.AddRange(ops);
+    }
+
+    protected override void ParameterizeOperators() {
+      base.ParameterizeOperators();
+      Parameterize();
+    }
+
+    private void Parameterize() {
       foreach (var op in Operators.OfType<TSPAlleleFrequencyAnalyzer>()) {
         op.MaximizationParameter.ActualName = MaximizationParameter.Name;
@@ -238 +239 @@
         op.TSPTourParameter.Hidden = true;
       }
-      foreach (var op in Operators.OfType<ISingleObjectiveImprovementOperator>()) {
-        op.SolutionParameter.ActualName = Encoding.Name;
-        op.SolutionParameter.Hidden = true;
-      }
-      foreach (ISingleObjectivePathRelinker op in Operators.OfType<ISingleObjectivePathRelinker>()) {
-        op.ParentsParameter.ActualName = Encoding.Name;
-        op.ParentsParameter.Hidden = true;
-      }
-      foreach (ISolutionSimilarityCalculator op in Operators.OfType<ISolutionSimilarityCalculator>()) {
-        op.SolutionVariableName = Encoding.Name;
-        op.QualityVariableName = Evaluator.QualityParameter.ActualName;
-      }
     }
   }