Changeset 8086 for branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/PDPTWInterpreter.cs

Timestamp:

06/22/12 11:11:38 (12 years ago)

Author:

jkarder

Message:

#1331:

• synced branch with trunk
• added custom interface (ISimilarityBasedOperator) to mark operators that conduct similarity calculation
• similarity calculators are now parameterized by the algorithm
• deleted SolutionPool2TierUpdateMethod
• deleted KnapsackMultipleGuidesPathRelinker
• moved IImprovementOperator, IPathRelinker and ISimilarityCalculator to HeuristicLab.Optimization
• added parameter descriptions
• fixed plugin references
• fixed count of EvaluatedSolutions
• fixed check for duplicate solutions
• minor code improvements

Location:

branches/ScatterSearch (trunk integration)

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting/3.4 (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4)
• HeuristicLab.Problems.VehicleRouting/3.4/Interpreters (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters)
• HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/PDPTWInterpreter.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/PDPTWInterpreter.cs) (5 diffs)

branches/ScatterSearch (trunk integration)

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/PDPTWInterpreter.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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using HeuristicLab.Data;
 using HeuristicLab.Problems.Instances;
-using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
-using HeuristicLab.Data;
-using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
 
 namespace HeuristicLab.Problems.VehicleRouting.Interpreters {
-  public class PDPTWInterpreter: IVRPDataInterpreter<PDPTWData> {
+  public class PDPTWInterpreter : IVRPDataInterpreter<PDPTWData> {
     public VRPInstanceDescription Interpret(IVRPData data) {
       PDPTWData cvrpData = data as PDPTWData;
@@ -40 +35 @@
 
       CVRPPDTWProblemInstance problem = new CVRPPDTWProblemInstance();
-      if(cvrpData.Coordinates != null)
+      if (cvrpData.Coordinates != null)
         problem.Coordinates = new DoubleMatrix(cvrpData.Coordinates);
       if (cvrpData.MaximumVehicles != null)
@@ -62 +57 @@
         PotvinEncoding solution = new PotvinEncoding(problem);
 
-        for(int i = 0; i < cvrpData.BestKnownTour.GetLength(0); i++) {
+        for (int i = 0; i < cvrpData.BestKnownTour.GetLength(0); i++) {
           Tour tour = new Tour();
           solution.Tours.Add(tour);
@@ -70 +65 @@
           }
         }
-        
+
         result.BestKnownSolution = solution;
       }

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests