Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/11/15 19:39:47 (9 years ago)
Author:
abeham
Message:

#2400: merged 12488 to stable

Location:
stable
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.VehicleRouting

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPProblemInstance.cs

    r12009 r12738  
    6161          return OverloadPenaltyParameter.Value;
    6262      }
     63    }
     64    DoubleValue ICapacitatedProblemInstance.CurrentOverloadPenalty {
     65      get { return CurrentOverloadPenaltyParameter.Value; }
    6366      set { CurrentOverloadPenaltyParameter.Value = value; }
    6467    }
     
    8790      Parameters.Add(new ValueParameter<DoubleArray>("Capacity", "The capacity of each vehicle.", new DoubleArray()));
    8891      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 });
    9093
    9194      AttachEventHandlers();
  • stable/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPTW/MDCVRPPDTW/MDCVRPPDTWProblemInstance.cs

    r12009 r12738  
    6161          return PickupViolationPenaltyParameter.Value;
    6262      }
     63    }
     64    DoubleValue IPickupAndDeliveryProblemInstance.CurrentPickupViolationPenalty {
     65      get { return CurrentPickupViolationPenaltyParameter.Value; }
    6366      set { CurrentPickupViolationPenaltyParameter.Value = value; }
    6467    }
     
    9497
    9598      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 });
    97100
    98101      AttachEventHandlers();
  • stable/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPTW/MDCVRPTWProblemInstance.cs

    r12009 r12738  
    8383          return TardinessPenaltyParameter.Value;
    8484      }
     85    }
     86    DoubleValue ITimeWindowedProblemInstance.CurrentTardinessPenalty {
     87      get { return CurrentTardinessPenaltyParameter.Value; }
    8588      set { CurrentTardinessPenaltyParameter.Value = value; }
    8689    }
     
    113116      Parameters.Add(new ValueParameter<DoubleValue>("EvalTimeFactor", "The time factor considered in the evaluation.", new DoubleValue(0)));
    114117      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 });
    116119
    117120      AttachEventHandlers();
  • stable/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPProblemInstance.cs

    r12009 r12738  
    6161          return OverloadPenaltyParameter.Value;
    6262      }
     63    }
     64    DoubleValue ICapacitatedProblemInstance.CurrentOverloadPenalty {
     65      get { return CurrentOverloadPenaltyParameter.Value; }
    6366      set { CurrentOverloadPenaltyParameter.Value = value; }
    6467    }
     
    8790      Parameters.Add(new ValueParameter<DoubleValue>("Capacity", "The capacity of each vehicle.", new DoubleValue(0)));
    8891      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 });
    9093
    9194      AttachEventHandlers();
  • stable/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPPDTW/CVRPPDTWProblemInstance.cs

    r12009 r12738  
    6161          return PickupViolationPenaltyParameter.Value;
    6262      }
     63    }
     64    DoubleValue IPickupAndDeliveryProblemInstance.CurrentPickupViolationPenalty {
     65      get { return CurrentOverloadPenaltyParameter.Value; }
    6366      set { CurrentPickupViolationPenaltyParameter.Value = value; }
    6467    }
     
    9497
    9598      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 });
    97100
    98101      AttachEventHandlers();
  • stable/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWProblemInstance.cs

    r12009 r12738  
    8383          return TardinessPenaltyParameter.Value;
    8484      }
     85    }
     86    DoubleValue ITimeWindowedProblemInstance.CurrentTardinessPenalty {
     87      get { return CurrentTardinessPenaltyParameter.Value; }
    8588      set { CurrentTardinessPenaltyParameter.Value = value; }
    8689    }
     
    113116      Parameters.Add(new ValueParameter<DoubleValue>("EvalTimeFactor", "The time factor considered in the evaluation.", new DoubleValue(0)));
    114117      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 });
    116119
    117120      AttachEventHandlers();
Note: See TracChangeset for help on using the changeset viewer.