Changeset 6752 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPEvaluation.cs

Timestamp:

09/13/11 16:00:19 (13 years ago)

Author:

svonolfe

Message:

Added support for incremental evaluation to improve performance (#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPEvaluation.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPEvaluation.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Text;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Core;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
+  public class StopInsertionInfo {   
+    private int start;
+
+    public int Start {
+      get { return start; }
+    }
+
+    private int end;
+
+    public int End {
+      get { return end; }
+    }
+        
+    public StopInsertionInfo(int start, int end)
+      : base() {
+        this.start = start;
+        this.end = end;
+    }
+  }
+
+  public class TourInsertionInfo {
+    public double Penalty { get; set; }
+
+    private List<StopInsertionInfo> stopInsertionInfos;
+
+    public TourInsertionInfo()
+      : base() {
+      stopInsertionInfos = new List<StopInsertionInfo>();
+    }
+
+    public void AddStopInsertionInfo(StopInsertionInfo info) {
+      stopInsertionInfos.Add(info);
+    }
+
+   public StopInsertionInfo GetStopInsertionInfo(int stop) {
+      return stopInsertionInfos[stop];
+    } 
+
+    public int GetStopCount() {
+      return stopInsertionInfos.Count;
+    }
+  }
+
+  public class InsertionInfo {
+    private List<TourInsertionInfo> tourInsertionInfos;
+    
+    public InsertionInfo()
+      : base() {
+        tourInsertionInfos = new List<TourInsertionInfo>();
+    }
+
+    public void AddTourInsertionInfo(TourInsertionInfo info) {     
+      tourInsertionInfos.Add(info);
+    }
+
+    public TourInsertionInfo GetTourInsertionInfo(int tour) {
+      return tourInsertionInfos[tour];
+    }
+  }
+  
   public class VRPEvaluation {
     public double Quality { get; set; }
     public double Distance { get; set; }
     public int VehicleUtilization { get; set; }
+    public InsertionInfo InsertionInfo { get; set; }
 
     public double Penalty { get; set; }
+
+    public VRPEvaluation() {
+      InsertionInfo = new InsertionInfo();
+    }
   }
 }