Changeset 11235 for branches

Timestamp:

07/30/14 09:22:39 (10 years ago)

Author:

pfleck

Message:

#2208:

• Implemented OrienteeringSolutionView
• Fixed bug in tour cleanup

Location:

branches/HeuristicLab.Problems.Orienteering

Files:

• HeuristicLab.Problems.Orienteering.Views/3.3/HeuristicLab.Problems.Orienteering.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringSolutionView.Designer.cs (added)
• HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringSolutionView.cs (added)
• HeuristicLab.Problems.Orienteering/3.3/Shakers/OrienteeringShakingOperator.cs (modified) (1 diff)

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering.Views/3.3/HeuristicLab.Problems.Orienteering.Views-3.3.csproj

@@ -51 +51 @@
       <DependentUpon>OrienteeringProblemView.cs</DependentUpon>
     </Compile>
+    <Compile Include="OrienteeringSolutionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="OrienteeringSolutionView.Designer.cs">
+      <DependentUpon>OrienteeringSolutionView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -71 +77 @@
       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
       <Name>HeuristicLab.Core-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
+      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
+      <Name>HeuristicLab.Data-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.IntegerVectorEncoding\3.3\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj">
+      <Project>{DDFB14DD-2A85-493C-A52D-E69729BBAEB0}</Project>
+      <Name>HeuristicLab.Encodings.IntegerVectorEncoding-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/Shakers/OrienteeringShakingOperator.cs

@@ -214 +214 @@
       ).ToList();
 
-      double tourLength = distances.CalculateTourLength(actualTour, fixedPenalty);
+      //double tourLength = distances.CalculateTourLength(actualTour, fixedPenalty);
 
       // As long as the created path is infeasible, remove elements
-      while (tourLength > maxDistance) {
+      while (distances.CalculateTourLength(actualTour, fixedPenalty) > maxDistance) {
         // Remove the point that frees the largest distance
         actualTour.RemoveAt(distanceSavings[0].Index);
-        tourLength -= distanceSavings[0].Saving;
+        //tourLength -= distanceSavings[0].Saving;
 
         // Shift indices due to removal of a point in the tour