Free cookie consent management tool by TermsFeed Policy Generator

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

#1722 fixed more licensing information and source formatting

Location:
trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/CVRPInterpreter.cs

    r7881 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.
    … …  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     22using HeuristicLab.Data;
    2623using HeuristicLab.Problems.Instances;
    27 using HeuristicLab.Problems.VehicleRouting.Interfaces;
     24using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
    2825using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
    29 using HeuristicLab.Data;
    30 using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
    3126
    3227namespace HeuristicLab.Problems.VehicleRouting.Interpreters {
    33   public class CVRPInterpreter: IVRPDataInterpreter<CVRPData> {
     28  public class CVRPInterpreter : IVRPDataInterpreter<CVRPData> {
    3429    public VRPInstanceDescription Interpret(IVRPData data) {
    3530      CVRPData cvrpData = data as CVRPData;
    … …  
    4035
    4136      CVRPProblemInstance problem = new CVRPProblemInstance();
    42       if(cvrpData.Coordinates != null)
     37      if (cvrpData.Coordinates != null)
    4338        problem.Coordinates = new DoubleMatrix(cvrpData.Coordinates);
    4439      if (cvrpData.MaximumVehicles != null)
    … …  
    5853        PotvinEncoding solution = new PotvinEncoding(problem);
    5954
    60         for(int i = 0; i < cvrpData.BestKnownTour.GetLength(0); i++) {
     55        for (int i = 0; i < cvrpData.BestKnownTour.GetLength(0); i++) {
    6156          Tour tour = new Tour();
    6257          solution.Tours.Add(tour);
    … …  
    6661          }
    6762        }
    68        
     63
    6964        result.BestKnownSolution = solution;
    7065      }

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/CVRPTWInterpreter.cs

    r7881 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.
    … …  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     22using HeuristicLab.Data;
    2623using HeuristicLab.Problems.Instances;
    27 using HeuristicLab.Problems.VehicleRouting.Interfaces;
     24using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
    2825using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
    29 using HeuristicLab.Data;
    30 using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
    3126
    3227namespace HeuristicLab.Problems.VehicleRouting.Interpreters {
    33   public class CVRPTWInterpreter: IVRPDataInterpreter<CVRPTWData> {
     28  public class CVRPTWInterpreter : IVRPDataInterpreter<CVRPTWData> {
    3429    public VRPInstanceDescription Interpret(IVRPData data) {
    3530      CVRPTWData cvrpData = data as CVRPTWData;
    … …  
    4035
    4136      CVRPTWProblemInstance problem = new CVRPTWProblemInstance();
    42       if(cvrpData.Coordinates != null)
     37      if (cvrpData.Coordinates != null)
    4338        problem.Coordinates = new DoubleMatrix(cvrpData.Coordinates);
    4439      if (cvrpData.MaximumVehicles != null)
    … …  
    6156        PotvinEncoding solution = new PotvinEncoding(problem);
    6257
    63         for(int i = 0; i < cvrpData.BestKnownTour.GetLength(0); i++) {
     58        for (int i = 0; i < cvrpData.BestKnownTour.GetLength(0); i++) {
    6459          Tour tour = new Tour();
    6560          solution.Tours.Add(tour);
    … …  
    6964          }
    7065        }
    71        
     66
    7267        result.BestKnownSolution = solution;
    7368      }

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/IVRPDataInterpreter.cs

    r7871 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.
    … …  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    2622using HeuristicLab.Problems.Instances;
    2723using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3531    public IVRPEncoding BestKnownSolution { get; set; }
    3632  }
    37  
    38   public interface IVRPDataInterpreter  {
     33
     34  public interface IVRPDataInterpreter {
    3935    VRPInstanceDescription Interpret(IVRPData data);
    4036  }
    4137
    42   public interface IVRPDataInterpreter<T>: IVRPDataInterpreter where T : IVRPData {
     38  public interface IVRPDataInterpreter<T> : IVRPDataInterpreter where T : IVRPData {
    4339  }
    4440}

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/MDCVRPTWInterpreter.cs

    r7881 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.
    … …  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     22using HeuristicLab.Data;
    2623using HeuristicLab.Problems.Instances;
    27 using HeuristicLab.Problems.VehicleRouting.Interfaces;
     24using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
    2825using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
    29 using HeuristicLab.Data;
    30 using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
    3126
    3227namespace HeuristicLab.Problems.VehicleRouting.Interpreters {
    33   public class MDCVRPTWInterpreter: IVRPDataInterpreter<MDCVRPTWData> {
     28  public class MDCVRPTWInterpreter : IVRPDataInterpreter<MDCVRPTWData> {
    3429    public VRPInstanceDescription Interpret(IVRPData data) {
    3530      MDCVRPTWData cvrpData = data as MDCVRPTWData;
    … …  
    4035
    4136      MDCVRPTWProblemInstance problem = new MDCVRPTWProblemInstance();
    42       if(cvrpData.Coordinates != null)
     37      if (cvrpData.Coordinates != null)
    4338        problem.Coordinates = new DoubleMatrix(cvrpData.Coordinates);
    4439      if (cvrpData.MaximumVehicles != null)
    … …  
    6560        PotvinEncoding solution = new PotvinEncoding(problem);
    6661
    67         for(int i = 0; i < cvrpData.BestKnownTour.GetLength(0); i++) {
     62        for (int i = 0; i < cvrpData.BestKnownTour.GetLength(0); i++) {
    6863          Tour tour = new Tour();
    6964          solution.Tours.Add(tour);
    … …  
    7368          }
    7469        }
    75        
     70
    7671        result.BestKnownSolution = solution;
    7772      }

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/PDPTWInterpreter.cs

    r7881 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.
    … …  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     22using HeuristicLab.Data;
    2623using HeuristicLab.Problems.Instances;
    27 using HeuristicLab.Problems.VehicleRouting.Interfaces;
     24using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
    2825using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
    29 using HeuristicLab.Data;
    30 using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
    3126
    3227namespace HeuristicLab.Problems.VehicleRouting.Interpreters {
    33   public class PDPTWInterpreter: IVRPDataInterpreter<PDPTWData> {
     28  public class PDPTWInterpreter : IVRPDataInterpreter<PDPTWData> {
    3429    public VRPInstanceDescription Interpret(IVRPData data) {
    3530      PDPTWData cvrpData = data as PDPTWData;
    … …  
    4035
    4136      CVRPPDTWProblemInstance problem = new CVRPPDTWProblemInstance();
    42       if(cvrpData.Coordinates != null)
     37      if (cvrpData.Coordinates != null)
    4338        problem.Coordinates = new DoubleMatrix(cvrpData.Coordinates);
    4439      if (cvrpData.MaximumVehicles != null)
    … …  
    6257        PotvinEncoding solution = new PotvinEncoding(problem);
    6358
    64         for(int i = 0; i < cvrpData.BestKnownTour.GetLength(0); i++) {
     59        for (int i = 0; i < cvrpData.BestKnownTour.GetLength(0); i++) {
    6560          Tour tour = new Tour();
    6661          solution.Tours.Add(tour);
    … …  
    7065          }
    7166        }
    72        
     67
    7368        result.BestKnownSolution = solution;
    7469      }
Note: See TracChangeset for help on using the changeset viewer.