Free cookie consent management tool by TermsFeed Policy Generator

Changeset 7900


Ignore:
Timestamp:
05/24/12 15:02:07 (12 years ago)
Author:
svonolfe
Message:

VRP 3.4 trunk integration (#1177)

Location:
trunk/sources
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab 3.3.sln

    r7892 r7900  
    305305EndProject
    306306Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.LinearAssignment.Views-3.3", "HeuristicLab.Problems.LinearAssignment.Views\3.3\HeuristicLab.Problems.LinearAssignment.Views-3.3.csproj", "{8A7C524C-4B72-45FD-8274-EFB67C27C169}"
     307EndProject
     308Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.VehicleRouting-3.4", "HeuristicLab.Problems.VehicleRouting\3.4\HeuristicLab.Problems.VehicleRouting-3.4.csproj", "{B94FFB82-43D4-40AB-9980-B03470ADF221}"
     309EndProject
     310Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.VehicleRouting.Views-3.4", "HeuristicLab.Problems.VehicleRouting.Views\3.4\HeuristicLab.Problems.VehicleRouting.Views-3.4.csproj", "{7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0}"
     311EndProject
     312Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.VehicleRouting-3.4", "HeuristicLab.Problems.Instances.VehicleRouting\3.4\HeuristicLab.Problems.Instances.VehicleRouting-3.4.csproj", "{8C265E11-4F8D-4CED-9E6B-F400A0075C18}"
     313EndProject
     314Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.VehicleRouting.Views-3.4", "HeuristicLab.Problems.Instances.VehicleRouting.Views\3.4\HeuristicLab.Problems.Instances.VehicleRouting.Views-3.4.csproj", "{E2419315-B10A-4BC1-B517-A24DCF4C59AC}"
    307315EndProject
    308316Global
    … …  
    14951503    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Release|x86.ActiveCfg = Release|x86
    14961504    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Release|x86.Build.0 = Release|x86
     1505    {B94FFB82-43D4-40AB-9980-B03470ADF221}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1506    {B94FFB82-43D4-40AB-9980-B03470ADF221}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1507    {B94FFB82-43D4-40AB-9980-B03470ADF221}.Debug|x64.ActiveCfg = Debug|x64
     1508    {B94FFB82-43D4-40AB-9980-B03470ADF221}.Debug|x64.Build.0 = Debug|x64
     1509    {B94FFB82-43D4-40AB-9980-B03470ADF221}.Debug|x86.ActiveCfg = Debug|x86
     1510    {B94FFB82-43D4-40AB-9980-B03470ADF221}.Debug|x86.Build.0 = Debug|x86
     1511    {B94FFB82-43D4-40AB-9980-B03470ADF221}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1512    {B94FFB82-43D4-40AB-9980-B03470ADF221}.Release|Any CPU.Build.0 = Release|Any CPU
     1513    {B94FFB82-43D4-40AB-9980-B03470ADF221}.Release|x64.ActiveCfg = Release|x64
     1514    {B94FFB82-43D4-40AB-9980-B03470ADF221}.Release|x64.Build.0 = Release|x64
     1515    {B94FFB82-43D4-40AB-9980-B03470ADF221}.Release|x86.ActiveCfg = Release|x86
     1516    {B94FFB82-43D4-40AB-9980-B03470ADF221}.Release|x86.Build.0 = Release|x86
     1517    {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1518    {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1519    {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0}.Debug|x64.ActiveCfg = Debug|x64
     1520    {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0}.Debug|x64.Build.0 = Debug|x64
     1521    {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0}.Debug|x86.ActiveCfg = Debug|x86
     1522    {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0}.Debug|x86.Build.0 = Debug|x86
     1523    {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1524    {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0}.Release|Any CPU.Build.0 = Release|Any CPU
     1525    {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0}.Release|x64.ActiveCfg = Release|x64
     1526    {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0}.Release|x64.Build.0 = Release|x64
     1527    {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0}.Release|x86.ActiveCfg = Release|x86
     1528    {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0}.Release|x86.Build.0 = Release|x86
     1529    {8C265E11-4F8D-4CED-9E6B-F400A0075C18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1530    {8C265E11-4F8D-4CED-9E6B-F400A0075C18}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1531    {8C265E11-4F8D-4CED-9E6B-F400A0075C18}.Debug|x64.ActiveCfg = Debug|x64
     1532    {8C265E11-4F8D-4CED-9E6B-F400A0075C18}.Debug|x64.Build.0 = Debug|x64
     1533    {8C265E11-4F8D-4CED-9E6B-F400A0075C18}.Debug|x86.ActiveCfg = Debug|x86
     1534    {8C265E11-4F8D-4CED-9E6B-F400A0075C18}.Debug|x86.Build.0 = Debug|x86
     1535    {8C265E11-4F8D-4CED-9E6B-F400A0075C18}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1536    {8C265E11-4F8D-4CED-9E6B-F400A0075C18}.Release|Any CPU.Build.0 = Release|Any CPU
     1537    {8C265E11-4F8D-4CED-9E6B-F400A0075C18}.Release|x64.ActiveCfg = Release|x64
     1538    {8C265E11-4F8D-4CED-9E6B-F400A0075C18}.Release|x64.Build.0 = Release|x64
     1539    {8C265E11-4F8D-4CED-9E6B-F400A0075C18}.Release|x86.ActiveCfg = Release|x86
     1540    {8C265E11-4F8D-4CED-9E6B-F400A0075C18}.Release|x86.Build.0 = Release|x86
     1541    {E2419315-B10A-4BC1-B517-A24DCF4C59AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1542    {E2419315-B10A-4BC1-B517-A24DCF4C59AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1543    {E2419315-B10A-4BC1-B517-A24DCF4C59AC}.Debug|x64.ActiveCfg = Debug|x64
     1544    {E2419315-B10A-4BC1-B517-A24DCF4C59AC}.Debug|x64.Build.0 = Debug|x64
     1545    {E2419315-B10A-4BC1-B517-A24DCF4C59AC}.Debug|x86.ActiveCfg = Debug|x86
     1546    {E2419315-B10A-4BC1-B517-A24DCF4C59AC}.Debug|x86.Build.0 = Debug|x86
     1547    {E2419315-B10A-4BC1-B517-A24DCF4C59AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1548    {E2419315-B10A-4BC1-B517-A24DCF4C59AC}.Release|Any CPU.Build.0 = Release|Any CPU
     1549    {E2419315-B10A-4BC1-B517-A24DCF4C59AC}.Release|x64.ActiveCfg = Release|x64
     1550    {E2419315-B10A-4BC1-B517-A24DCF4C59AC}.Release|x64.Build.0 = Release|x64
     1551    {E2419315-B10A-4BC1-B517-A24DCF4C59AC}.Release|x86.ActiveCfg = Release|x86
     1552    {E2419315-B10A-4BC1-B517-A24DCF4C59AC}.Release|x86.Build.0 = Release|x86
    14971553  EndGlobalSection
    14981554  GlobalSection(SolutionProperties) = preSolution

  • trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/HeuristicLab.Problems.Instances.VehicleRouting.Views-3.4.csproj

    r7884 r7900  
    66    <ProductVersion>8.0.30703</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    8     <ProjectGuid>{B7FA451C-26BF-4EE5-8E0E-BECAADA5B8E9}</ProjectGuid>
     8    <ProjectGuid>{E2419315-B10A-4BC1-B517-A24DCF4C59AC}</ProjectGuid>
    99    <OutputType>Library</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    … …  
    102102  </PropertyGroup>
    103103  <ItemGroup>
    104     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    105       <Private>False</Private>
    106     </Reference>
    107     <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    108       <Private>False</Private>
    109     </Reference>
    110     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    111       <Private>False</Private>
    112     </Reference>
    113     <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    114       <Private>False</Private>
    115     </Reference>
    116     <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    117       <Private>False</Private>
    118     </Reference>
    119     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    120       <Private>False</Private>
    121     </Reference>
    122     <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    123       <Private>False</Private>
    124     </Reference>
    125     <Reference Include="HeuristicLab.Problems.Instances.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    126       <Private>False</Private>
    127     </Reference>
    128104    <Reference Include="System" />
    129105    <Reference Include="System.Core" />
    … …  
    158134  </ItemGroup>
    159135  <ItemGroup>
     136    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     137      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     138      <Name>HeuristicLab.Common.Resources-3.3</Name>
     139      <Private>False</Private>
     140    </ProjectReference>
     141    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     142      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     143      <Name>HeuristicLab.Common-3.3</Name>
     144      <Private>False</Private>
     145    </ProjectReference>
     146    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     147      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     148      <Name>HeuristicLab.Data-3.3</Name>
     149      <Private>False</Private>
     150    </ProjectReference>
     151    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
     152      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
     153      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     154      <Private>False</Private>
     155    </ProjectReference>
     156    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
     157      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
     158      <Name>HeuristicLab.MainForm-3.3</Name>
     159      <Private>False</Private>
     160    </ProjectReference>
     161    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     162      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     163      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     164      <Private>False</Private>
     165    </ProjectReference>
    160166    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances.VehicleRouting\3.4\HeuristicLab.Problems.Instances.VehicleRouting-3.4.csproj">
    161       <Project>{CE0F99D6-1C56-48A9-9B68-3E5B833703EF}</Project>
     167      <Project>{8C265E11-4F8D-4CED-9E6B-F400A0075C18}</Project>
    162168      <Name>HeuristicLab.Problems.Instances.VehicleRouting-3.4</Name>
     169      <Private>False</Private>
     170    </ProjectReference>
     171    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances.Views\3.3\HeuristicLab.Problems.Instances.Views-3.3.csproj">
     172      <Project>{B1BA398F-953F-4C3A-B07B-1E5E17A27DD9}</Project>
     173      <Name>HeuristicLab.Problems.Instances.Views-3.3</Name>
     174      <Private>False</Private>
     175    </ProjectReference>
     176    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     177      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     178      <Name>HeuristicLab.Problems.Instances-3.3</Name>
    163179      <Private>False</Private>
    164180    </ProjectReference>

  • trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/Plugin.cs.frame

    r7881 r7900  
    2626  [PluginFile("HeuristicLab.Problems.Instances.VehicleRouting.Views-3.4.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    28   [PluginDependency("HeuristicLab.Data", "3.3")]
    2928  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3029  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]

  • trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/HeuristicLab.Problems.Instances.VehicleRouting-3.4.csproj

    r7888 r7900  
    66    <ProductVersion>8.0.30703</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    8     <ProjectGuid>{CE0F99D6-1C56-48A9-9B68-3E5B833703EF}</ProjectGuid>
     8    <ProjectGuid>{8C265E11-4F8D-4CED-9E6B-F400A0075C18}</ProjectGuid>
    99    <OutputType>Library</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    … …  
    102102  </PropertyGroup>
    103103  <ItemGroup>
    104     <Reference Include="HeuristicLab.Common-3.3">
    105       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    106       <Private>False</Private>
    107       <EmbedInteropTypes>False</EmbedInteropTypes>
    108     </Reference>
    109     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    110       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    111       <Private>False</Private>
    112       <EmbedInteropTypes>False</EmbedInteropTypes>
    113     </Reference>
    114     <Reference Include="HeuristicLab.Problems.Instances-3.3">
    115       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    116       <Private>False</Private>
    117       <EmbedInteropTypes>False</EmbedInteropTypes>
    118     </Reference>
    119     <Reference Include="HeuristicLab.Problems.Instances.TSPLIB-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    120       <Private>False</Private>
    121       <EmbedInteropTypes>False</EmbedInteropTypes>
    122     </Reference>
    123104    <Reference Include="ICSharpCode.SharpZipLib">
    124105      <HintPath>..\..\..\..\trunk\sources\bin\ICSharpCode.SharpZipLib.dll</HintPath>
    … …  
    174155    <None Include="HeuristicLab.snk" />
    175156  </ItemGroup>
    176   <ItemGroup />
     157  <ItemGroup>
     158    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     159      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     160      <Name>HeuristicLab.Common-3.3</Name>
     161      <Private>False</Private>
     162    </ProjectReference>
     163    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     164      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     165      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     166      <Private>False</Private>
     167    </ProjectReference>
     168    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances.TSPLIB\3.3\HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj">
     169      <Project>{CE0F99D6-1C56-48A9-9B68-3E5B833703EF}</Project>
     170      <Name>HeuristicLab.Problems.Instances.TSPLIB-3.3</Name>
     171      <Private>False</Private>
     172    </ProjectReference>
     173    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     174      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     175      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     176      <Private>False</Private>
     177    </ProjectReference>
     178  </ItemGroup>
    177179  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    178180  <PropertyGroup>

  • trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/HeuristicLab.Problems.VehicleRouting.Views-3.4.csproj

    r7884 r7900  
    9595  </PropertyGroup>
    9696  <ItemGroup>
    97     <Reference Include="HeuristicLab.Collections-3.3">
    98       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    99       <Private>False</Private>
    100     </Reference>
    101     <Reference Include="HeuristicLab.Common-3.3">
    102       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    103       <Private>False</Private>
    104     </Reference>
    105     <Reference Include="HeuristicLab.Common.Resources-3.3">
    106       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    107       <Private>False</Private>
    108     </Reference>
    109     <Reference Include="HeuristicLab.Core-3.3">
    110       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    111       <Private>False</Private>
    112     </Reference>
    113     <Reference Include="HeuristicLab.Core.Views-3.3">
    114       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
    115       <Private>False</Private>
    116     </Reference>
    117     <Reference Include="HeuristicLab.Data-3.3">
    118       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    119       <Private>False</Private>
    120     </Reference>
    121     <Reference Include="HeuristicLab.Data.Views-3.3">
    122       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data.Views-3.3.dll</HintPath>
    123       <Private>False</Private>
    124     </Reference>
    125     <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
    126       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
    127       <Private>False</Private>
    128     </Reference>
    129     <Reference Include="HeuristicLab.MainForm-3.3">
    130       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
    131       <Private>False</Private>
    132     </Reference>
    133     <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
    134       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    135       <Private>False</Private>
    136     </Reference>
    137     <Reference Include="HeuristicLab.Operators-3.3">
    138       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    139       <Private>False</Private>
    140     </Reference>
    141     <Reference Include="HeuristicLab.Optimization-3.3">
    142       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    143       <Private>False</Private>
    144     </Reference>
    145     <Reference Include="HeuristicLab.Optimization.Views-3.3">
    146       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
    147       <Private>False</Private>
    148     </Reference>
    149     <Reference Include="HeuristicLab.Parameters-3.3">
    150       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    151       <Private>False</Private>
    152     </Reference>
    153     <Reference Include="HeuristicLab.Persistence-3.3">
    154       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    155       <Private>False</Private>
    156     </Reference>
    157     <Reference Include="HeuristicLab.Persistence.GUI-3.3">
    158       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence.GUI-3.3.dll</HintPath>
    159       <Private>False</Private>
    160     </Reference>
    161     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    162       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    163       <Private>False</Private>
    164     </Reference>
    165     <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    166       <Private>False</Private>
    167     </Reference>
    16897    <Reference Include="System" />
    16998    <Reference Include="System.Core">
    … …  
    268197  </ItemGroup>
    269198  <ItemGroup>
     199    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     200      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     201      <Name>HeuristicLab.Collections-3.3</Name>
     202      <Private>False</Private>
     203    </ProjectReference>
     204    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     205      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     206      <Name>HeuristicLab.Common.Resources-3.3</Name>
     207      <Private>False</Private>
     208    </ProjectReference>
     209    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     210      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     211      <Name>HeuristicLab.Common-3.3</Name>
     212      <Private>False</Private>
     213    </ProjectReference>
     214    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
     215      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
     216      <Name>HeuristicLab.Core.Views-3.3</Name>
     217      <Private>False</Private>
     218    </ProjectReference>
     219    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     220      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     221      <Name>HeuristicLab.Core-3.3</Name>
     222      <Private>False</Private>
     223    </ProjectReference>
     224    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
     225      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
     226      <Name>HeuristicLab.Data.Views-3.3</Name>
     227      <Private>False</Private>
     228    </ProjectReference>
     229    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     230      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     231      <Name>HeuristicLab.Data-3.3</Name>
     232      <Private>False</Private>
     233    </ProjectReference>
     234    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
     235      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
     236      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     237      <Private>False</Private>
     238    </ProjectReference>
     239    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
     240      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
     241      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     242      <Private>False</Private>
     243    </ProjectReference>
     244    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
     245      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
     246      <Name>HeuristicLab.MainForm-3.3</Name>
     247      <Private>False</Private>
     248    </ProjectReference>
     249    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     250      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     251      <Name>HeuristicLab.Operators-3.3</Name>
     252      <Private>False</Private>
     253    </ProjectReference>
     254    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
     255      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
     256      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     257      <Private>False</Private>
     258    </ProjectReference>
     259    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     260      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     261      <Name>HeuristicLab.Optimization-3.3</Name>
     262      <Private>False</Private>
     263    </ProjectReference>
     264    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     265      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     266      <Name>HeuristicLab.Parameters-3.3</Name>
     267      <Private>False</Private>
     268    </ProjectReference>
     269    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     270      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     271      <Name>HeuristicLab.Persistence-3.3</Name>
     272      <Private>False</Private>
     273    </ProjectReference>
     274    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     275      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     276      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     277      <Private>False</Private>
     278    </ProjectReference>
     279    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     280      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     281      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     282      <Private>False</Private>
     283    </ProjectReference>
    270284    <ProjectReference Include="..\..\HeuristicLab.Problems.VehicleRouting\3.4\HeuristicLab.Problems.VehicleRouting-3.4.csproj">
    271285      <Project>{B94FFB82-43D4-40AB-9980-B03470ADF221}</Project>

  • trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/Plugin.cs.frame

    r7871 r7900  
    2828  [Plugin("HeuristicLab.Problems.VehicleRouting.Views", "3.4.0.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.VehicleRouting.Views-3.4.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.Collections", "3.3")]
    3130  [PluginDependency("HeuristicLab.Common", "3.3")]
    3231  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    3332  [PluginDependency("HeuristicLab.Core", "3.3")]
    3433  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
    35   [PluginDependency("HeuristicLab.Data", "3.3")]
    36   [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
    3734  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3835  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    39   [PluginDependency("HeuristicLab.Optimization", "3.3")]
    4036  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
    41   [PluginDependency("HeuristicLab.Parameters", "3.3")]
    4237  [PluginDependency("HeuristicLab.Problems.VehicleRouting", "3.4")]
    43   [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    4438  public class HeuristicLabProblemsVehicleRoutingViewsPlugin : PluginBase {
    4539  }

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/HeuristicLab.Problems.VehicleRouting-3.4.csproj

    r7884 r7900  
    9898  </PropertyGroup>
    9999  <ItemGroup>
    100     <Reference Include="HeuristicLab.Analysis-3.3">
    101       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    102       <Private>False</Private>
    103     </Reference>
    104     <Reference Include="HeuristicLab.Collections-3.3">
    105       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    106       <Private>False</Private>
    107     </Reference>
    108     <Reference Include="HeuristicLab.Common-3.3">
    109       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    110       <Private>False</Private>
    111     </Reference>
    112     <Reference Include="HeuristicLab.Common.Resources-3.3">
    113       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    114       <Private>False</Private>
    115     </Reference>
    116     <Reference Include="HeuristicLab.Core-3.3">
    117       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    118       <Private>False</Private>
    119     </Reference>
    120     <Reference Include="HeuristicLab.Data-3.3">
    121       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    122       <Private>False</Private>
    123     </Reference>
    124     <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
    125       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
    126       <Private>False</Private>
    127     </Reference>
    128     <Reference Include="HeuristicLab.Operators-3.3">
    129       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    130       <Private>False</Private>
    131     </Reference>
    132     <Reference Include="HeuristicLab.Optimization-3.3">
    133       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    134       <Private>False</Private>
    135     </Reference>
    136     <Reference Include="HeuristicLab.Optimization.Operators-3.3">
    137       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
    138       <Private>False</Private>
    139     </Reference>
    140     <Reference Include="HeuristicLab.Parameters-3.3">
    141       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    142       <Private>False</Private>
    143     </Reference>
    144     <Reference Include="HeuristicLab.Persistence-3.3">
    145       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    146       <Private>False</Private>
    147     </Reference>
    148     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    149       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    150       <Private>False</Private>
    151     </Reference>
    152     <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    153       <Private>False</Private>
    154     </Reference>
    155100    <Reference Include="System" />
    156101    <Reference Include="System.Core">
    … …  
    441386    </BootstrapperPackage>
    442387  </ItemGroup>
    443   <ItemGroup />
     388  <ItemGroup>
     389    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     390      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     391      <Name>HeuristicLab.Analysis-3.3</Name>
     392      <Private>False</Private>
     393    </ProjectReference>
     394    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     395      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     396      <Name>HeuristicLab.Collections-3.3</Name>
     397      <Private>False</Private>
     398    </ProjectReference>
     399    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     400      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     401      <Name>HeuristicLab.Common.Resources-3.3</Name>
     402      <Private>False</Private>
     403    </ProjectReference>
     404    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     405      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     406      <Name>HeuristicLab.Common-3.3</Name>
     407      <Private>False</Private>
     408    </ProjectReference>
     409    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     410      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     411      <Name>HeuristicLab.Core-3.3</Name>
     412      <Private>False</Private>
     413    </ProjectReference>
     414    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     415      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     416      <Name>HeuristicLab.Data-3.3</Name>
     417      <Private>False</Private>
     418    </ProjectReference>
     419    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
     420      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
     421      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     422      <Private>False</Private>
     423    </ProjectReference>
     424    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     425      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     426      <Name>HeuristicLab.Operators-3.3</Name>
     427      <Private>False</Private>
     428    </ProjectReference>
     429    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
     430      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
     431      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     432      <Private>False</Private>
     433    </ProjectReference>
     434    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     435      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     436      <Name>HeuristicLab.Optimization-3.3</Name>
     437      <Private>False</Private>
     438    </ProjectReference>
     439    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     440      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     441      <Name>HeuristicLab.Parameters-3.3</Name>
     442      <Private>False</Private>
     443    </ProjectReference>
     444    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     445      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     446      <Name>HeuristicLab.Persistence-3.3</Name>
     447      <Private>False</Private>
     448    </ProjectReference>
     449    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     450      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     451      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     452      <Private>False</Private>
     453    </ProjectReference>
     454    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     455      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     456      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     457      <Private>False</Private>
     458    </ProjectReference>
     459  </ItemGroup>
    444460  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    445461  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • trunk/sources/HeuristicLab.Tests/Builder.testsettings

    r7657 r7900  
    1717    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Optimization.Views-3.3.dll" />   
    1818    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.DebugEngine-3.3.dll" />
    19     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.VehicleRouting.Views-3.3.dll" />
     19    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.VehicleRouting.Views-3.4.dll" />
    2020    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.OneMax-3.3.dll" />
    2121    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.LibSVM-1.6.3.dll" />   
    … …  
    2727    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Operators.Programmable-3.3.dll" />
    2828    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.ArtificialAnt-3.4.dll" />
    29     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.VehicleRouting-3.3.dll" />
     29    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.VehicleRouting-3.4.dll" />
    3030    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.QuadraticAssignment-3.3.dll" />
    3131    <DeploymentItem filename="HeuristicLab.Tests\HeuristicLab-3.3\Resources\GA_TSP.hl" />
    … …  
    124124    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.Instances.ElloumiCTAP-3.3.dll" />
    125125    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.Instances.CordeauGQAP-3.3.dll" />
     126    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.Instances.VehicleRouting-3.4.dll" />
    126127    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.Instances.TSPLIB.Views-3.3.dll" />
     128    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.Instances.VehicleRouting.Views-3.4.dll" />
    127129  </Deployment>
    128130  <Execution hostProcessPlatform="MSIL">

  • trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs

    r7863 r7900  
    5151using HeuristicLab.Problems.VehicleRouting;
    5252using HeuristicLab.Problems.VehicleRouting.Encodings.General;
     53using HeuristicLab.Problems.VehicleRouting.Encodings.Alba;
    5354using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
     55using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
    5456using HeuristicLab.Selection;
    5557using Microsoft.VisualStudio.TestTools.UnitTesting;
     58using HeuristicLab.Problems.Instances.VehicleRouting;
     59using HeuristicLab.Problems.Instances;
     60
    5661
    5762namespace HeuristicLab_33.Tests {
    … …  
    116121      ga.SetSeedRandomly.Value = false;
    117122      RunAlgorithm(ga);
    118       Assert.AreEqual(1828.9368669428336, GetDoubleResult(ga, "BestQuality"));
    119       Assert.AreEqual(1831.5504074358635, GetDoubleResult(ga, "CurrentAverageQuality"));
    120       Assert.AreEqual(1895.8980772167054, GetDoubleResult(ga, "CurrentWorstQuality"));
     123      Assert.AreEqual(1828.9368669428338, GetDoubleResult(ga, "BestQuality"));
     124      Assert.AreEqual(1830.1444308908331, GetDoubleResult(ga, "CurrentAverageQuality"));
     125      Assert.AreEqual(1871.7128510304112, GetDoubleResult(ga, "CurrentWorstQuality"));
    121126      Assert.AreEqual(99100, GetIntResult(ga, "EvaluatedSolutions"));
    122127    }
    … …  
    127132      VehicleRoutingProblem vrpProblem = new VehicleRoutingProblem();
    128133
    129       vrpProblem.ImportFromSolomon("C101.txt");
    130       vrpProblem.ImportSolution("C101.opt.txt");
     134      SolomonFormatInstanceProvider instanceProvider = new SolomonInstanceProvider();
     135      IVRPData data = instanceProvider.LoadData("C101.txt", "C101.opt.txt");
     136      vrpProblem.Load(data);
    131137      vrpProblem.Name = "C101 VRP (imported from Solomon)";
    132138      vrpProblem.Description = "Represents a Vehicle Routing Problem.";
    133       vrpProblem.DistanceFactorParameter.Value.Value = 1;
    134       vrpProblem.FleetUsageFactorParameter.Value.Value = 100;
    135       vrpProblem.OverloadPenaltyParameter.Value.Value = 100;
    136       vrpProblem.TardinessPenaltyParameter.Value.Value = 100;
    137       vrpProblem.TimeFactorParameter.Value.Value = 0;
    138       vrpProblem.EvaluatorParameter.Value = new VRPEvaluator();
     139      CVRPTWProblemInstance instance = vrpProblem.ProblemInstance as CVRPTWProblemInstance;
     140      instance.DistanceFactor.Value = 1;
     141      instance.FleetUsageFactor.Value = 100;
     142      instance.OverloadPenalty.Value = 100;
     143      instance.TardinessPenalty.Value = 100;
     144      instance.TimeFactor.Value = 0;
    139145      vrpProblem.MaximizationParameter.Value.Value = false;
    140       vrpProblem.SolutionCreatorParameter.Value = new RandomCreator();
    141       vrpProblem.UseDistanceMatrix.Value = true;
    142       vrpProblem.Vehicles.Value = 25;
     146      instance.UseDistanceMatrix.Value = true;
     147      instance.Vehicles.Value = 25;
    143148      #endregion
    144149      #region Algorithm Configuration
    … …  
    950955      ga.Selector = ga.SelectorParameter.ValidValues
    951956        .OfType<S>()
    952         .Single();
     957        .First();
    953958
    954959      ga.Crossover = ga.CrossoverParameter.ValidValues
    955960        .OfType<C>()
    956         .Single();
     961        .First();
    957962
    958963      ga.Mutator = ga.MutatorParameter.ValidValues
    959964        .OfType<M>()
    960         .Single();
     965        .First();
    961966
    962967      var tSelector = ga.Selector as TournamentSelector;

  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r7873 r7900  
    300300  <ItemGroup>
    301301    <None Include="app.config" />
    302     <None Include="Builder.testsettings" />
     302    <None Include="Builder.testsettings">
     303      <SubType>Designer</SubType>
     304    </None>
    303305    <None Include="HeuristicLab-3.3\Resources\GA_SymbReg.hl">
    304306      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    … …  
    625627      <Name>HeuristicLab.Problems.Instances.TSPLIB-3.3</Name>
    626628    </ProjectReference>
     629    <ProjectReference Include="..\HeuristicLab.Problems.Instances.VehicleRouting.Views\3.4\HeuristicLab.Problems.Instances.VehicleRouting.Views-3.4.csproj">
     630      <Project>{E2419315-B10A-4BC1-B517-A24DCF4C59AC}</Project>
     631      <Name>HeuristicLab.Problems.Instances.VehicleRouting.Views-3.4</Name>
     632    </ProjectReference>
     633    <ProjectReference Include="..\HeuristicLab.Problems.Instances.VehicleRouting\3.4\HeuristicLab.Problems.Instances.VehicleRouting-3.4.csproj">
     634      <Project>{8C265E11-4F8D-4CED-9E6B-F400A0075C18}</Project>
     635      <Name>HeuristicLab.Problems.Instances.VehicleRouting-3.4</Name>
     636    </ProjectReference>
    627637    <ProjectReference Include="..\HeuristicLab.Problems.Instances.Views\3.3\HeuristicLab.Problems.Instances.Views-3.3.csproj">
    628638      <Project>{B1BA398F-953F-4C3A-B07B-1E5E17A27DD9}</Project>
    … …  
    681691      <Name>HeuristicLab.Problems.TravelingSalesman-3.3</Name>
    682692    </ProjectReference>
    683     <ProjectReference Include="..\HeuristicLab.Problems.VehicleRouting.Views\3.3\HeuristicLab.Problems.VehicleRouting.Views-3.3.csproj">
    684       <Project>{D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}</Project>
    685       <Name>HeuristicLab.Problems.VehicleRouting.Views-3.3</Name>
    686     </ProjectReference>
    687     <ProjectReference Include="..\HeuristicLab.Problems.VehicleRouting\3.3\HeuristicLab.Problems.VehicleRouting-3.3.csproj">
    688       <Project>{6410BDA6-3641-42B2-BABA-AA626E2F6F71}</Project>
    689       <Name>HeuristicLab.Problems.VehicleRouting-3.3</Name>
     693    <ProjectReference Include="..\HeuristicLab.Problems.VehicleRouting.Views\3.4\HeuristicLab.Problems.VehicleRouting.Views-3.4.csproj">
     694      <Project>{7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0}</Project>
     695      <Name>HeuristicLab.Problems.VehicleRouting.Views-3.4</Name>
     696    </ProjectReference>
     697    <ProjectReference Include="..\HeuristicLab.Problems.VehicleRouting\3.4\HeuristicLab.Problems.VehicleRouting-3.4.csproj">
     698      <Project>{B94FFB82-43D4-40AB-9980-B03470ADF221}</Project>
     699      <Name>HeuristicLab.Problems.VehicleRouting-3.4</Name>
    690700    </ProjectReference>
    691701    <ProjectReference Include="..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
Note: See TracChangeset for help on using the changeset viewer.