Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/19/12 13:17:29 (12 years ago)
Author:
ascheibe
Message:

#1722 fixed more licensing information and source formatting

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveTabuMaker.cs

    r7791 r8053  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
     24using HeuristicLab.Data;
    2425using HeuristicLab.Optimization.Operators;
    2526using HeuristicLab.Parameters;
    2627using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2728using HeuristicLab.Problems.VehicleRouting.Interfaces;
    28 using HeuristicLab.Data;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
     
    6363    public PotvinPDShiftMoveTabuMaker()
    6464      : base() {
    65         Parameters.Add(new LookupParameter<PotvinPDShiftMove>("PotvinPDShiftMove", "The moves that should be made."));
    66         Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The VRP tours considered in the move."));
    67         Parameters.Add(new LookupParameter<IVRPProblemInstance>("ProblemInstance", "The VRP problem instance"));
     65      Parameters.Add(new LookupParameter<PotvinPDShiftMove>("PotvinPDShiftMove", "The moves that should be made."));
     66      Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The VRP tours considered in the move."));
     67      Parameters.Add(new LookupParameter<IVRPProblemInstance>("ProblemInstance", "The VRP problem instance"));
    6868
    69         Parameters.Add(new LookupParameter<DoubleValue>("Distance", "The distance of the individual"));
    70         Parameters.Add(new LookupParameter<DoubleValue>("Overload", "The overload of the individual"));
    71         Parameters.Add(new LookupParameter<DoubleValue>("Tardiness", "The tardiness of the individual"));
    72         Parameters.Add(new LookupParameter<IntValue>("PickupViolations", "The number of pickup violations."));
     69      Parameters.Add(new LookupParameter<DoubleValue>("Distance", "The distance of the individual"));
     70      Parameters.Add(new LookupParameter<DoubleValue>("Overload", "The overload of the individual"));
     71      Parameters.Add(new LookupParameter<DoubleValue>("Tardiness", "The tardiness of the individual"));
     72      Parameters.Add(new LookupParameter<IntValue>("PickupViolations", "The number of pickup violations."));
    7373    }
    7474
     
    9797      if (PickupViolationsParameter.ActualValue != null)
    9898        pickupViolations = PickupViolationsParameter.ActualValue.Value;
    99      
     99
    100100      return new PotvinPDRelocateMoveAttribute(baseQuality, move.OldTour, move.City, distance, overload, tardiness, pickupViolations);
    101101    }
Note: See TracChangeset for help on using the changeset viewer.