Changeset 17718 for branches

Timestamp:

08/05/20 05:46:07 (4 years ago)

Author:

abeham

Message:

#2521: completed port of VRP (needs testing though)

Location:

branches/2521_ProblemRefactoring

Files:

• HeuristicLab.Collections/3.3/ObservableCollection.cs (modified) (1 diff)
• HeuristicLab.Collections/3.3/ObservableSet.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Results/ResultParameter.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/AlbaEncoding.cs (modified) (2 diffs)
• HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/GVREncoding.cs (modified) (2 diffs)
• HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/PotvinEncoding.cs (modified) (2 diffs)
• HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/PrinsEncoding.cs (modified) (2 diffs)
• HeuristicLab.Problems.VehicleRouting/3.4/Encodings/VRPEncoding.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/ZhuEncoding.cs (modified) (2 diffs)
• HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Collections/3.3/ObservableCollection.cs

@@ -103 +103 @@
         if (list.Capacity != capacity)
           OnPropertyChanged("Capacity");
-        OnPropertyChanged("Item[]");
-        OnPropertyChanged("Count");
-      }
+        OnPropertyChanged("Count");
+      }
+    }
+
+    /// <summary>
+    /// Performs a Clear and an AddRange, but does not fire separate events for those operations
+    /// </summary>
+    /// <param name="collection"></param>
+    public void Replace(IEnumerable<T> collection) {
+      List<T> oldItems = null;
+      if (list.Any()) oldItems = new List<T>(list);
+      else oldItems = new List<T>();
+
+      int oldCapacity = list.Capacity;
+      list.Clear();
+      list.AddRange(collection);
+
+      List<T> items = null;
+      if (list.Any()) items = new List<T>(list);
+      else items = new List<T>();
+
+      OnCollectionReset(items, oldItems);
+      if (oldCapacity != list.Capacity) OnPropertyChanged("Capacity");
+      if (oldItems.Count != items.Count) OnPropertyChanged("Count");
     }
 

branches/2521_ProblemRefactoring/HeuristicLab.Collections/3.3/ObservableSet.cs

@@ -128 +128 @@
         OnItemsRemoved(items);
       }
+    }
+
+    /// <summary>
+    /// Performs a Clear and an Add, but does not fire separate events for those operations
+    /// </summary>
+    /// <param name="other"></param>
+    public void Replace(IEnumerable<T> other) {
+      List<T> oldItems = null;
+      if (set.Any()) oldItems = new List<T>(set);
+      else oldItems = new List<T>();
+
+      set.Clear();
+      set.UnionWith(other);
+
+      List<T> items = null;
+      if (set.Any()) items = new List<T>(set);
+      else items = new List<T>();
+
+      OnCollectionReset(items, oldItems);
+      if (oldItems.Count != items.Count) OnPropertyChanged("Count");
     }
 

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

@@ -82 +82 @@
     }
 
+    protected void ReplaceOperators(IEnumerable<IOperator> operators) {
+      encodingOperators.Replace(operators);
+    }
+
     public void ConfigureOperator(IItem @operator) { ConfigureOperators(new[] { @operator }); }
     public virtual void ConfigureOperators(IEnumerable<IItem> operators) {

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Results/ResultParameter.cs

@@ -121 +121 @@
       if (result.Value != null && resultValue == null)
         throw new InvalidOperationException(string.Format("Type mismatch. Result \"{0}\" does not contain a \"{1}\".", ActualName, typeof(T).GetPrettyName()));
-
+      else if (result.Value == null && DefaultValue != null) {
+        result.Value = resultValue = (T)DefaultValue.Clone();
+      }
       return resultValue;
     }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/AlbaEncoding.cs

@@ -27 +27 @@
 using HeuristicLab.Core;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
@@ -56 +57 @@
           typeof (IAlbaOperator),
           typeof (IVRPCreator),
-          typeof (IMultiVRPOperator)
+          typeof (IMultiVRPOperator),
+          typeof (IMultiVRPMoveOperator)
       };
     }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/GVREncoding.cs

@@ -27 +27 @@
 using HeuristicLab.Core;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
@@ -56 +57 @@
           typeof (IGVROperator),
           typeof (IVRPCreator),
-          typeof (IMultiVRPOperator)
+          typeof (IMultiVRPOperator),
+          typeof (IMultiVRPMoveOperator)
       };
     }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/PotvinEncoding.cs

@@ -27 +27 @@
 using HeuristicLab.Core;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
@@ -56 +57 @@
           typeof (IPotvinOperator),
           typeof (IVRPCreator),
-          typeof (IMultiVRPOperator)
+          typeof (IMultiVRPOperator),
+          typeof (IMultiVRPMoveOperator)
       };
     }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/PrinsEncoding.cs

@@ -27 +27 @@
 using HeuristicLab.Core;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
@@ -56 +57 @@
           typeof (IPrinsOperator),
           typeof (IVRPCreator),
-          typeof (IMultiVRPOperator)
+          typeof (IMultiVRPOperator),
+          typeof (IMultiVRPMoveOperator)
       };
     }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/VRPEncoding.cs

@@ -39 +39 @@
     public void FilterOperators(IVRPProblemInstance instance) {
       DiscoverOperators();
-      var operators = instance.FilterOperators(Operators);
-      foreach (var op in Operators.Except(operators).ToList()) {
-        RemoveOperator(op);
+      var operators = instance.FilterOperators(Operators).ToList();
+      foreach (var op in operators.OfType<IMultiVRPOperator>().ToList()) {
+        var subOps = instance.FilterOperators(op.Operators).ToList();
+        if (subOps.Count == 0) operators.Remove(op);
+        else {
+          foreach (var dm in op.Operators.Except(subOps).ToList())
+            op.RemoveOperator(dm);
+        }
       }
+      ReplaceOperators(operators);
     }
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/ZhuEncoding.cs

@@ -27 +27 @@
 using HeuristicLab.Core;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
@@ -56 +57 @@
           typeof (IZhuOperator),
           typeof (IVRPCreator),
-          typeof (IMultiVRPOperator)
+          typeof (IMultiVRPOperator),
+          typeof (IMultiVRPMoveOperator)
       };
     }

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

@@ -204 +204 @@
       Encoding.FilterOperators(ProblemInstance);
 
-      var newOps = new List<IItem>();
-      var operatorTypes = new HashSet<Type>(Operators.Select(x => x.GetType()));
+      var newOps = ProblemInstance.FilterOperators(Operators.OfType<IOperator>())
+        .Union(Operators.Where(x => !(x is IOperator) || x.GetType().Namespace.StartsWith("HeuristicLab.Optimization")))
+        .ToList();
+      var operatorTypes = new HashSet<Type>(newOps.Select(x => x.GetType()));
       if (operatorTypes.Add(typeof(VRPSimilarityCalculator)))
         newOps.Add(new VRPSimilarityCalculator());
@@ -214 +216 @@
 
       var assembly = typeof(VehicleRoutingProblem).Assembly;
-      var operators = ApplicationManager.Manager.GetTypes(new[] { typeof(IAnalyzer) }, assembly, true, false, false)
+      var analyzers = 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);
+      newOps.AddRange(ProblemInstance.FilterOperators(analyzers));
+      
+      Operators.Replace(newOps);
     }