Changeset 11235


Ignore:
Timestamp:
07/30/14 09:22:39 (8 years ago)
Author:
pfleck
Message:

#2208:

  • Implemented OrienteeringSolutionView
  • Fixed bug in tour cleanup
Location:
branches/HeuristicLab.Problems.Orienteering
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering.Views/3.3/HeuristicLab.Problems.Orienteering.Views-3.3.csproj

    r11189 r11235  
    5151      <DependentUpon>OrienteeringProblemView.cs</DependentUpon>
    5252    </Compile>
     53    <Compile Include="OrienteeringSolutionView.cs">
     54      <SubType>UserControl</SubType>
     55    </Compile>
     56    <Compile Include="OrienteeringSolutionView.Designer.cs">
     57      <DependentUpon>OrienteeringSolutionView.cs</DependentUpon>
     58    </Compile>
    5359    <Compile Include="Plugin.cs" />
    5460    <Compile Include="Properties\AssemblyInfo.cs" />
     
    7177      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    7278      <Name>HeuristicLab.Core-3.3</Name>
     79    </ProjectReference>
     80    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     81      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     82      <Name>HeuristicLab.Data-3.3</Name>
     83    </ProjectReference>
     84    <ProjectReference Include="..\..\HeuristicLab.Encodings.IntegerVectorEncoding\3.3\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj">
     85      <Project>{DDFB14DD-2A85-493C-A52D-E69729BBAEB0}</Project>
     86      <Name>HeuristicLab.Encodings.IntegerVectorEncoding-3.3</Name>
    7387    </ProjectReference>
    7488    <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

    r11228 r11235  
    214214      ).ToList();
    215215
    216       double tourLength = distances.CalculateTourLength(actualTour, fixedPenalty);
     216      //double tourLength = distances.CalculateTourLength(actualTour, fixedPenalty);
    217217
    218218      // As long as the created path is infeasible, remove elements
    219       while (tourLength > maxDistance) {
     219      while (distances.CalculateTourLength(actualTour, fixedPenalty) > maxDistance) {
    220220        // Remove the point that frees the largest distance
    221221        actualTour.RemoveAt(distanceSavings[0].Index);
    222         tourLength -= distanceSavings[0].Saving;
     222        //tourLength -= distanceSavings[0].Saving;
    223223
    224224        // Shift indices due to removal of a point in the tour
Note: See TracChangeset for help on using the changeset viewer.