Changeset 14653 for branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/Problems/TourProfitProblem.cs

Timestamp:

02/07/17 21:54:23 (7 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• improved ttp evaluation

File:

• branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/Problems/TourProfitProblem.cs (modified) (4 diffs)

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/Problems/TourProfitProblem.cs

@@ -46 +46 @@
     public BinaryVector FixedKspSolution { get; set; }
     [Storable]
-    public int[] Availability { get; set; }
+    public Dictionary<int, int[]> Availability { get; set; }
     [Storable]
     public double RentingRatio { get; set; }
@@ -53 +53 @@
     [Storable]
     public double MaxSpeed { get; set; }
-    [Storable]
-    public TtpUtils.DistanceType DistanceType { get; set; }
 
     [StorableConstructor]
@@ -62 +60 @@
       Ksp = cloner.Clone(original.Ksp);
       FixedKspSolution = cloner.Clone(original.FixedKspSolution);
-      Availability = original.Availability != null ? (int[])original.Availability.Clone() : null;
+      Availability = original.Availability != null ? original.Availability.ToDictionary(k => k.Key, v => (int[])v.Value.Clone()) : null;
       RentingRatio = original.RentingRatio;
       MinSpeed = original.MinSpeed;
       MaxSpeed = original.MaxSpeed;
-      DistanceType = original.DistanceType;
     }
     public TourProfitProblem() : base() {
@@ -79 +76 @@
       return TtpUtils.Evaluate(Tsp, individual.Permutation().ToArray(),
                                Ksp, FixedKspSolution.ToArray(),
-                               Availability, RentingRatio, MinSpeed, MaxSpeed, DistanceType);
+                               Availability, RentingRatio, MinSpeed, MaxSpeed);
     }