Changeset 17708 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW

Timestamp:

08/03/20 08:44:52 (4 years ago)

Author:

abeham

Message:

#2521: working on VRP

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW

Files:

• CVRPPDTW/CVRPPDTWEvaluation.cs (modified) (1 diff)
• CVRPTWEvaluation.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPPDTW/CVRPPDTWEvaluation.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using System.Linq;
+using HEAL.Attic;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
 
 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
+  [Item("CVRPPDTWInsertionInfo", "")]
+  [StorableType("acb4ecf2-70a5-42ec-a2a5-68b11bd033e2")]
   public class CVRPPDTWInsertionInfo : CVRPTWInsertionInfo {
-    private List<int> visited;
+    [Storable] public List<int> Visited { get; private set; }
+    [Storable] public double ArrivalSpareCapacity { get; private set; }
 
-    public List<int> Visited {
-      get { return visited; }
+    [StorableConstructor]
+    protected CVRPPDTWInsertionInfo(StorableConstructorFlag _) : base(_) { }
+    protected CVRPPDTWInsertionInfo(CVRPPDTWInsertionInfo original, Cloner cloner)
+      : base(original, cloner) {
+      Visited = original.Visited.ToList();
+      ArrivalSpareCapacity = original.ArrivalSpareCapacity;
     }
-
-    private double arrivalSpareCapacity;
-
-    public double ArrivalSpareCapacity {
-      get { return arrivalSpareCapacity; }
-    }
-
     public CVRPPDTWInsertionInfo(int start, int end, double spareCapacity, double tourStartTime,
       double arrivalTime, double leaveTime, double spareTime, double waitingTime, List<int> visited, double arrivalSpareCapacity)
       : base(start, end, spareCapacity, tourStartTime, arrivalTime, leaveTime, spareTime, waitingTime) {
-      this.visited = visited;
-      this.arrivalSpareCapacity = arrivalSpareCapacity;
+      Visited = visited;
+      ArrivalSpareCapacity = arrivalSpareCapacity;
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new CVRPPDTWInsertionInfo(this, cloner);
     }
   }
 
+  [Item("CVRPPDTWEvaluation", "")]
+  [StorableType("877ae91a-708f-4b32-95f3-d790e0efc018")]
   public class CVRPPDTWEvaluation : CVRPTWEvaluation {
-    public int PickupViolations { get; set; }
+    [Storable] public int PickupViolations { get; set; }
+
+    [StorableConstructor]
+    protected CVRPPDTWEvaluation(StorableConstructorFlag _) : base(_) { }
+    protected CVRPPDTWEvaluation(CVRPPDTWEvaluation original, Cloner cloner)
+      : base(original, cloner) {
+      PickupViolations = original.PickupViolations;
+    }
+    public CVRPPDTWEvaluation() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new CVRPPDTWEvaluation(this, cloner);
+    }
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWEvaluation.cs

@@ -21 +21 @@
 
 
+using HEAL.Attic;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
+
 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
+  [Item("CVRPTWInsertionInfo", "")]
+  [StorableType("487635b5-2682-42a2-9ec2-1a210e6ce88c")]
   public class CVRPTWInsertionInfo : CVRPInsertionInfo {
-    private double tourStartTime;
 
-    public double TourStartTime {
-      get { return tourStartTime; }
+    [Storable] public double TourStartTime { get; private set; }
+    [Storable] public double ArrivalTime { get; private set; }
+    [Storable] public double LeaveTime { get; private set; }
+    [Storable] public double SpareTime { get; private set; }
+    [Storable] public double WaitingTime { get; private set; }
+
+
+    [StorableConstructor]
+    protected CVRPTWInsertionInfo(StorableConstructorFlag _) : base(_) { }
+    protected CVRPTWInsertionInfo(CVRPTWInsertionInfo original, Cloner cloner)
+      : base(original, cloner) {
+      TourStartTime = original.TourStartTime;
+      ArrivalTime = original.ArrivalTime;
+      LeaveTime = original.LeaveTime;
+      SpareTime = original.SpareTime;
+      WaitingTime = original.WaitingTime;
     }
-
-    private double arrivalTime;
-
-    public double ArrivalTime {
-      get { return arrivalTime; }
-    }
-
-    private double leaveTime;
-
-    public double LeaveTime {
-      get { return leaveTime; }
-    }
-
-    private double spareTime;
-
-    public double SpareTime {
-      get { return spareTime; }
-    }
-
-    private double waitingTime;
-
-    public double WaitingTime {
-      get { return waitingTime; }
-    }
-
     public CVRPTWInsertionInfo(int start, int end, double spareCapacity, double tourStartTime, double arrivalTime, double leaveTime, double spareTime, double waitingTime)
       : base(start, end, spareCapacity) {
-      this.tourStartTime = tourStartTime;
-      this.arrivalTime = arrivalTime;
-      this.leaveTime = leaveTime;
-      this.spareTime = spareTime;
-      this.waitingTime = waitingTime;
+      TourStartTime = tourStartTime;
+      ArrivalTime = arrivalTime;
+      LeaveTime = leaveTime;
+      SpareTime = spareTime;
+      WaitingTime = waitingTime;
     }
   }
 
+  [Item("CVRPTWEvaluation", "")]
+  [StorableType("b3b31244-5ac8-4007-9ae6-249e2a7d5321")]
   public class CVRPTWEvaluation : CVRPEvaluation {
-    public double Tardiness { get; set; }
-    public double TravelTime { get; set; }
+    [Storable] public double Tardiness { get; set; }
+    [Storable] public double TravelTime { get; set; }
+
+    [StorableConstructor]
+    protected CVRPTWEvaluation(StorableConstructorFlag _) : base(_) { }
+    protected CVRPTWEvaluation(CVRPTWEvaluation original, Cloner cloner)
+      : base(original, cloner) {
+      Tardiness = original.Tardiness;
+      TravelTime = original.TravelTime;
+    }
+    public CVRPTWEvaluation() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new CVRPTWEvaluation(this, cloner);
+    }
   }
 }