Changeset 6046 for branches/histogram/HeuristicLab.Problems.VehicleRouting

Timestamp:

04/23/11 10:00:31 (14 years ago)

Author:

abeham

Message:

#1465

• updated branch with trunk changes

Location:

branches/histogram

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting/3.3/HeuristicLab.Problems.VehicleRouting-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.VehicleRouting/3.3/Interfaces/IVRPMultiNeighborhoodShakingOperator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Interfaces/IVRPMultiNeighborhoodShakingOperator.cs)
• HeuristicLab.Problems.VehicleRouting/3.3/ShakingOperators (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/ShakingOperators)
• HeuristicLab.Problems.VehicleRouting/3.3/ShakingOperators/VehicleRoutingShakingOperator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/ShakingOperators/VehicleRoutingShakingOperator.cs)
• HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs (modified) (1 diff)

branches/histogram

@@ -10 +10 @@
 protoc.exe
 HeuristicLab 3.3.5.1.ReSharper.user
+*.psess
+*.vsp

@@ -10 +10 @@
 protoc.exe
 HeuristicLab 3.3.5.1.ReSharper.user
+*.psess
+*.vsp

branches/histogram/HeuristicLab.Problems.VehicleRouting/3.3/HeuristicLab.Problems.VehicleRouting-3.3.csproj

@@ -19 +19 @@
     </UpgradeBackupLocation>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile></TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -111 +112 @@
     <Compile Include="Analyzers\BestVRPToursMemorizer.cs" />
     <Compile Include="Analyzers\BestVRPSolutionAnalyzer.cs" />
+    <Compile Include="Interfaces\IVRPMultiNeighborhoodShakingOperator.cs" />
+    <Compile Include="ShakingOperators\VehicleRoutingShakingOperator.cs" />
     <Compile Include="SolutionParser.cs" />
     <Compile Include="Encodings\Alba\Crossovers\AlbaPermutationCrossover.cs" />

branches/histogram/HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs

@@ -607 +607 @@
         op.VRPToursParameter.ActualName = SolutionCreator.VRPToursParameter.ActualName;
       }
+
+      foreach (var op in Operators.OfType<IVRPMultiNeighborhoodShakingOperator>()) {
+        op.VRPToursParameter.ActualName = SolutionCreator.VRPToursParameter.ActualName;
+      }
     }
     private void ClearDistanceMatrix() {

@@ -10 +10 @@
 protoc.exe
 HeuristicLab 3.3.5.1.ReSharper.user
+*.psess
+*.vsp