Changeset 17717 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

Timestamp:

08/05/20 04:37:37 (4 years ago)

Author:

abeham

Message:

#2521: working on VRP (refactoring all the capabilities, features, and operator discovery)

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

@@ -153 +153 @@
     }
 
-    [Storable(OldName = "operators")]
-    private List<IOperator> StorableOperators {
-      set { Operators.AddRange(value); }
-    }
-
     private void AttachEventHandlers() {
       ProblemInstanceParameter.ValueChanged += new EventHandler(ProblemInstanceParameter_ValueChanged);
@@ -166 +161 @@
       if (ProblemInstance != null) {
         ProblemInstance.EvaluationChanged += new EventHandler(ProblemInstance_EvaluationChanged);
+      }
+    }
+
+    void BestKnownSolutionParameter_ValueChanged(object sender, EventArgs e) {
+      EvalBestKnownSolution();
+    }
+
+    void ProblemInstance_EvaluationChanged(object sender, EventArgs e) {
+      BestKnownQuality = double.NaN;
+      if (BestKnownSolution != null) {
+        // the tour is not valid if there are more vehicles in it than allowed
+        if (ProblemInstance.Vehicles.Value < BestKnownSolution.Solution.GetTours().Count) {
+          BestKnownSolution = null;
+        } else EvalBestKnownSolution();
       }
     }
@@ -182 +191 @@
     }
 
-    void BestKnownSolutionParameter_ValueChanged(object sender, EventArgs e) {
-      EvalBestKnownSolution();
-    }
-
-    void ProblemInstance_EvaluationChanged(object sender, EventArgs e) {
-      BestKnownQuality = double.NaN;
-      if (BestKnownSolution != null) {
-        // the tour is not valid if there are more vehicles in it than allowed
-        if (ProblemInstance.Vehicles.Value < BestKnownSolution.Solution.GetTours().Count) {
-          BestKnownSolution = null;
-        } else EvalBestKnownSolution();
-      }
-    }
-
     void ProblemInstanceParameter_ValueChanged(object sender, EventArgs e) {
       InitializeOperators();
       AttachProblemInstanceEventHandlers();
-
-      OnOperatorsChanged();
-    }
-
-    public void SetProblemInstance(IVRPProblemInstance instance) {
-      ProblemInstanceParameter.ValueChanged -= new EventHandler(ProblemInstanceParameter_ValueChanged);
-
-      ProblemInstance = instance;
-      AttachProblemInstanceEventHandlers();
-
-      ProblemInstanceParameter.ValueChanged += new EventHandler(ProblemInstanceParameter_ValueChanged);
+    }
+
+    protected override void OnEncodingChanged() {
+      base.OnEncodingChanged();
+      InitializeOperators();
     }
 
@@ -215 +204 @@
       Encoding.FilterOperators(ProblemInstance);
 
-      Operators.Add(new VRPSimilarityCalculator());
-      Operators.Add(new QualitySimilarityCalculator());
-      Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>()));
-      //Operators.AddRange(ProblemInstance.Operators.OfType<IAnalyzer>());
+      var newOps = new List<IItem>();
+      var operatorTypes = new HashSet<Type>(Operators.Select(x => x.GetType()));
+      if (operatorTypes.Add(typeof(VRPSimilarityCalculator)))
+        newOps.Add(new VRPSimilarityCalculator());
+      if (operatorTypes.Add(typeof(QualitySimilarityCalculator)))
+        newOps.Add(new QualitySimilarityCalculator());
+      if (operatorTypes.Add(typeof(PopulationSimilarityAnalyzer)))
+        newOps.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>()));
+
+      var assembly = typeof(VehicleRoutingProblem).Assembly;
+      var operators = ApplicationManager.Manager.GetTypes(new[] { typeof(IAnalyzer) }, assembly, true, false, false)
+        .Where(x => operatorTypes.Add(x)).Select(t => (IOperator)Activator.CreateInstance(t)).ToList();
+      newOps.AddRange(ProblemInstance.FilterOperators(operators));
+
+      Operators.AddRange(newOps);
     }
 
@@ -305 +305 @@
       BestKnownSolution = null;
 
-      if (ProblemInstance != null && instance.ProblemInstance != null &&
-        instance.ProblemInstance.GetType() == ProblemInstance.GetType())
-        SetProblemInstance(instance.ProblemInstance);
-      else
-        ProblemInstance = instance.ProblemInstance;
+      ProblemInstance = instance.ProblemInstance;
 
       OnReset();