Free cookie consent management tool by TermsFeed Policy Generator

Changeset 7618


Ignore:
Timestamp:
03/15/12 13:22:32 (13 years ago)
Author:
abeham
Message:

#1782:

  • Removed individual files of the TSPLIB and added zip files (using compression, but fastest)
  • Added SharpZipLib reference
  • Added base class for all TSPLIB instance providers to avoid code duplication
  • Added a new test list for all instance specific unit tests
Location:
trunk/sources
Files:
5 added
3 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab 3.3.vsmdi

    r6938 r7618  
    33  <TestList name="Create Samples Tests" id="12acbb59-0ff6-4a9a-8f98-201e7d9412f9" parentListId="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
    44    <TestLinks>
    5       <TestLink id="fc406b79-142c-bb12-8287-0bc768acd728" name="CreateIslandGaTspSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    6       <TestLink id="77c479e4-8f9a-5474-b026-e5c0811c8eb0" name="CreateLocalSearchKnapsackSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    7       <TestLink id="45db65d6-d6b2-67e4-1bec-293528739529" name="CreateEsGriewankSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    8       <TestLink id="74b708a9-14d0-3cc3-d72e-139d1a27f5ef" name="CreateGaTspSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    9       <TestLink id="5c5fb63e-d219-6818-bba2-9f66dbe4d727" name="CreateGpSymbolicRegressionSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    10       <TestLink id="6c054fba-432a-4fe2-507f-e2083c998056" name="CreatePsoSchwefelSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    11       <TestLink id="0b6b45a4-99ea-b020-805a-1652f0f5b5a7" name="CreateSimulatedAnnealingRastriginSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    12       <TestLink id="51e968a7-120f-dd28-9514-ad35d3ee66d2" name="CreateGaVrpSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    13       <TestLink id="0d883f66-2fc5-99fc-eabb-2dff566104f5" name="CreateTabuSearchTspSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    14       <TestLink id="c8ea68e8-b9d7-24cb-5540-655f58da13bf" name="CreateGpArtificialAntSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    15       <TestLink id="e6f3ab8a-1630-560c-c8b9-4e8ce2522172" name="CreateVnsTspSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    16       <TestLink id="29257c28-7dfb-f227-00a4-776d74b02a7b" name="CreateGpSymbolicClassificationSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     5      <TestLink id="fc406b79-142c-bb12-8287-0bc768acd728" name="CreateIslandGaTspSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     6      <TestLink id="77c479e4-8f9a-5474-b026-e5c0811c8eb0" name="CreateLocalSearchKnapsackSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     7      <TestLink id="45db65d6-d6b2-67e4-1bec-293528739529" name="CreateEsGriewankSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     8      <TestLink id="5c5fb63e-d219-6818-bba2-9f66dbe4d727" name="CreateGpSymbolicRegressionSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     9      <TestLink id="6c054fba-432a-4fe2-507f-e2083c998056" name="CreatePsoSchwefelSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     10      <TestLink id="0b6b45a4-99ea-b020-805a-1652f0f5b5a7" name="CreateSimulatedAnnealingRastriginSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     11      <TestLink id="74b708a9-14d0-3cc3-d72e-139d1a27f5ef" name="CreateGaTspSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     12      <TestLink id="51e968a7-120f-dd28-9514-ad35d3ee66d2" name="CreateGaVrpSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     13      <TestLink id="0d883f66-2fc5-99fc-eabb-2dff566104f5" name="CreateTabuSearchTspSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     14      <TestLink id="c8ea68e8-b9d7-24cb-5540-655f58da13bf" name="CreateGpArtificialAntSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     15      <TestLink id="e6f3ab8a-1630-560c-c8b9-4e8ce2522172" name="CreateVnsTspSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     16      <TestLink id="29257c28-7dfb-f227-00a4-776d74b02a7b" name="CreateGpSymbolicClassificationSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     17    </TestLinks>
     18  </TestList>
     19  <TestList name="Problem Instances" id="25141565-14fd-4cfe-ad7e-116a167b7661" parentListId="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
     20    <TestLinks>
     21      <TestLink id="6d995522-f0fc-4c71-ad6d-98b511b6dc87" name="GetTSPLIBCVRPInstanceTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     22      <TestLink id="a4a79e51-0e00-0079-3cda-edacb878ba09" name="TestQAPLIBSolutions" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     23      <TestLink id="bc0d1af3-feb0-ab88-2bd3-7548e2139393" name="GetTSPLIBTSPInstanceTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     24      <TestLink id="9e776d58-b350-7ae8-ed84-1d29b0aa02c3" name="GetTSPLIBATSPInstanceTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     25      <TestLink id="b3134ddf-d188-708f-0ea7-9eae51d3614a" name="TestQAPLIBInstances" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     26      <TestLink id="fc5f5e65-3fea-b18a-a0f9-3c32141a324b" name="GetCordeauGQAPInstanceTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     27      <TestLink id="0cd31467-2b80-e093-20df-1d629b0c4b47" name="GetElloumiCTAPInstanceTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    1728    </TestLinks>
    1829  </TestList>
    1930  <TestList name="Basic Tests" id="3f8b3bd5-248c-46a8-84cf-7d035eb3c815" parentListId="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
    2031    <TestLinks>
    21       <TestLink id="36916402-ba0c-751d-366b-380dac87dcef" name="CheckPluginDependenciesForReferencedAssemblies" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    22       <TestLink id="29ead60b-2ae7-821a-ccc3-e5e4769661b7" name="TestStorableConstructor" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    23       <TestLink id="2028e687-d144-bb6f-bb05-ac86eaec07ee" name="TestCloningAllDeepCloneables" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    24       <TestLink id="3983eb26-fd15-5b88-1fd7-07b363511b10" name="TestCloningConstructor" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    25       <TestLink id="34ed65f1-46f7-d2e6-64cc-c2d958294d8b" name="CheckReferenceAssembliesForPluginDependencies" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    26       <TestLink id="ec4d1ddf-ed6b-9f9e-29a0-d9e558856af1" name="ContentViewAttributeTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     32      <TestLink id="36916402-ba0c-751d-366b-380dac87dcef" name="CheckPluginDependenciesForReferencedAssemblies" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     33      <TestLink id="29ead60b-2ae7-821a-ccc3-e5e4769661b7" name="TestStorableConstructor" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     34      <TestLink id="2028e687-d144-bb6f-bb05-ac86eaec07ee" name="TestCloningAllDeepCloneables" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     35      <TestLink id="3983eb26-fd15-5b88-1fd7-07b363511b10" name="TestCloningConstructor" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     36      <TestLink id="34ed65f1-46f7-d2e6-64cc-c2d958294d8b" name="CheckReferenceAssembliesForPluginDependencies" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     37      <TestLink id="ec4d1ddf-ed6b-9f9e-29a0-d9e558856af1" name="ContentViewAttributeTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    2738    </TestLinks>
    2839  </TestList>
    2940  <TestList name="Run Samples Tests" id="40b94fb3-06ad-41f8-bb3f-dc90c2510684" parentListId="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
    3041    <TestLinks>
    31       <TestLink id="8bb23f49-5206-4245-08b9-471f543b3e21" name="RunGpSymbolicRegressionSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    32       <TestLink id="1f743a89-461d-5650-31ba-e68c02f0fbad" name="RunGaVrpSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    33       <TestLink id="f8489a03-acca-11d3-53cb-8e24d5f2bc12" name="RunIslandGaTspSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    34       <TestLink id="0f7f90f7-e380-ff65-538e-ae559774092a" name="RunPsoSchwefelSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    35       <TestLink id="53547167-fc2b-4954-b200-2cc27b4c4951" name="RunVnsTspSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    36       <TestLink id="7512aa68-9dbe-f891-d1da-99dc94661142" name="RunEsGriewankSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    37       <TestLink id="433a86f1-0126-5281-1c23-90b47f066d94" name="RunGpSymbolicClassificationSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    38       <TestLink id="eec82cf0-dae7-63c8-a469-6dd84d49a935" name="RunGaTspSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    39       <TestLink id="7d7f6024-f783-1c71-db60-2d6746653109" name="RunSimulatedAnnealingRastriginSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    40       <TestLink id="29188193-8d50-0c61-c6fa-4d5b608a72e8" name="RunGpArtificialAntSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    41       <TestLink id="95278ae9-832c-bef9-0bbc-4432195e63fa" name="RunTabuSearchTspSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    42       <TestLink id="21f1371d-8c47-9588-d8fa-cf45fd1d81eb" name="RunLocalSearchKnapsackSampleTest" storage="heuristiclab.tests\bin\release\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     42      <TestLink id="8bb23f49-5206-4245-08b9-471f543b3e21" name="RunGpSymbolicRegressionSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     43      <TestLink id="1f743a89-461d-5650-31ba-e68c02f0fbad" name="RunGaVrpSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     44      <TestLink id="f8489a03-acca-11d3-53cb-8e24d5f2bc12" name="RunIslandGaTspSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     45      <TestLink id="0f7f90f7-e380-ff65-538e-ae559774092a" name="RunPsoSchwefelSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     46      <TestLink id="53547167-fc2b-4954-b200-2cc27b4c4951" name="RunVnsTspSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     47      <TestLink id="7512aa68-9dbe-f891-d1da-99dc94661142" name="RunEsGriewankSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     48      <TestLink id="433a86f1-0126-5281-1c23-90b47f066d94" name="RunGpSymbolicClassificationSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     49      <TestLink id="eec82cf0-dae7-63c8-a469-6dd84d49a935" name="RunGaTspSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     50      <TestLink id="7d7f6024-f783-1c71-db60-2d6746653109" name="RunSimulatedAnnealingRastriginSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     51      <TestLink id="29188193-8d50-0c61-c6fa-4d5b608a72e8" name="RunGpArtificialAntSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     52      <TestLink id="95278ae9-832c-bef9-0bbc-4432195e63fa" name="RunTabuSearchTspSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     53      <TestLink id="21f1371d-8c47-9588-d8fa-cf45fd1d81eb" name="RunLocalSearchKnapsackSampleTest" storage="heuristiclab.tests\bin\debug\heuristiclab.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    4354    </TestLinks>
    4455  </TestList>

  • trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3/HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj

    r7600 r7618  
    102102  </PropertyGroup>
    103103  <ItemGroup>
     104    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
     105      <Private>False</Private>
     106    </Reference>
    104107    <Reference Include="System" />
    105108    <Reference Include="System.Core" />
    … …  
    107110  </ItemGroup>
    108111  <ItemGroup>
     112    <Compile Include="TSPLIBInstanceProvider.cs" />
    109113    <Compile Include="TSPLIBATSPInstanceProvider.cs" />
    110114    <Compile Include="TSPLIBCVRPInstanceProvider.cs" />
    … …  
    112116    <Compile Include="TSPLIBTSPInstanceProvider.cs" />
    113117    <Compile Include="TSPLIBParser.cs" />
    114     <EmbeddedResource Include="Data\TSP\a280.opt.tour" />
    115     <EmbeddedResource Include="Data\TSP\a280.tsp" />
    116     <EmbeddedResource Include="Data\TSP\ali535.tsp" />
    117     <EmbeddedResource Include="Data\TSP\att48.opt.tour" />
    118     <EmbeddedResource Include="Data\TSP\att48.tsp" />
    119     <EmbeddedResource Include="Data\TSP\att532.tsp" />
    120     <EmbeddedResource Include="Data\TSP\bayg29.opt.tour" />
    121     <EmbeddedResource Include="Data\TSP\bayg29.tsp" />
    122     <EmbeddedResource Include="Data\TSP\bays29.opt.tour" />
    123     <EmbeddedResource Include="Data\TSP\bays29.tsp" />
    124     <EmbeddedResource Include="Data\TSP\berlin52.opt.tour" />
    125     <EmbeddedResource Include="Data\TSP\berlin52.tsp" />
    126     <EmbeddedResource Include="Data\TSP\bier127.tsp" />
    127     <EmbeddedResource Include="Data\TSP\brazil58.tsp" />
    128     <EmbeddedResource Include="Data\TSP\brd14051.tsp" />
    129     <EmbeddedResource Include="Data\TSP\brg180.opt.tour" />
    130     <EmbeddedResource Include="Data\TSP\brg180.tsp" />
    131     <EmbeddedResource Include="Data\TSP\burma14.tsp" />
    132     <EmbeddedResource Include="Data\TSP\ch130.opt.tour" />
    133     <EmbeddedResource Include="Data\TSP\ch130.tsp" />
    134     <EmbeddedResource Include="Data\TSP\ch150.opt.tour" />
    135     <EmbeddedResource Include="Data\TSP\ch150.tsp" />
    136     <EmbeddedResource Include="Data\TSP\d1291.tsp" />
    137     <EmbeddedResource Include="Data\TSP\d15112.tsp" />
    138     <EmbeddedResource Include="Data\TSP\d1655.tsp" />
    139     <EmbeddedResource Include="Data\TSP\d18512.tsp" />
    140     <EmbeddedResource Include="Data\TSP\d198.tsp" />
    141     <EmbeddedResource Include="Data\TSP\d2103.tsp" />
    142     <EmbeddedResource Include="Data\TSP\d493.tsp" />
    143     <EmbeddedResource Include="Data\TSP\d657.tsp" />
    144     <EmbeddedResource Include="Data\TSP\dantzig42.tsp" />
    145     <EmbeddedResource Include="Data\TSP\dsj1000.tsp" />
    146     <EmbeddedResource Include="Data\TSP\eil101.opt.tour" />
    147     <EmbeddedResource Include="Data\TSP\eil101.tsp" />
    148     <EmbeddedResource Include="Data\TSP\eil51.opt.tour" />
    149     <EmbeddedResource Include="Data\TSP\eil51.tsp" />
    150     <EmbeddedResource Include="Data\TSP\eil76.opt.tour" />
    151     <EmbeddedResource Include="Data\TSP\eil76.tsp" />
    152     <EmbeddedResource Include="Data\TSP\fl1400.tsp" />
    153     <EmbeddedResource Include="Data\TSP\fl1577.tsp" />
    154     <EmbeddedResource Include="Data\TSP\fl3795.tsp" />
    155     <EmbeddedResource Include="Data\TSP\fl417.tsp" />
    156     <EmbeddedResource Include="Data\TSP\fnl4461.tsp" />
    157     <EmbeddedResource Include="Data\TSP\fri26.opt.tour" />
    158     <EmbeddedResource Include="Data\TSP\fri26.tsp" />
    159     <EmbeddedResource Include="Data\TSP\gil262.tsp" />
    160     <EmbeddedResource Include="Data\TSP\gr120.opt.tour" />
    161     <EmbeddedResource Include="Data\TSP\gr120.tsp" />
    162     <EmbeddedResource Include="Data\TSP\gr137.tsp" />
    163     <EmbeddedResource Include="Data\TSP\gr17.tsp" />
    164     <EmbeddedResource Include="Data\TSP\gr202.opt.tour" />
    165     <EmbeddedResource Include="Data\TSP\gr202.tsp" />
    166     <EmbeddedResource Include="Data\TSP\gr21.tsp" />
    167     <EmbeddedResource Include="Data\TSP\gr229.tsp" />
    168     <EmbeddedResource Include="Data\TSP\gr24.opt.tour" />
    169     <EmbeddedResource Include="Data\TSP\gr24.tsp" />
    170     <EmbeddedResource Include="Data\TSP\gr431.tsp" />
    171     <EmbeddedResource Include="Data\TSP\gr48.opt.tour" />
    172     <EmbeddedResource Include="Data\TSP\gr48.tsp" />
    173     <EmbeddedResource Include="Data\TSP\gr666.opt.tour" />
    174     <EmbeddedResource Include="Data\TSP\gr666.tsp" />
    175     <EmbeddedResource Include="Data\TSP\gr96.opt.tour" />
    176     <EmbeddedResource Include="Data\TSP\gr96.tsp" />
    177     <EmbeddedResource Include="Data\TSP\hk48.tsp" />
    178     <EmbeddedResource Include="Data\TSP\kroA100.opt.tour" />
    179     <EmbeddedResource Include="Data\TSP\kroA100.tsp" />
    180     <EmbeddedResource Include="Data\TSP\kroA150.tsp" />
    181     <EmbeddedResource Include="Data\TSP\kroA200.tsp" />
    182     <EmbeddedResource Include="Data\TSP\kroB100.tsp" />
    183     <EmbeddedResource Include="Data\TSP\kroB150.tsp" />
    184     <EmbeddedResource Include="Data\TSP\kroB200.tsp" />
    185     <EmbeddedResource Include="Data\TSP\kroC100.opt.tour" />
    186     <EmbeddedResource Include="Data\TSP\kroC100.tsp" />
    187     <EmbeddedResource Include="Data\TSP\kroD100.opt.tour" />
    188     <EmbeddedResource Include="Data\TSP\kroD100.tsp" />
    189     <EmbeddedResource Include="Data\TSP\kroE100.tsp" />
    190     <EmbeddedResource Include="Data\TSP\lin105.opt.tour" />
    191     <EmbeddedResource Include="Data\TSP\lin105.tsp" />
    192     <EmbeddedResource Include="Data\TSP\lin318.tsp" />
    193     <EmbeddedResource Include="Data\TSP\nrw1379.tsp" />
    194     <EmbeddedResource Include="Data\TSP\p654.tsp" />
    195     <EmbeddedResource Include="Data\TSP\pa561.opt.tour" />
    196     <EmbeddedResource Include="Data\TSP\pa561.tsp" />
    197     <EmbeddedResource Include="Data\TSP\pcb1173.tsp" />
    198     <EmbeddedResource Include="Data\TSP\pcb3038.tsp" />
    199     <EmbeddedResource Include="Data\TSP\pcb442.opt.tour" />
    200     <EmbeddedResource Include="Data\TSP\pcb442.tsp" />
    201     <EmbeddedResource Include="Data\TSP\pla33810.tsp" />
    202     <EmbeddedResource Include="Data\TSP\pla7397.tsp" />
    203     <EmbeddedResource Include="Data\TSP\pla85900.tsp" />
    204     <EmbeddedResource Include="Data\TSP\pr1002.opt.tour" />
    205     <EmbeddedResource Include="Data\TSP\pr1002.tsp" />
    206     <EmbeddedResource Include="Data\TSP\pr107.tsp" />
    207     <EmbeddedResource Include="Data\TSP\pr124.tsp" />
    208     <EmbeddedResource Include="Data\TSP\pr136.tsp" />
    209     <EmbeddedResource Include="Data\TSP\pr144.tsp" />
    210     <EmbeddedResource Include="Data\TSP\pr152.tsp" />
    211     <EmbeddedResource Include="Data\TSP\pr226.tsp" />
    212     <EmbeddedResource Include="Data\TSP\pr2392.opt.tour" />
    213     <EmbeddedResource Include="Data\TSP\pr2392.tsp" />
    214     <EmbeddedResource Include="Data\TSP\pr264.tsp" />
    215     <EmbeddedResource Include="Data\TSP\pr299.tsp" />
    216     <EmbeddedResource Include="Data\TSP\pr439.tsp" />
    217     <EmbeddedResource Include="Data\TSP\pr76.opt.tour" />
    218     <EmbeddedResource Include="Data\TSP\pr76.tsp" />
    219     <EmbeddedResource Include="Data\TSP\rat195.tsp" />
    220     <EmbeddedResource Include="Data\TSP\rat575.tsp" />
    221     <EmbeddedResource Include="Data\TSP\rat783.tsp" />
    222     <EmbeddedResource Include="Data\TSP\rat99.tsp" />
    223     <EmbeddedResource Include="Data\TSP\rd100.opt.tour" />
    224     <EmbeddedResource Include="Data\TSP\rd100.tsp" />
    225     <EmbeddedResource Include="Data\TSP\rd400.tsp" />
    226     <EmbeddedResource Include="Data\TSP\rl11849.tsp" />
    227     <EmbeddedResource Include="Data\TSP\rl1304.tsp" />
    228     <EmbeddedResource Include="Data\TSP\rl1323.tsp" />
    229     <EmbeddedResource Include="Data\TSP\rl1889.tsp" />
    230     <EmbeddedResource Include="Data\TSP\rl5915.tsp" />
    231     <EmbeddedResource Include="Data\TSP\rl5934.tsp" />
    232     <EmbeddedResource Include="Data\TSP\si1032.tsp" />
    233     <EmbeddedResource Include="Data\TSP\si175.tsp" />
    234     <EmbeddedResource Include="Data\TSP\si535.tsp" />
    235     <EmbeddedResource Include="Data\TSP\st70.opt.tour" />
    236     <EmbeddedResource Include="Data\TSP\st70.tsp" />
    237     <EmbeddedResource Include="Data\TSP\swiss42.tsp" />
    238     <EmbeddedResource Include="Data\TSP\ts225.tsp" />
    239     <EmbeddedResource Include="Data\TSP\tsp225.opt.tour" />
    240     <EmbeddedResource Include="Data\TSP\tsp225.tsp" />
    241     <EmbeddedResource Include="Data\TSP\u1060.tsp" />
    242     <EmbeddedResource Include="Data\TSP\u1432.tsp" />
    243     <EmbeddedResource Include="Data\TSP\u159.tsp" />
    244     <EmbeddedResource Include="Data\TSP\u1817.tsp" />
    245     <EmbeddedResource Include="Data\TSP\u2152.tsp" />
    246     <EmbeddedResource Include="Data\TSP\u2319.tsp" />
    247     <EmbeddedResource Include="Data\TSP\u574.tsp" />
    248     <EmbeddedResource Include="Data\TSP\u724.tsp" />
    249     <EmbeddedResource Include="Data\TSP\ulysses16.opt.tour" />
    250     <EmbeddedResource Include="Data\TSP\ulysses16.tsp" />
    251     <EmbeddedResource Include="Data\TSP\ulysses22.opt.tour" />
    252     <EmbeddedResource Include="Data\TSP\ulysses22.tsp" />
    253     <EmbeddedResource Include="Data\TSP\usa13509.tsp" />
    254     <EmbeddedResource Include="Data\TSP\vm1084.tsp" />
    255     <EmbeddedResource Include="Data\TSP\vm1748.tsp" />
    256     <EmbeddedResource Include="Data\ATSP\br17.atsp" />
    257     <EmbeddedResource Include="Data\ATSP\ft53.atsp" />
    258     <EmbeddedResource Include="Data\ATSP\ft70.atsp" />
    259     <EmbeddedResource Include="Data\ATSP\ftv170.atsp" />
    260     <EmbeddedResource Include="Data\ATSP\ftv33.atsp" />
    261     <EmbeddedResource Include="Data\ATSP\ftv35.atsp" />
    262     <EmbeddedResource Include="Data\ATSP\ftv38.atsp" />
    263     <EmbeddedResource Include="Data\ATSP\ftv44.atsp" />
    264     <EmbeddedResource Include="Data\ATSP\ftv47.atsp" />
    265     <EmbeddedResource Include="Data\ATSP\ftv55.atsp" />
    266     <EmbeddedResource Include="Data\ATSP\ftv64.atsp" />
    267     <EmbeddedResource Include="Data\ATSP\ftv70.atsp" />
    268     <EmbeddedResource Include="Data\ATSP\kro124p.atsp" />
    269     <EmbeddedResource Include="Data\ATSP\p43.atsp" />
    270     <EmbeddedResource Include="Data\ATSP\rbg323.atsp" />
    271     <EmbeddedResource Include="Data\ATSP\rbg358.atsp" />
    272     <EmbeddedResource Include="Data\ATSP\rbg403.atsp" />
    273     <EmbeddedResource Include="Data\ATSP\rbg443.atsp" />
    274     <EmbeddedResource Include="Data\ATSP\ry48p.atsp" />
    275     <EmbeddedResource Include="Data\CVRP\att48.vrp" />
    276     <EmbeddedResource Include="Data\CVRP\eil13.vrp" />
    277     <EmbeddedResource Include="Data\CVRP\eil22.vrp" />
    278     <EmbeddedResource Include="Data\CVRP\eil23.vrp" />
    279     <EmbeddedResource Include="Data\CVRP\eil30.vrp" />
    280     <EmbeddedResource Include="Data\CVRP\eil31.vrp" />
    281     <EmbeddedResource Include="Data\CVRP\eil33.vrp" />
    282     <EmbeddedResource Include="Data\CVRP\eil51.vrp" />
    283     <EmbeddedResource Include="Data\CVRP\eil7.vrp" />
    284     <EmbeddedResource Include="Data\CVRP\eilA101.vrp" />
    285     <EmbeddedResource Include="Data\CVRP\eilA76.vrp" />
    286     <EmbeddedResource Include="Data\CVRP\eilB101.vrp" />
    287     <EmbeddedResource Include="Data\CVRP\eilB76.vrp" />
    288     <EmbeddedResource Include="Data\CVRP\eilC76.vrp" />
    289     <EmbeddedResource Include="Data\CVRP\eilD76.vrp" />
    290     <EmbeddedResource Include="Data\CVRP\gil262.vrp" />
     118    <EmbeddedResource Include="Data\atsp.zip" />
     119    <EmbeddedResource Include="Data\tsp.zip" />
     120    <EmbeddedResource Include="Data\tsp.opt.tour.zip" />
     121    <EmbeddedResource Include="Data\vrp.zip" />
    291122    <None Include="Plugin.cs.frame" />
    292123    <Compile Include="Plugin.cs" />

  • trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBATSPInstanceProvider.cs

    r7548 r7618  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.IO;
    2523using System.Linq;
    26 using System.Reflection;
    27 using System.Text.RegularExpressions;
    2824
    2925namespace HeuristicLab.Problems.Instances.TSPLIB {
    30   public class TSPLIBATSPInstanceProvider : ProblemInstanceProvider<ATSPData> {
     26  public class TSPLIBATSPInstanceProvider : TSPLIBInstanceProvider<ATSPData> {
    3127
    3228    public override string Name {
    … …  
    3834    }
    3935
    40     public override Uri WebLink {
    41       get { return new Uri("http://comopt.ifi.uni-heidelberg.de/software/TSPLIB95/"); }
    42     }
     36    protected override string FileExtension { get { return "atsp"; } }
    4337
    44     public override string ReferencePublication {
    45       get {
    46         return @"G. Reinelt. 1991.
    47 TSPLIB - A Traveling Salesman Problem Library.
    48 ORSA Journal on Computing, 3, pp. 376-384.";
    49       }
    50     }
    51 
    52     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
    53       var solutions = Assembly.GetExecutingAssembly()
    54         .GetManifestResourceNames()
    55         .Where(x => Regex.Match(x, @".*\.Data\.ATSP\..*").Success)
    56         .Where(x => x.EndsWith(".opt.tour"))
    57         .ToDictionary(x => x.Substring(0, x.Length - ".opt.tour".Length) + ".atsp", x => x);
    58 
    59       return Assembly.GetExecutingAssembly()
    60           .GetManifestResourceNames()
    61         .Where(x => Regex.Match(x, @".*\.Data\.ATSP\..*").Success)
    62           .Where(x => x.EndsWith(".atsp"))
    63           .OrderBy(x => x)
    64           .Select(x => new TSPLIBDataDescriptor(GetPrettyName(x), GetDescription(), x, solutions.ContainsKey(x) ? solutions[x] : String.Empty));
    65     }
    66 
    67     public override ATSPData LoadData(IDataDescriptor id) {
    68       var descriptor = (TSPLIBDataDescriptor)id;
    69       using (var stream = Assembly.GetExecutingAssembly()
    70         .GetManifestResourceStream(descriptor.InstanceIdentifier)) {
    71         var instance = Load(new TSPLIBParser(stream));
    72 
    73         if (!String.IsNullOrEmpty(descriptor.SolutionIdentifier)) {
    74           using (Stream solStream = Assembly.GetExecutingAssembly()
    75             .GetManifestResourceStream(descriptor.SolutionIdentifier)) {
    76             var tourParser = new TSPLIBParser(solStream);
    77             tourParser.Parse();
    78             instance.BestKnownTour = tourParser.Tour[0];
    79           }
    80         }
    81         return instance;
    82       }
    83     }
    84 
    85     public override ATSPData LoadData(string path) {
    86       return Load(new TSPLIBParser(path));
    87     }
    88 
    89     public override void SaveData(ATSPData instance, string path) {
    90       throw new NotSupportedException();
    91     }
    92 
    93     private ATSPData Load(TSPLIBParser parser) {
     38    protected override ATSPData LoadInstance(TSPLIBParser parser) {
    9439      var instance = new ATSPData();
    9540
    … …  
    10247      instance.Description = parser.Comment
    10348        + Environment.NewLine + Environment.NewLine
    104         + GetDescription();
     49        + GetInstanceDescription();
    10550
    10651      return instance;
    10752    }
    10853
    109     private string GetPrettyName(string instanceIdentifier) {
    110       return Regex.Match(instanceIdentifier, GetType().Namespace + @"\.Data\.ATSP\.(.*)\.atsp").Groups[1].Captures[0].Value;
    111     }
    112 
    113     private string GetDescription() {
    114       return "Embedded instance of plugin version " + Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true).Cast<AssemblyFileVersionAttribute>().First().Version + ".";
     54    protected override void LoadSolution(TSPLIBParser parser, ATSPData instance) {
     55      parser.Parse();
     56      instance.BestKnownTour = parser.Tour.FirstOrDefault();
    11557    }
    11658  }

  • trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBCVRPInstanceProvider.cs

    r7548 r7618  
    2121
    2222using System;
    23 using System.Collections.Generic;
    2423using System.IO;
    25 using System.Linq;
    26 using System.Reflection;
    27 using System.Text.RegularExpressions;
    2824
    2925namespace HeuristicLab.Problems.Instances.TSPLIB {
    30   public class TSPLIBCVRPInstanceProvider : ProblemInstanceProvider<CVRPData> {
     26  public class TSPLIBCVRPInstanceProvider : TSPLIBInstanceProvider<CVRPData> {
    3127
    3228    public override string Name {
    … …  
    3834    }
    3935
    40     public override Uri WebLink {
    41       get { return new Uri("http://comopt.ifi.uni-heidelberg.de/software/TSPLIB95/"); }
    42     }
     36    protected override string FileExtension { get { return "vrp"; } }
    4337
    44     public override string ReferencePublication {
    45       get {
    46         return @"G. Reinelt. 1991.
    47 TSPLIB - A Traveling Salesman Problem Library.
    48 ORSA Journal on Computing, 3, pp. 376-384.";
    49       }
    50     }
    51 
    52     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
    53       var solutions = Assembly.GetExecutingAssembly()
    54         .GetManifestResourceNames()
    55         .Where(x => Regex.Match(x, @".*\.Data\.CVRP\..*").Success)
    56         .Where(x => x.EndsWith(".opt.tour"))
    57         .ToDictionary(x => x.Substring(0, x.Length - ".opt.tour".Length) + ".vrp", x => x);
    58 
    59       return Assembly.GetExecutingAssembly()
    60           .GetManifestResourceNames()
    61           .Where(x => Regex.Match(x, @".*\.Data\.CVRP\..*").Success)
    62           .OrderBy(x => x)
    63           .Select(x => new TSPLIBDataDescriptor(GetPrettyName(x), GetDescription(), x, solutions.ContainsKey(x) ? solutions[x] : String.Empty));
    64     }
    65 
    66     public override CVRPData LoadData(IDataDescriptor id) {
    67       var descriptor = (TSPLIBDataDescriptor)id;
    68       using (var stream = Assembly.GetExecutingAssembly()
    69         .GetManifestResourceStream(descriptor.InstanceIdentifier)) {
    70         var instance = Load(new TSPLIBParser(stream));
    71 
    72         if (!String.IsNullOrEmpty(descriptor.SolutionIdentifier)) {
    73           using (Stream solStream = Assembly.GetExecutingAssembly()
    74             .GetManifestResourceStream(descriptor.SolutionIdentifier)) {
    75             var slnParser = new TSPLIBParser(solStream);
    76             slnParser.Parse();
    77             instance.BestKnownTour = slnParser.Tour;
    78           }
    79         }
    80         return instance;
    81       }
    82     }
    83 
    84     public override CVRPData LoadData(string path) {
    85       return Load(new TSPLIBParser(path));
    86     }
    87 
    88     public override void SaveData(CVRPData instance, string path) {
    89       throw new NotSupportedException();
    90     }
    91 
    92     private CVRPData Load(TSPLIBParser parser) {
     38    protected override CVRPData LoadInstance(TSPLIBParser parser) {
    9339      parser.Parse();
    9440      var instance = new CVRPData();
    … …  
    12369      instance.Description = parser.Comment
    12470        + Environment.NewLine + Environment.NewLine
    125         + GetDescription();
     71        + GetInstanceDescription();
    12672
    12773      return instance;
    12874    }
    12975
    130     private string GetPrettyName(string instanceIdentifier) {
    131       return Regex.Match(instanceIdentifier, GetType().Namespace + @"\.Data\.CVRP\.(.*)\.vrp").Groups[1].Captures[0].Value;
    132     }
    133 
    134     private string GetDescription() {
    135       return "Embedded instance of plugin version " + Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true).Cast<AssemblyFileVersionAttribute>().First().Version + ".";
     76    protected override void LoadSolution(TSPLIBParser parser, CVRPData instance) {
     77      parser.Parse();
     78      instance.BestKnownTour = parser.Tour;
    13679    }
    13780  }

  • trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs

    r7558 r7618  
    2121
    2222using System;
    23 using System.Collections.Generic;
    2423using System.IO;
    2524using System.Linq;
    26 using System.Reflection;
    27 using System.Text.RegularExpressions;
    2825
    2926namespace HeuristicLab.Problems.Instances.TSPLIB {
    30   public class TSPLIBTSPInstanceProvider : ProblemInstanceProvider<TSPData> {
     27  public class TSPLIBTSPInstanceProvider : TSPLIBInstanceProvider<TSPData> {
    3128
    3229    public override string Name {
    … …  
    3835    }
    3936
    40     public override Uri WebLink {
    41       get { return new Uri("http://comopt.ifi.uni-heidelberg.de/software/TSPLIB95/"); }
    42     }
     37    protected override string FileExtension { get { return "tsp"; } }
    4338
    44     public override string ReferencePublication {
    45       get {
    46         return @"G. Reinelt. 1991.
    47 TSPLIB - A Traveling Salesman Problem Library.
    48 ORSA Journal on Computing, 3, pp. 376-384.";
    49       }
    50     }
    51 
    52     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
    53       var solutions = Assembly.GetExecutingAssembly()
    54         .GetManifestResourceNames()
    55         .Where(x => Regex.Match(x, @".*\.Data\.TSP\..*").Success)
    56         .Where(x => x.EndsWith(".opt.tour"))
    57         .ToDictionary(x => x.Substring(0, x.Length - ".opt.tour".Length) + ".tsp", x => x);
    58 
    59       return Assembly.GetExecutingAssembly()
    60         .GetManifestResourceNames()
    61         .Where(x => Regex.Match(x, @".*\.Data\.TSP\..*").Success)
    62         .Where(x => x.EndsWith(".tsp"))
    63         .OrderBy(x => x)
    64         .Select(x => new TSPLIBDataDescriptor(GetPrettyName(x), GetDescription(), x, solutions.ContainsKey(x) ? solutions[x] : String.Empty));
    65     }
    66 
    67     public override TSPData LoadData(IDataDescriptor id) {
    68       var descriptor = (TSPLIBDataDescriptor)id;
    69       using (var stream = Assembly.GetExecutingAssembly()
    70         .GetManifestResourceStream(descriptor.InstanceIdentifier)) {
    71         var parser = new TSPLIBParser(stream);
    72         var instance = Load(parser);
    73 
    74         if (!String.IsNullOrEmpty(descriptor.SolutionIdentifier)) {
    75           using (Stream solStream = Assembly.GetExecutingAssembly()
    76             .GetManifestResourceStream(descriptor.SolutionIdentifier)) {
    77             var tourParser = new TSPLIBParser(solStream);
    78             tourParser.Parse();
    79             instance.BestKnownTour = tourParser.Tour[0];
    80           }
    81         }
    82         return instance;
    83       }
    84     }
    85 
    86     public override TSPData LoadData(string path) {
    87       return Load(new TSPLIBParser(path));
    88     }
    89 
    90     public TSPData LoadData(string tspFile, string tourFile, double? bestQuality) {
    91       var data = Load(new TSPLIBParser(tspFile));
    92       if (bestQuality.HasValue)
    93         data.BestKnownQuality = bestQuality.Value;
    94       else data.BestKnownQuality = null;
    95       if (!String.IsNullOrEmpty(tourFile)) {
    96         var tourParser = new TSPLIBParser(tourFile);
    97         tourParser.Parse();
    98         data.BestKnownTour = tourParser.Tour[0];
    99       }
    100       return data;
    101     }
    102 
    103     public override void SaveData(TSPData instance, string path) {
    104       throw new NotSupportedException();
    105     }
    106 
    107     private TSPData Load(TSPLIBParser parser) {
     39    protected override TSPData LoadInstance(TSPLIBParser parser) {
    10840      parser.Parse();
    10941      if (parser.FixedEdges != null) throw new InvalidDataException("TSP instance " + parser.Name + " contains fixed edges which are not supported by HeuristicLab.");
    … …  
    14072      instance.Description = parser.Comment
    14173        + Environment.NewLine + Environment.NewLine
    142         + GetDescription();
     74        + GetInstanceDescription();
    14375      return instance;
    14476    }
    14577
    146     private string GetPrettyName(string instanceIdentifier) {
    147       return Regex.Match(instanceIdentifier, GetType().Namespace + @"\.Data\.TSP\.(.*)\.tsp").Groups[1].Captures[0].Value;
     78    protected override void LoadSolution(TSPLIBParser parser, TSPData instance) {
     79      parser.Parse();
     80      instance.BestKnownTour = parser.Tour.FirstOrDefault();
    14881    }
    14982
    150     private string GetDescription() {
    151       return "Embedded instance of plugin version " + Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true).Cast<AssemblyFileVersionAttribute>().First().Version + ".";
     83    public TSPData LoadData(string tspFile, string tourFile, double? bestQuality) {
     84      var data = LoadInstance(new TSPLIBParser(tspFile));
     85      if (!String.IsNullOrEmpty(tourFile)) {
     86        var tourParser = new TSPLIBParser(tourFile);
     87        LoadSolution(tourParser, data);
     88      }
     89      if (bestQuality.HasValue)
     90        data.BestKnownQuality = bestQuality.Value;
     91      return data;
    15292    }
     93
    15394  }
    15495}
Note: See TracChangeset for help on using the changeset viewer.