Changeset 12495 for branches/GBT/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP
- Timestamp:
- 06/23/15 12:50:05 (9 years ago)
- Location:
- branches/GBT
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/GBT
- Property svn:mergeinfo changed
/trunk/sources merged: 12392-12393,12397-12401,12422,12424,12428-12435,12442-12443,12445,12455-12458,12461,12463-12465,12470-12476,12478-12482,12485,12488,12490-12494 -
Property
svn:global-ignores
set to
*.nuget
packages
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.VehicleRouting (added) merged: 12488
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPProblemInstance.cs
r12012 r12495 61 61 return OverloadPenaltyParameter.Value; 62 62 } 63 } 64 DoubleValue ICapacitatedProblemInstance.CurrentOverloadPenalty { 65 get { return CurrentOverloadPenaltyParameter.Value; } 63 66 set { CurrentOverloadPenaltyParameter.Value = value; } 64 67 } … … 87 90 Parameters.Add(new ValueParameter<DoubleValue>("Capacity", "The capacity of each vehicle.", new DoubleValue(0))); 88 91 Parameters.Add(new ValueParameter<DoubleValue>("EvalOverloadPenalty", "The overload penalty considered in the evaluation.", new DoubleValue(100))); 89 Parameters.Add(new OptionalValueParameter<DoubleValue>("CurrentOverloadPenalty", "The current overload penalty considered in the evaluation.") );92 Parameters.Add(new OptionalValueParameter<DoubleValue>("CurrentOverloadPenalty", "The current overload penalty considered in the evaluation.") { Hidden = true }); 90 93 91 94 AttachEventHandlers(); -
branches/GBT/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPPDTW/CVRPPDTWProblemInstance.cs
r12012 r12495 61 61 return PickupViolationPenaltyParameter.Value; 62 62 } 63 } 64 DoubleValue IPickupAndDeliveryProblemInstance.CurrentPickupViolationPenalty { 65 get { return CurrentOverloadPenaltyParameter.Value; } 63 66 set { CurrentPickupViolationPenaltyParameter.Value = value; } 64 67 } … … 94 97 95 98 Parameters.Add(new ValueParameter<DoubleValue>("EvalPickupViolationPenalty", "The pickup violation penalty considered in the evaluation.", new DoubleValue(100))); 96 Parameters.Add(new OptionalValueParameter<DoubleValue>("CurrentPickupViolationPenalty", "The current pickup violation penalty considered in the evaluation.") );99 Parameters.Add(new OptionalValueParameter<DoubleValue>("CurrentPickupViolationPenalty", "The current pickup violation penalty considered in the evaluation.") { Hidden = true }); 97 100 98 101 AttachEventHandlers(); -
branches/GBT/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWProblemInstance.cs
r12012 r12495 83 83 return TardinessPenaltyParameter.Value; 84 84 } 85 } 86 DoubleValue ITimeWindowedProblemInstance.CurrentTardinessPenalty { 87 get { return CurrentTardinessPenaltyParameter.Value; } 85 88 set { CurrentTardinessPenaltyParameter.Value = value; } 86 89 } … … 113 116 Parameters.Add(new ValueParameter<DoubleValue>("EvalTimeFactor", "The time factor considered in the evaluation.", new DoubleValue(0))); 114 117 Parameters.Add(new ValueParameter<DoubleValue>("EvalTardinessPenalty", "The tardiness penalty considered in the evaluation.", new DoubleValue(100))); 115 Parameters.Add(new OptionalValueParameter<DoubleValue>("CurrentTardinessPenalty", "The current tardiness penalty considered in the evaluation.") );118 Parameters.Add(new OptionalValueParameter<DoubleValue>("CurrentTardinessPenalty", "The current tardiness penalty considered in the evaluation.") { Hidden = true }); 116 119 117 120 AttachEventHandlers();
Note: See TracChangeset
for help on using the changeset viewer.