Changeset 17696 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.LinearAssignment/3.3/LinearAssignmentProblem.cs

Timestamp:

07/23/20 17:39:40 (4 years ago)

Author:

abeham

Message:

#2521:

• fixed bug in EngineAlgorithm in Problem setter
• Added storable type to IEncodedProblem
• fixed some bugs and tests

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.LinearAssignment/3.3/LinearAssignmentProblem.cs (modified) (6 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.LinearAssignment/3.3/LinearAssignmentProblem.cs

@@ -25 +25 @@
 using System.Threading;
 using HEAL.Attic;
-using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -31 +30 @@
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.LinearAssignment {
@@ -119 +116 @@
       Costs[2, 0] = 5; Costs[2, 1] = 5; Costs[2, 2] = 1;
 
-      InitializeOperators();
-      Parameterize();
+      Operators.RemoveAll(x => x is IMoveOperator);
       AttachEventHandlers();
     }
@@ -194 +190 @@
 
     #region Events
-    protected override void OnOperatorsChanged() {
-      base.OnOperatorsChanged();
-      Parameterize();
-    }
     private void Costs_RowsChanged(object sender, EventArgs e) {
       if (Costs.Rows != Costs.Columns) {
         ((IStringConvertibleMatrix)Costs).Columns = Costs.Rows;
-        Parameterize();
+        Dimension = Costs.Rows;
       }
     }
@@ -207 +199 @@
       if (Costs.Rows != Costs.Columns) {
         ((IStringConvertibleMatrix)Costs).Rows = Costs.Columns;
-        Parameterize();
+        Dimension = Costs.Rows;
       }
     }
     private void Costs_Reset(object sender, EventArgs e) {
-      Parameterize();
-    }
-    private void SolutionCreator_PermutationParameter_ActualNameChanged(object sender, EventArgs e) {
-      Parameterize();
+      Dimension = Costs.Rows;
     }
     #endregion
@@ -229 +218 @@
       Costs.Reset += new EventHandler(Costs_Reset);
     }
-
-    private void InitializeOperators() {
-      Operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>());
-      Operators.RemoveAll(x => x is IMoveOperator);
-
-      Operators.Add(new HammingSimilarityCalculator());
-      Operators.Add(new QualitySimilarityCalculator());
-      Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>()));
-    }
-
-    private void Parameterize() {
-      if (Costs.Rows != Dimension) Dimension = Costs.Rows;
-      foreach (var similarityCalculator in Operators.OfType<ISolutionSimilarityCalculator>()) {
-        similarityCalculator.SolutionVariableName = Encoding.Name;
-        similarityCalculator.QualityVariableName = Evaluator.QualityParameter.ActualName;
-      }
-    }
     #endregion
   }