Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/16/12 16:28:49 (12 years ago)
Author:
gkronber
Message:

merged r7609:7840 from trunk into time series branch

Location:
branches/HeuristicLab.TimeSeries
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.TimeSeries

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances.TSPLIB/3.3/HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj

    r7600 r7842  
    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" />
    … …  
    301132      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    302133      <Name>HeuristicLab.Common-3.3</Name>
     134      <Private>False</Private>
    303135    </ProjectReference>
    304136    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    305137      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    306138      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     139      <Private>False</Private>
    307140    </ProjectReference>
    308141    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    309142      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    310143      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     144      <Private>False</Private>
    311145    </ProjectReference>
    312146  </ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.