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

Location:
trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuCrossover.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.Zhu {
    … …  
    3735      get { return (LookupParameter<IRandom>)Parameters["Random"]; }
    3836    }
    39    
     37
    4038    [StorableConstructor]
    4139    protected ZhuCrossover(bool deserializing) : base(deserializing) { }

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuHeuristicCrossover1.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 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.Zhu {
    3027  [Item("ZhuHeuristicCrossover1", "The Zhu Heuristic Crossover (Version 1). It is implemented as described in Zhu, K.Q. (2000). A New Genetic Algorithm For VRPTW. Proceedings of the International Conference on Artificial Intelligence.")]
    3128  [StorableClass]
    32   public sealed class ZhuHeuristicCrossover1 : ZhuCrossover {   
     29  public sealed class ZhuHeuristicCrossover1 : ZhuCrossover {
    3330    [StorableConstructor]
    3431    private ZhuHeuristicCrossover1(bool deserializing) : base(deserializing) { }

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuHeuristicCrossover2.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
    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.Zhu {
    3128  [Item("ZhuHeuristicCrossover2", "The Zhu Heuristic Crossover (Version 2). It is implemented as described in Zhu, K.Q. (2000). A New Genetic Algorithm For VRPTW. Proceedings of the International Conference on Artificial Intelligence.")]
    3229  [StorableClass]
    33   public sealed class ZhuHeuristicCrossover2 : ZhuCrossover {   
     30  public sealed class ZhuHeuristicCrossover2 : ZhuCrossover {
    3431    [StorableConstructor]
    3532    private ZhuHeuristicCrossover2(bool deserializing) : base(deserializing) { }
    … …  
    6158      if (predecessor < 0)
    6259        predecessor = predecessor + child.Length;
    63      
     60
    6461      int parent1Index = i;
    6562      int parent2Index = i;
    … …  
    6865        if (i == breakPoint) {
    6966          child[i] = p1[parent1Index];
    70          
     67
    7168          p1.Remove(child[i]);
    7269          if (parent1Index >= p1.Count)

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuMergeCrossover1.cs

    r6771 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;
     24using HeuristicLab.Data;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Data;
    2726using HeuristicLab.Problems.VehicleRouting.Variants;
    28 using HeuristicLab.Common;
    2927
    3028namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
    3129  [Item("ZhuMergeCrossover1", "The Zhu Merge Crossover (Version 1). It is implemented as described in Zhu, K.Q. (2000). A New Genetic Algorithm For VRPTW. Proceedings of the International Conference on Artificial Intelligence.")]
    3230  [StorableClass]
    33   public sealed class ZhuMergeCrossover1 : ZhuCrossover {   
     31  public sealed class ZhuMergeCrossover1 : ZhuCrossover {
    3432    [StorableConstructor]
    3533    private ZhuMergeCrossover1(bool deserializing) : base(deserializing) { }
    … …  
    7169      if (ProblemInstance is ITimeWindowedProblemInstance) {
    7270        dueTime = (ProblemInstance as ITimeWindowedProblemInstance).DueTime;
    73       } 
     71      }
    7472
    7573      do {

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuMergeCrossover2.cs

    r6771 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;
    24 using HeuristicLab.Parameters;
     25using HeuristicLab.Data;
    2526using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Data;
    27 using System.Collections.Generic;
    2827using HeuristicLab.Problems.VehicleRouting.Variants;
    29 using HeuristicLab.Common;
    3028
    3129namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
    3230  [Item("ZhuMergeCrossover2", "The Zhu Merge Crossover (Version 2).  It is implemented as described in Zhu, K.Q. (2000). A New Genetic Algorithm For VRPTW. Proceedings of the International Conference on Artificial Intelligence.")]
    3331  [StorableClass]
    34   public sealed class ZhuMergeCrossover2 : ZhuCrossover {   
     32  public sealed class ZhuMergeCrossover2 : ZhuCrossover {
    3533    [StorableConstructor]
    3634    private ZhuMergeCrossover2(bool deserializing) : base(deserializing) { }
    … …  
    7270          child[i] = p1[parent1Index];
    7371        } else {
    74           if (dueTime != null && 
     72          if (dueTime != null &&
    7573            (dueTime[p1[parent1Index] + 1] <
    7674            dueTime[p2[parent2Index] + 1])) {

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuPermutationCrossover.cs

    r6771 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;
    2324using HeuristicLab.Encodings.PermutationEncoding;
    2425using HeuristicLab.Parameters;
    2526using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Data;
    27 using HeuristicLab.Common;
    2827
    2928namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
    3029  [Item("ZhuPermutationCrossover", "An operator which crosses two VRP representations using a standard permutation operator. It is implemented as described in Zhu, K.Q. (2000). A New Genetic Algorithm For VRPTW. Proceedings of the International Conference on Artificial Intelligence.")]
    3130  [StorableClass]
    32   public sealed class PrinsPermutationCrossover : ZhuCrossover {   
     31  public sealed class PrinsPermutationCrossover : ZhuCrossover {
    3332    public IValueLookupParameter<IPermutationCrossover> InnerCrossoverParameter {
    3433      get { return (IValueLookupParameter<IPermutationCrossover>)Parameters["InnerCrossover"]; }
Note: See TracChangeset for help on using the changeset viewer.