- Timestamp:
- 09/29/11 15:51:56 (13 years ago)
- Location:
- branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4
- Files:
-
- 2 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/CVRPPDTWView.cs
r6789 r6851 95 95 96 96 t += Content.GetDistance( 97 lastCustomer, location );97 lastCustomer, location, Solution); 98 98 99 99 if (t < readyTime[location]) { -
branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/CVRPTWView.cs
r4374 r6851 76 76 77 77 t += Content.GetDistance( 78 lastCustomer, location );78 lastCustomer, location, Solution); 79 79 80 80 if (t < readyTime[location]) { -
branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/HeuristicLab.Problems.VehicleRouting.Views-3.4.csproj
r6710 r6851 112 112 </ItemGroup> 113 113 <ItemGroup> 114 <Compile Include="MultiDepotVRPView.cs"> 115 <SubType>UserControl</SubType> 116 </Compile> 117 <Compile Include="MultiDepotVRPView.Designer.cs"> 118 <DependentUpon>MultiDepotVRPView.cs</DependentUpon> 119 </Compile> 114 120 <Compile Include="CVRPPDTWView.cs"> 115 121 <SubType>UserControl</SubType> -
branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPImportDialog.Designer.cs
r6710 r6851 85 85 this.openVRPFileDialog.DefaultExt = "vrp"; 86 86 this.openVRPFileDialog.FileName = "vrp"; 87 this.openVRPFileDialog.Filter = "TSPLib Format|*.vrp|Solomon Format|*.txt|ORLib Format|*.txt|LiLim Format|*.txt ";88 this.openVRPFileDialog.Title = "Open TSP File";87 this.openVRPFileDialog.Filter = "TSPLib Format|*.vrp|Solomon Format|*.txt|ORLib Format|*.txt|LiLim Format|*.txt|Cordeau Format|*.md"; 88 this.openVRPFileDialog.Title = "Open VRP File"; 89 89 // 90 90 // tspFileLabel -
branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPImportDialog.cs
r6710 r6851 27 27 28 28 namespace HeuristicLab.Problems.VehicleRouting.Views { 29 public enum VRPFormat { Empty, TSPLib, Solomon, ORLib, LiLim }29 public enum VRPFormat { Empty, TSPLib, Solomon, ORLib, LiLim, Cordeau } 30 30 31 31 public sealed partial class VRPImportDialog : Form { -
branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/VehicleRoutingProblemView.cs
r6710 r6851 86 86 Content.ImportFromLiLim(vrpImportDialog.VRPFileName); 87 87 break; 88 89 case VRPFormat.Cordeau: 90 Content.ImportFromCordeau(vrpImportDialog.VRPFileName); 91 break; 88 92 } 89 93
Note: See TracChangeset
for help on using the changeset viewer.