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/Encodings/GVR
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Crossovers/GVRCrossover.cs

    r6851 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
     22using System.Collections.Generic;
     23using HeuristicLab.Common;
    2224using HeuristicLab.Core;
    23 using HeuristicLab.Encodings.PermutationEncoding;
     25using HeuristicLab.Optimization;
    2426using HeuristicLab.Parameters;
    2527using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Data;
    27 using HeuristicLab.Optimization;
    28 using System.Collections.Generic;
    2928using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    3029using HeuristicLab.Problems.VehicleRouting.Interfaces;
    31 using HeuristicLab.Common;
    3230
    3331namespace HeuristicLab.Problems.VehicleRouting.Encodings.GVR {
     
    6159      int length = random.Next(1, tour.Stops.Count - breakPoint1 + 1);
    6260      List<int> subroute = tour.Stops.GetRange(breakPoint1, length);
    63      
     61
    6462      //remove duplicates
    6563      List<Tour> toBeRemoved = new List<Tour>();
     
    104102      return child;
    105103    }
    106    
     104
    107105    public override IOperation Apply() {
    108106      ItemArray<IVRPEncoding> parents = new ItemArray<IVRPEncoding>(ParentsParameter.ActualValue.Length);
  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/GVREncoding.cs

    r7906 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
     22using System.Collections.Generic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Data;
    25 using HeuristicLab.Encodings.PermutationEncoding;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using System.Drawing;
    28 using System.Collections.Generic;
    2927using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    3028using HeuristicLab.Problems.VehicleRouting.Interfaces;
     
    3634  public class GVREncoding : TourEncoding {
    3735    public override List<Tour> GetTours() {
    38       List<Tour> tours = new List<Tour>();   
     36      List<Tour> tours = new List<Tour>();
    3937
    4038      foreach (Tour tour in base.Tours) {
     
    7371
    7472        tours.Remove(tour);
    75       } 
     73      }
    7674
    7775      return tours;
    7876    }
    79    
     77
    8078    public GVREncoding(IVRPProblemInstance problemInstance)
    8179      : base(problemInstance) {
  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/IGVROperator.cs

    r4379 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;
    26 using HeuristicLab.Problems.VehicleRouting.Interfaces;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.Core;
    29 using HeuristicLab.Parameters;
    30 using HeuristicLab.Operators;
    3122using HeuristicLab.Problems.VehicleRouting.Variants;
    3223
    3324namespace HeuristicLab.Problems.VehicleRouting.Encodings.GVR {
    34   public interface IGVROperator : 
    35     ISingleDepotOperator, IHomogenousCapacitatedOperator, ITimeWindowedOperator {   
     25  public interface IGVROperator :
     26    ISingleDepotOperator, IHomogenousCapacitatedOperator, ITimeWindowedOperator {
    3627  }
    3728}
  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRDisplacementManipulator.cs

    r4752 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 HeuristicLab.Core;
    23 using HeuristicLab.Encodings.PermutationEncoding;
    24 using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Data;
    2722using System.Collections.Generic;
    2823using HeuristicLab.Common;
     24using HeuristicLab.Core;
     25using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2926
    3027namespace HeuristicLab.Problems.VehicleRouting.Encodings.GVR {
     
    5653      //with a probability of 1/(2*V) create a new tour, else insert at another position
    5754      if (individual.GetTours().Count > 0 &&
    58         individual.GetTours().Count < ProblemInstance.Vehicles.Value && 
     55        individual.GetTours().Count < ProblemInstance.Vehicles.Value &&
    5956        random.Next(individual.GetTours().Count * 2) == 0) {
    6057        Tour newTour = new Tour();
  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRInsertionManipulator.cs

    r4752 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
     22using HeuristicLab.Common;
    2223using HeuristicLab.Core;
    23 using HeuristicLab.Encodings.PermutationEncoding;
    24 using HeuristicLab.Parameters;
    2524using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Data;
    27 using HeuristicLab.Common;
    2825
    2926namespace HeuristicLab.Problems.VehicleRouting.Encodings.GVR {
     
    5552
    5653      //with a probability of 1/(2*V) create a new tour, else insert at another position
    57       if (individual.GetTours().Count > 0 &&       
    58         individual.GetTours().Count < ProblemInstance.Vehicles.Value && 
     54      if (individual.GetTours().Count > 0 &&
     55        individual.GetTours().Count < ProblemInstance.Vehicles.Value &&
    5956        random.Next(individual.GetTours().Count * 2) == 0) {
    6057        Tour newTour = new Tour();
    6158        newTour.Stops.Add(customer);
    62        
     59
    6360        individual.Tours.Add(newTour);
    6461      } else {
  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRInversionManipulator.cs

    r4752 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
     22using HeuristicLab.Common;
    2223using HeuristicLab.Core;
    23 using HeuristicLab.Encodings.PermutationEncoding;
    24 using HeuristicLab.Parameters;
    2524using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Data;
    27 using HeuristicLab.Common;
    2825
    2926namespace HeuristicLab.Problems.VehicleRouting.Encodings.GVR {
  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRManipulator.cs

    r4752 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
     22using HeuristicLab.Common;
    2223using HeuristicLab.Core;
    23 using HeuristicLab.Encodings.PermutationEncoding;
     24using HeuristicLab.Optimization;
    2425using HeuristicLab.Parameters;
    2526using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Data;
    27 using HeuristicLab.Optimization;
    2827using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2928using HeuristicLab.Problems.VehicleRouting.Interfaces;
    30 using HeuristicLab.Common;
    3129
    3230namespace HeuristicLab.Problems.VehicleRouting.Encodings.GVR {
     
    5048
    5149    protected abstract void Manipulate(IRandom random, GVREncoding individual);
    52    
     50
    5351    public override IOperation Apply() {
    5452      IVRPEncoding solution = VRPToursParameter.ActualValue;
  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRSwapManipulator.cs

    r4752 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
     22using HeuristicLab.Common;
    2223using HeuristicLab.Core;
    23 using HeuristicLab.Encodings.PermutationEncoding;
    24 using HeuristicLab.Parameters;
    2524using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Data;
    27 using HeuristicLab.Common;
    2825
    2926namespace HeuristicLab.Problems.VehicleRouting.Encodings.GVR {
Note: See TracChangeset for help on using the changeset viewer.