Changeset 8053 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/AlbaEncoding.cs

Timestamp:

06/19/12 13:17:29 (12 years ago)

Author:

ascheibe

Message:

#1722 fixed more licensing information and source formatting

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/AlbaEncoding.cs (modified) (8 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/AlbaEncoding.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -25 +26 @@
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System.Collections.Generic;
 using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
-using HeuristicLab.Problems.VehicleRouting.Variants;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
   [Item("AlbaEncoding", "Represents an Alba encoding of VRP solutions. It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
   [StorableClass]
-  public class AlbaEncoding : PermutationEncoding  {   
+  public class AlbaEncoding : PermutationEncoding {
     #region IVRPEncoding Members
     public override List<Tour> GetTours() {
@@ -40 +39 @@
 
       int cities = ProblemInstance.Cities.Value;
-      
+
       Tour tour = new Tour();
       for (int i = 0; i < this.array.Length; i++) {
@@ -77 +76 @@
             vehicleAssignment = this.array[i] - ProblemInstance.Cities.Value;
           }
-          
+
           i--;
         }
-      }
-      else
+      } else
         vehicleAssignment = this[lastStopIndex + 1] - this.ProblemInstance.Cities.Value;
 
@@ -123 +121 @@
     public static AlbaEncoding ConvertFrom(List<int> routeParam, IVRPProblemInstance instance) {
       List<int> route = new List<int>(routeParam);
-      
+
       int cities = instance.Cities.Value;
 
@@ -153 +151 @@
       int delimiter = 0;
       int arrayIndex = 0;
-      
+
       foreach (Tour tour in tours) {
         foreach (int city in tour.Stops) {
@@ -162 +160 @@
         if (arrayIndex != array.Length) {
           array[arrayIndex] = cities + encoding.GetVehicleAssignment(delimiter);
-          
+
           delimiter++;
           arrayIndex++;