Changeset 4363


Ignore:
Timestamp:
09/03/10 11:15:22 (9 years ago)
Author:
svonolfe
Message:

Worked on the evaluators and on the project structure of the VRP plugin - WIP (#1177)

Location:
branches/VRP
Files:
5 added
2 deleted
22 edited
6 copied
4 moved

Legend:

Unmodified
Added
Removed
  • branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/HeuristicLabProblemsVehicleRoutingViewsPlugin.cs

    r4362 r4363  
    2626  /// Plugin class for HeuristicLab.Problems.VehicleRouting.Views plugin
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Problems.VehicleRouting.Views", "3.4.0.4361")]
     28  [Plugin("HeuristicLab.Problems.VehicleRouting.Views", "3.4.0.4362")]
    2929  [PluginFile("HeuristicLab.Problems.VehicleRouting.Views-3.4.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Collections", "3.3")]
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/AlbaOperator.cs

    r4362 r4363  
    2929using HeuristicLab.Parameters;
    3030using HeuristicLab.Operators;
    31 using HeuristicLab.Problems.VehicleRouting.Interfaces.Variants;
     31using HeuristicLab.Problems.VehicleRouting.Variants;
    3232
    3333namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Creators/DefaultRepresentationCreator.cs

    r4362 r4363  
    2727using System.Collections.Generic;
    2828using HeuristicLab.Problems.VehicleRouting.Encodings;
    29 using HeuristicLab.Problems.VehicleRouting.Interfaces.Variants;
     29using HeuristicLab.Problems.VehicleRouting.Variants;
    3030
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Tour.cs

    r4362 r4363  
    2828using HeuristicLab.Core;
    2929
    30 namespace HeuristicLab.Problems.VehicleRouting.DomainModel {
     30namespace HeuristicLab.Problems.VehicleRouting {
    3131  [StorableClass]
    3232  public class Tour : Item {
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/VRPEncoding.cs

    r4362 r4363  
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828using HeuristicLab.Core;
    29 using HeuristicLab.Problems.VehicleRouting.DomainModel;
    3029
    3130namespace HeuristicLab.Problems.VehicleRouting.Encodings {
     
    3837    protected VRPEncoding(bool deserializing) : base(deserializing) { }
    3938
    40      public VRPEncoding()
     39    public VRPEncoding()
    4140      : base() {
    4241    }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/HeuristicLab.Problems.VehicleRouting-3.4.csproj

    r4362 r4363  
    117117    <Compile Include="Interfaces\IVRPEncoding.cs" />
    118118    <Compile Include="Interfaces\IVRPProblemInstance.cs" />
    119     <Compile Include="Interfaces\Variants\Capacitated\Heterogenous\IHeterogenousCapacitatedProblemInstance.cs" />
    120     <Compile Include="Interfaces\Variants\Capacitated\Heterogenous\IHeterogenousCapacitatedOperator.cs" />
    121     <Compile Include="Interfaces\Variants\Capacitated\Heterogenous\IHeterogenousCapacitatedEncoding.cs" />
    122     <Compile Include="Interfaces\Variants\Capacitated\Homogenous\ICapacitatedEncoding.cs" />
    123     <Compile Include="Interfaces\Variants\Capacitated\Homogenous\ICapacitatedOperator.cs" />
    124     <Compile Include="Interfaces\Variants\Capacitated\Homogenous\ICapacitatedProblemInstance.cs" />
    125     <Compile Include="Interfaces\Variants\SingleDepot\ISingleDepotOperator.cs" />
    126     <Compile Include="Interfaces\Variants\SingleDepot\ISingleDepotEncoding.cs" />
    127     <Compile Include="Interfaces\Variants\SingleDepot\ISingleDepotProblemInstance.cs" />
    128     <Compile Include="Interfaces\Variants\TimeWindowed\ITimeWindowedProblemInstance.cs" />
    129     <Compile Include="Interfaces\Variants\TimeWindowed\ITimeWindowedOperator.cs" />
    130     <Compile Include="Interfaces\Variants\TimeWindowed\ITimeWindowedEncoding.cs" />
     119    <Compile Include="Variants\Capacitated\Heterogenous\IHeterogenousCapacitatedProblemInstance.cs" />
     120    <Compile Include="Variants\Capacitated\Heterogenous\IHeterogenousCapacitatedOperator.cs" />
     121    <Compile Include="Variants\Capacitated\Heterogenous\IHeterogenousCapacitatedEncoding.cs" />
     122    <Compile Include="Variants\Capacitated\Homogenous\ICapacitatedEncoding.cs" />
     123    <Compile Include="Variants\Capacitated\Homogenous\ICapacitatedOperator.cs" />
     124    <Compile Include="Variants\Capacitated\Homogenous\ICapacitatedProblemInstance.cs" />
     125    <Compile Include="Variants\SingleDepot\ISingleDepotOperator.cs" />
     126    <Compile Include="Variants\SingleDepot\ISingleDepotEncoding.cs" />
     127    <Compile Include="Variants\SingleDepot\ISingleDepotProblemInstance.cs" />
     128    <Compile Include="Variants\TimeWindowed\ITimeWindowedProblemInstance.cs" />
     129    <Compile Include="Variants\TimeWindowed\ITimeWindowedOperator.cs" />
     130    <Compile Include="Variants\TimeWindowed\ITimeWindowedEncoding.cs" />
    131131    <Compile Include="Parsers\ORLIBParser.cs" />
    132     <Compile Include="ProblemInstances\CVRPTWProblemInstance.cs" />
    133     <Compile Include="ProblemInstances\CVRPProblemInstance.cs" />
    134     <Compile Include="ProblemInstances\Evaluation\CVRPTWEvaluation.cs" />
    135     <Compile Include="ProblemInstances\Evaluation\CVRPEvaluation.cs" />
    136     <Compile Include="ProblemInstances\Evaluation\Evaluators\SingleDepotVRPEvaluator.cs" />
    137     <Compile Include="ProblemInstances\Evaluation\Evaluators\VRPEvaluator.cs" />
    138     <Compile Include="ProblemInstances\Evaluation\VRPEvaluation.cs" />
    139     <Compile Include="ProblemInstances\SingleDepotVRPProblemInstance.cs" />
     132    <Compile Include="ProblemInstances\SingleDepotVRP\CVRP\CVRPTW\CVRPTWProblemInstance.cs" />
     133    <Compile Include="ProblemInstances\SingleDepotVRP\CVRP\CVRPProblemInstance.cs" />
     134    <Compile Include="ProblemInstances\SingleDepotVRP\CVRP\CVRPTW\CVRPTWEvaluation.cs" />
     135    <Compile Include="ProblemInstances\SingleDepotVRP\CVRP\CVRPEvaluation.cs" />
     136    <Compile Include="ProblemInstances\SingleDepotVRP\CVRP\CVRPTW\CVRPTWEvaluator.cs" />
     137    <Compile Include="ProblemInstances\SingleDepotVRP\CVRP\CVRPEvaluator.cs" />
     138    <Compile Include="ProblemInstances\SingleDepotVRP\SingleDepotVRPEvaluator.cs" />
     139    <Compile Include="ProblemInstances\VRPEvaluator.cs" />
     140    <Compile Include="ProblemInstances\VRPEvaluation.cs" />
     141    <Compile Include="ProblemInstances\SingleDepotVRP\SingleDepotVRPProblemInstance.cs" />
    140142    <Compile Include="ProblemInstances\VRPProblemInstance.cs" />
    141     <Compile Include="DomainModel\Tour.cs" />
     143    <Compile Include="Encodings\Tour.cs" />
    142144    <Compile Include="Parsers\TSPLIBParser.cs" />
    143145    <Compile Include="HeuristicLabProblemsVehicleRoutingPlugin.cs" />
     
    222224    </BootstrapperPackage>
    223225  </ItemGroup>
    224   <ItemGroup>
    225     <Folder Include="ProblemInstances\Evaluation\MoveEvaluators\" />
    226   </ItemGroup>
     226  <ItemGroup />
    227227  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    228228  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/HeuristicLabProblemsVehicleRoutingPlugin.cs

    r4362 r4363  
    2626  /// Plugin class for HeuristicLab.Problems.VehicleRouting plugin
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Problems.VehicleRouting", "3.4.0.4361")]
     28  [Plugin("HeuristicLab.Problems.VehicleRouting", "3.4.0.4362")]
    2929  [PluginFile("HeuristicLab.Problems.VehicleRouting-3.4.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Analysis", "3.3")]
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Interfaces/IVRPEncoding.cs

    r4362 r4363  
    2525using System.Text;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Problems.VehicleRouting.DomainModel;
    2827
    2928namespace HeuristicLab.Problems.VehicleRouting.Interfaces {
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Interfaces/IVRPEvaluator.cs

    r4362 r4363  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Optimization;
    28 using HeuristicLab.Problems.VehicleRouting.DomainModel;
    2928
    3029namespace HeuristicLab.Problems.VehicleRouting.Interfaces {
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Interfaces/IVRPProblemInstance.cs

    r4362 r4363  
    2727using HeuristicLab.Core;
    2828using HeuristicLab.Data;
    29 using HeuristicLab.Problems.VehicleRouting.DomainModel;
    3029
    3130namespace HeuristicLab.Problems.VehicleRouting.Interfaces {
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPEvaluation.cs

    r4362 r4363  
    44using System.Text;
    55
    6 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances.Evaluation {
     6namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
    77  public class CVRPEvaluation: VRPEvaluation {
    88    public double Overload { get; set; }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPProblemInstance.cs

    r4362 r4363  
    3131using HeuristicLab.Optimization;
    3232using HeuristicLab.PluginInfrastructure;
    33 using HeuristicLab.Problems.VehicleRouting.Interfaces.Variants;
     33using HeuristicLab.Problems.VehicleRouting.Variants;
    3434
    3535namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
     
    3737  [StorableClass]
    3838  public class CVRPProblemInstance: SingleDepotVRPProblemInstance, ICapacitatedProblemInstance {
    39     protected ValueParameter<DoubleValue> CapacityParameter {
    40       get { return (ValueParameter<DoubleValue>)Parameters["Capacity"]; }
     39    protected IValueParameter<DoubleValue> CapacityParameter {
     40      get { return (IValueParameter<DoubleValue>)Parameters["Capacity"]; }
    4141    }
    42     public IValueParameter<DoubleValue> OverloadPenaltyParameter {
     42    protected IValueParameter<DoubleValue> OverloadPenaltyParameter {
    4343      get { return (IValueParameter<DoubleValue>)Parameters["EvalOverloadPenalty"]; }
    4444    }
     
    5959      }
    6060    }
     61
     62    protected override IVRPEvaluator Evaluator {
     63      get {
     64        return new CVRPEvaluator();
     65      }
     66    }
    6167   
    6268    [StorableConstructor]
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWEvaluation.cs

    r4362 r4363  
    44using System.Text;
    55
    6 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances.Evaluation {
     6namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
    77  public class CVRPTWEvaluation: CVRPEvaluation {
    88    public double Tardiness { get; set; }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWProblemInstance.cs

    r4362 r4363  
    3131using HeuristicLab.Optimization;
    3232using HeuristicLab.PluginInfrastructure;
    33 using HeuristicLab.Problems.VehicleRouting.Interfaces.Variants;
     33using HeuristicLab.Problems.VehicleRouting.Variants;
    3434
    3535namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
     
    3737  [StorableClass]
    3838  public class CVRPTWProblemInstance: CVRPProblemInstance, ITimeWindowedProblemInstance {
    39     protected ValueParameter<DoubleArray> ReadyTimeParameter {
    40       get { return (ValueParameter<DoubleArray>)Parameters["ReadyTime"]; }
     39    protected IValueParameter<DoubleArray> ReadyTimeParameter {
     40      get { return (IValueParameter<DoubleArray>)Parameters["ReadyTime"]; }
    4141    }
    42     protected ValueParameter<DoubleArray> DueTimeParameter {
    43       get { return (ValueParameter<DoubleArray>)Parameters["DueTime"]; }
     42    protected IValueParameter<DoubleArray> DueTimeParameter {
     43      get { return (IValueParameter<DoubleArray>)Parameters["DueTime"]; }
    4444    }
    45     protected ValueParameter<DoubleArray> ServiceTimeParameter {
    46       get { return (ValueParameter<DoubleArray>)Parameters["ServiceTime"]; }
     45    protected IValueParameter<DoubleArray> ServiceTimeParameter {
     46      get { return (IValueParameter<DoubleArray>)Parameters["ServiceTime"]; }
    4747    }
    4848
     
    8181      }
    8282    }
     83
     84    protected override IVRPEvaluator Evaluator {
     85      get {
     86        return new CVRPTWEvaluator();
     87      }
     88    }
    8389   
    8490    [StorableConstructor]
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/SingleDepotVRPEvaluator.cs

    r4362 r4363  
    3131using HeuristicLab.Optimization;
    3232using HeuristicLab.PluginInfrastructure;
    33 using HeuristicLab.Problems.VehicleRouting.Interfaces.Variants;
     33using HeuristicLab.Problems.VehicleRouting.Variants;
    3434using HeuristicLab.Problems.VehicleRouting.Encodings;
    35 using HeuristicLab.Problems.VehicleRouting.DomainModel;
    3635
    37 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances.Evaluation {
     36
     37namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
    3838  [Item("SingleDepotVRPEvaluator", "Represents a single depot VRP evaluator.")]
    3939  [StorableClass]
    4040  public class SingleDepotVRPEvaluator: VRPEvaluator {
    4141    protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour) {
     42      double distance = 0.0;
     43      double quality = 0.0;
    4244
     45      //simulate a tour, start and end at depot
     46      for (int i = 0; i <= tour.Stops.Count; i++) {
     47        int start = 0;
     48        if (i > 0)
     49          start = tour.Stops[i - 1];
     50        int end = 0;
     51        if (i < tour.Stops.Count)
     52          end = tour.Stops[i];
     53
     54        //drive there
     55        double currentDistace = instance.GetDistance(start, end);
     56        distance += currentDistace;
     57      }
     58
     59      //Fleet usage
     60      quality += instance.FleetUsageFactor.Value;
     61      //Distance
     62      quality += instance.DistanceFactor.Value * distance;
     63
     64      eval.Distance = distance;
     65      eval.VehicleUtilization = 1;
     66
     67      eval.Quality = quality;
    4368    }
    4469   
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/SingleDepotVRPProblemInstance.cs

    r4362 r4363  
    3131using HeuristicLab.Optimization;
    3232using HeuristicLab.PluginInfrastructure;
    33 using HeuristicLab.Problems.VehicleRouting.Interfaces.Variants;
    34 using HeuristicLab.Problems.VehicleRouting.ProblemInstances.Evaluation;
     33using HeuristicLab.Problems.VehicleRouting.Variants;
    3534
    3635namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPEvaluation.cs

    r4362 r4363  
    44using System.Text;
    55
    6 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances.Evaluation {
     6namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
    77  public class VRPEvaluation {
    88    public double Quality { get; set; }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPEvaluator.cs

    r4362 r4363  
    3131using HeuristicLab.Optimization;
    3232using HeuristicLab.PluginInfrastructure;
    33 using HeuristicLab.Problems.VehicleRouting.Interfaces.Variants;
     33using HeuristicLab.Problems.VehicleRouting.Variants;
    3434using HeuristicLab.Problems.VehicleRouting.Encodings;
    35 using HeuristicLab.Problems.VehicleRouting.DomainModel;
    3635
    37 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances.Evaluation {
     36namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
    3837  [Item("VRPEvaluator", "Represents a VRP evaluator.")]
    3938  [StorableClass]
     
    4443   
    4544    #region ISingleObjectiveEvaluator Members
    46 
    4745    public ILookupParameter<DoubleValue> QualityParameter {
    4846      get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
    4947    }
     48    #endregion
    5049
    5150    public ILookupParameter<DoubleValue> DistanceParameter {
     
    5554      get { return (ILookupParameter<DoubleValue>)Parameters["VehiclesUtilized"]; }
    5655    }
    57 
    58     public ILookupParameter<DoubleValue> FleetUsageFactor {
    59       get { return (ILookupParameter<DoubleValue>)Parameters["EvalFleetUsageFactor"]; }
    60     }
    61     public ILookupParameter<DoubleValue> DistanceFactor {
    62       get { return (ILookupParameter<DoubleValue>)Parameters["EvalDistanceFactor"]; }
    63     }
    64 
    65     #endregion
    6656   
    6757    [StorableConstructor]
     
    7060    public VRPEvaluator() {
    7161      Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The VRP tours which should be evaluated."));
    72 
    73       Parameters.Add(new LookupParameter<DoubleValue>("EvalFleetUsageFactor", "The fleet usage factor considered in the evaluation."));
    74       Parameters.Add(new LookupParameter<DoubleValue>("EvalDistanceFactor", "The distance factor considered in the evaluation."));
    7562
    7663      Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The evaluated quality of the VRP solution."));
     
    8572    protected abstract void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour);
    8673
    87     protected VRPEvaluation EvaluateTour(IVRPProblemInstance instance, Tour tour) {
    88       VRPEvaluation evaluation = CreateTourEvaluation();
    89       EvaluateTour(evaluation, instance, tour);
    90       return evaluation;
    91     }
    92 
    9374    protected virtual void InitResultParameters() {
    9475      QualityParameter.ActualValue = new DoubleValue(0);
     
    10182      VehcilesUtilizedParameter.ActualValue.Value += tourEvaluation.VehicleUtilization;
    10283      DistanceParameter.ActualValue.Value += tourEvaluation.Distance;
     84    }
     85
     86    protected VRPEvaluation EvaluateTour(IVRPProblemInstance instance, Tour tour) {
     87      VRPEvaluation evaluation = CreateTourEvaluation();
     88      EvaluateTour(evaluation, instance, tour);
     89      return evaluation;
    10390    }
    10491
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

    r4362 r4363  
    3131using HeuristicLab.Optimization;
    3232using HeuristicLab.PluginInfrastructure;
    33 using HeuristicLab.Problems.VehicleRouting.DomainModel;
    3433
    3534namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Variants/Capacitated/Heterogenous/IHeterogenousCapacitatedEncoding.cs

    r4362 r4363  
    2525using System.Text;
    2626
    27 namespace HeuristicLab.Problems.VehicleRouting.Interfaces.Variants {
     27namespace HeuristicLab.Problems.VehicleRouting.Variants {
    2828  public interface IHeterogenousCapacitatedEncoding: ICapacitatedEncoding {
    2929    List<int> GetVehicleAssignment();
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Variants/Capacitated/Heterogenous/IHeterogenousCapacitatedOperator.cs

    r4362 r4363  
    2525using System.Text;
    2626
    27 namespace HeuristicLab.Problems.VehicleRouting.Interfaces.Variants {
     27namespace HeuristicLab.Problems.VehicleRouting.Variants {
    2828  public interface IHeterogenousCapacitatedOperator: ICapacitatedOperator {
    2929  }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Variants/Capacitated/Heterogenous/IHeterogenousCapacitatedProblemInstance.cs

    r4362 r4363  
    2525using System.Text;
    2626
    27 namespace HeuristicLab.Problems.VehicleRouting.Interfaces.Variants {
     27namespace HeuristicLab.Problems.VehicleRouting.Variants {
    2828  public interface IHeterogenousCapacitatedProblemInstance : ICapacitatedProblemInstance {
    2929  }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Variants/Capacitated/Homogenous/ICapacitatedEncoding.cs

    r4362 r4363  
    2424using System.Linq;
    2525using System.Text;
     26using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2627
    27 namespace HeuristicLab.Problems.VehicleRouting.Interfaces.Variants {
     28namespace HeuristicLab.Problems.VehicleRouting.Variants {
    2829  public interface ICapacitatedEncoding: IVRPEncoding {
    2930  }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Variants/Capacitated/Homogenous/ICapacitatedOperator.cs

    r4362 r4363  
    2424using System.Linq;
    2525using System.Text;
     26using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2627
    27 namespace HeuristicLab.Problems.VehicleRouting.Interfaces.Variants {
     28namespace HeuristicLab.Problems.VehicleRouting.Variants {
    2829  public interface ICapacitatedOperator: IVRPOperator {
    2930  }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Variants/Capacitated/Homogenous/ICapacitatedProblemInstance.cs

    r4362 r4363  
    2525using System.Text;
    2626using HeuristicLab.Data;
     27using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2728
    28 namespace HeuristicLab.Problems.VehicleRouting.Interfaces.Variants {
     29namespace HeuristicLab.Problems.VehicleRouting.Variants {
    2930  public interface ICapacitatedProblemInstance: IVRPProblemInstance {
    3031    DoubleValue Capacity { get; }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Variants/SingleDepot/ISingleDepotEncoding.cs

    r4362 r4363  
    2424using System.Linq;
    2525using System.Text;
     26using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2627
    27 namespace HeuristicLab.Problems.VehicleRouting.Interfaces.Variants {
     28namespace HeuristicLab.Problems.VehicleRouting.Variants {
    2829  public interface ISingleDepotEncoding: IVRPEncoding {
    2930  }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Variants/SingleDepot/ISingleDepotOperator.cs

    r4362 r4363  
    2424using System.Linq;
    2525using System.Text;
     26using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2627
    27 namespace HeuristicLab.Problems.VehicleRouting.Interfaces.Variants {
     28namespace HeuristicLab.Problems.VehicleRouting.Variants {
    2829  public interface ISingleDepotOperator: IVRPOperator {
    2930  }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Variants/SingleDepot/ISingleDepotProblemInstance.cs

    r4362 r4363  
    2424using System.Linq;
    2525using System.Text;
     26using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2627
    27 namespace HeuristicLab.Problems.VehicleRouting.Interfaces.Variants {
     28namespace HeuristicLab.Problems.VehicleRouting.Variants {
    2829  public interface ISingleDepotProblemInstance: IVRPProblemInstance {
    2930  }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Variants/TimeWindowed/ITimeWindowedEncoding.cs

    r4362 r4363  
    2424using System.Linq;
    2525using System.Text;
     26using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2627
    27 namespace HeuristicLab.Problems.VehicleRouting.Interfaces.Variants {
     28namespace HeuristicLab.Problems.VehicleRouting.Variants {
    2829  public interface ITimeWindowedEncoding: IVRPEncoding {
    2930  }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Variants/TimeWindowed/ITimeWindowedOperator.cs

    r4362 r4363  
    2424using System.Linq;
    2525using System.Text;
     26using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2627
    27 namespace HeuristicLab.Problems.VehicleRouting.Interfaces.Variants {
     28namespace HeuristicLab.Problems.VehicleRouting.Variants {
    2829  public interface ITimeWindowedOperator: IVRPOperator {
    2930  }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Variants/TimeWindowed/ITimeWindowedProblemInstance.cs

    r4362 r4363  
    2525using System.Text;
    2626using HeuristicLab.Data;
     27using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2728
    28 namespace HeuristicLab.Problems.VehicleRouting.Interfaces.Variants {
     29namespace HeuristicLab.Problems.VehicleRouting.Variants {
    2930  public interface ITimeWindowedProblemInstance: IVRPProblemInstance {
    3031    DoubleArray ReadyTime { get; }
Note: See TracChangeset for help on using the changeset viewer.