- Timestamp:
- 07/08/16 14:40:02 (8 years ago)
- Location:
- branches/crossvalidation-2434
- Files:
-
- 8 edited
- 5 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/crossvalidation-2434
- Property svn:mergeinfo changed
-
branches/crossvalidation-2434/HeuristicLab.Problems.Instances.TSPLIB/3.3/HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj
r11650 r14029 115 115 </ItemGroup> 116 116 <ItemGroup> 117 <Compile Include="TSPLIBHeterogeneousPTSPDataDescriptor.cs" /> 118 <Compile Include="TSPLIBHomogeneousPTSPDataDescriptor.cs" /> 119 <Compile Include="TSPLIBHeterogeneousPTSPInstanceProvider.cs" /> 120 <Compile Include="TSPLIBPTSPInstanceProvider.cs" /> 117 121 <Compile Include="TSPLIBInstanceProvider.cs" /> 118 122 <Compile Include="TSPLIBATSPInstanceProvider.cs" /> 119 123 <Compile Include="TSPLIBCVRPInstanceProvider.cs" /> 120 124 <Compile Include="TSPLIBDataDescriptor.cs" /> 125 <Compile Include="TSPLIBHomogeneousPTSPInstanceProvider.cs" /> 121 126 <Compile Include="TSPLIBTSPInstanceProvider.cs" /> 122 127 <Compile Include="TSPLIBParser.cs" /> … … 150 155 </ProjectReference> 151 156 </ItemGroup> 152 <ItemGroup />153 157 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 154 158 <PropertyGroup> -
branches/crossvalidation-2434/HeuristicLab.Problems.Instances.TSPLIB/3.3/Plugin.cs.frame
r12753 r14029 23 23 24 24 namespace HeuristicLab.Problems.Instances.TSPLIB { 25 [Plugin("HeuristicLab.Problems.Instances.TSPLIB", "3.3.1 2.$WCREV$")]25 [Plugin("HeuristicLab.Problems.Instances.TSPLIB", "3.3.13.$WCREV$")] 26 26 [PluginFile("HeuristicLab.Problems.Instances.TSPLIB-3.3.dll", PluginFileType.Assembly)] 27 27 [PluginDependency("HeuristicLab.Problems.Instances", "3.3")] -
branches/crossvalidation-2434/HeuristicLab.Problems.Instances.TSPLIB/3.3/Properties/AssemblyInfo.cs.frame
r12753 r14029 55 55 // [assembly: AssemblyVersion("1.0.*")] 56 56 [assembly: AssemblyVersion("3.3.0.0")] 57 [assembly: AssemblyFileVersion("3.3.1 2.$WCREV$")]57 [assembly: AssemblyFileVersion("3.3.13.$WCREV$")] -
branches/crossvalidation-2434/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBATSPInstanceProvider.cs
r12012 r14029 36 36 protected override string FileExtension { get { return "atsp"; } } 37 37 38 protected override ATSPData LoadInstance(TSPLIBParser parser ) {38 protected override ATSPData LoadInstance(TSPLIBParser parser, IDataDescriptor descriptor = null) { 39 39 var instance = new ATSPData(); 40 40 -
branches/crossvalidation-2434/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBCVRPInstanceProvider.cs
r12012 r14029 36 36 protected override string FileExtension { get { return "vrp"; } } 37 37 38 protected override CVRPData LoadInstance(TSPLIBParser parser ) {38 protected override CVRPData LoadInstance(TSPLIBParser parser, IDataDescriptor descriptor = null) { 39 39 parser.Parse(); 40 40 var instance = new CVRPData(); -
branches/crossvalidation-2434/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBInstanceProvider.cs
r12012 r14029 45 45 protected abstract string FileExtension { get; } 46 46 47 protected abstract T LoadInstance(TSPLIBParser parser );47 protected abstract T LoadInstance(TSPLIBParser parser, IDataDescriptor descriptor = null); 48 48 protected abstract void LoadSolution(TSPLIBParser parser, T instance); 49 49 … … 74 74 var stream = entry.Open(); 75 75 var parser = new TSPLIBParser(stream); 76 var instance = LoadInstance(parser );76 var instance = LoadInstance(parser, id); 77 77 78 78 if (!String.IsNullOrEmpty(descriptor.SolutionIdentifier)) { -
branches/crossvalidation-2434/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs
r12012 r14029 37 37 protected override string FileExtension { get { return "tsp"; } } 38 38 39 protected override TSPData LoadInstance(TSPLIBParser parser ) {39 protected override TSPData LoadInstance(TSPLIBParser parser, IDataDescriptor descriptor = null) { 40 40 parser.Parse(); 41 41 if (parser.FixedEdges != null) throw new InvalidDataException("TSP instance " + parser.Name + " contains fixed edges which are not supported by HeuristicLab.");
Note: See TracChangeset
for help on using the changeset viewer.