Changeset 14653 for branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/Problems/LootProfitProblem.cs
- Timestamp:
- 02/07/17 21:54:23 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/Problems/LootProfitProblem.cs
r14629 r14653 47 47 public Permutation FixedTspSolution { get; set; } 48 48 [Storable] 49 public int[]Availability { get; set; }49 public Dictionary<int, int[]> Availability { get; set; } 50 50 [Storable] 51 51 public double RentingRatio { get; set; } … … 54 54 [Storable] 55 55 public double MaxSpeed { get; set; } 56 [Storable]57 public TtpUtils.DistanceType DistanceType { get; set; }58 56 59 57 [StorableConstructor] … … 63 61 Ksp = cloner.Clone(original.Ksp); 64 62 FixedTspSolution = cloner.Clone(original.FixedTspSolution); 65 Availability = original.Availability != null ? (int[])original.Availability.Clone() : null;63 Availability = original.Availability != null ? original.Availability.ToDictionary(k => k.Key, v => (int[])v.Value.Clone()) : null; 66 64 RentingRatio = original.RentingRatio; 67 65 MinSpeed = original.MinSpeed; 68 66 MaxSpeed = original.MaxSpeed; 69 DistanceType = original.DistanceType;70 67 } 71 68 public LootProfitProblem() : base() { … … 80 77 return TtpUtils.Evaluate(Tsp, FixedTspSolution.ToArray(), 81 78 Ksp, vector.ToArray(), 82 Availability, RentingRatio, MinSpeed, MaxSpeed , DistanceType);79 Availability, RentingRatio, MinSpeed, MaxSpeed); 83 80 } 84 81
Note: See TracChangeset
for help on using the changeset viewer.