Changeset 7561


Ignore:
Timestamp:
03/06/12 14:56:47 (7 years ago)
Author:
abeham
Message:

#1614: cleaned up branch, removed instances which were integrated into the trunk

Location:
branches/GeneralizedQAP
Files:
15 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • branches/GeneralizedQAP/GeneralizedQAP.sln

    r7505 r7561  
    1818    TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
    1919  EndProjectSection
    20 EndProject
    21 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.QAPLIB-3.3", "HeuristicLab.Problems.Instances.QAPLIB\3.3\HeuristicLab.Problems.Instances.QAPLIB-3.3.csproj", "{73F29D43-5714-4069-8FAB-0D18FEB5F175}"
    22 EndProject
    23 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances-3.3", "HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj", "{3540E29E-4793-49E7-8EE2-FEA7F61C3994}"
    24 EndProject
    25 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.ElloumiCTAP-3.3", "HeuristicLab.Problems.Instances.ElloumiCTAP\3.3\HeuristicLab.Problems.Instances.ElloumiCTAP-3.3.csproj", "{CCF61DA0-B226-4C0F-8052-29ACC6BDE6EE}"
    26 EndProject
    27 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.TSPLIB-3.3", "HeuristicLab.Problems.Instances.TSPLIB\3.3\HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj", "{CE0F99D6-1C56-48A9-9B68-3E5B833703EF}"
    28 EndProject
    29 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.CordeauGQAP-3.3", "HeuristicLab.Problems.Instances.CordeauGQAP\3.3\HeuristicLab.Problems.Instances.CordeauGQAP-3.3.csproj", "{1F2718DA-BF13-40EE-A7FD-EEDB4912E64E}"
    3020EndProject
    3121Global
     
    8272    {68C6C157-08DA-414F-9256-CCCA13038399}.Release|x64.ActiveCfg = Release|Any CPU
    8373    {68C6C157-08DA-414F-9256-CCCA13038399}.Release|x86.ActiveCfg = Release|Any CPU
    84     {73F29D43-5714-4069-8FAB-0D18FEB5F175}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    85     {73F29D43-5714-4069-8FAB-0D18FEB5F175}.Debug|Any CPU.Build.0 = Debug|Any CPU
    86     {73F29D43-5714-4069-8FAB-0D18FEB5F175}.Debug|x64.ActiveCfg = Debug|Any CPU
    87     {73F29D43-5714-4069-8FAB-0D18FEB5F175}.Debug|x86.ActiveCfg = Debug|Any CPU
    88     {73F29D43-5714-4069-8FAB-0D18FEB5F175}.Release|Any CPU.ActiveCfg = Release|Any CPU
    89     {73F29D43-5714-4069-8FAB-0D18FEB5F175}.Release|Any CPU.Build.0 = Release|Any CPU
    90     {73F29D43-5714-4069-8FAB-0D18FEB5F175}.Release|x64.ActiveCfg = Release|Any CPU
    91     {73F29D43-5714-4069-8FAB-0D18FEB5F175}.Release|x86.ActiveCfg = Release|Any CPU
    92     {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    93     {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Debug|Any CPU.Build.0 = Debug|Any CPU
    94     {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Debug|x64.ActiveCfg = Debug|Any CPU
    95     {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Debug|x86.ActiveCfg = Debug|Any CPU
    96     {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Release|Any CPU.ActiveCfg = Release|Any CPU
    97     {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Release|Any CPU.Build.0 = Release|Any CPU
    98     {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Release|x64.ActiveCfg = Release|Any CPU
    99     {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Release|x86.ActiveCfg = Release|Any CPU
    100     {CCF61DA0-B226-4C0F-8052-29ACC6BDE6EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    101     {CCF61DA0-B226-4C0F-8052-29ACC6BDE6EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
    102     {CCF61DA0-B226-4C0F-8052-29ACC6BDE6EE}.Debug|x64.ActiveCfg = Debug|Any CPU
    103     {CCF61DA0-B226-4C0F-8052-29ACC6BDE6EE}.Debug|x86.ActiveCfg = Debug|Any CPU
    104     {CCF61DA0-B226-4C0F-8052-29ACC6BDE6EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
    105     {CCF61DA0-B226-4C0F-8052-29ACC6BDE6EE}.Release|Any CPU.Build.0 = Release|Any CPU
    106     {CCF61DA0-B226-4C0F-8052-29ACC6BDE6EE}.Release|x64.ActiveCfg = Release|Any CPU
    107     {CCF61DA0-B226-4C0F-8052-29ACC6BDE6EE}.Release|x86.ActiveCfg = Release|Any CPU
    108     {CE0F99D6-1C56-48A9-9B68-3E5B833703EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    109     {CE0F99D6-1C56-48A9-9B68-3E5B833703EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
    110     {CE0F99D6-1C56-48A9-9B68-3E5B833703EF}.Debug|x64.ActiveCfg = Debug|Any CPU
    111     {CE0F99D6-1C56-48A9-9B68-3E5B833703EF}.Debug|x86.ActiveCfg = Debug|Any CPU
    112     {CE0F99D6-1C56-48A9-9B68-3E5B833703EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
    113     {CE0F99D6-1C56-48A9-9B68-3E5B833703EF}.Release|Any CPU.Build.0 = Release|Any CPU
    114     {CE0F99D6-1C56-48A9-9B68-3E5B833703EF}.Release|x64.ActiveCfg = Release|Any CPU
    115     {CE0F99D6-1C56-48A9-9B68-3E5B833703EF}.Release|x86.ActiveCfg = Release|Any CPU
    116     {1F2718DA-BF13-40EE-A7FD-EEDB4912E64E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    117     {1F2718DA-BF13-40EE-A7FD-EEDB4912E64E}.Debug|Any CPU.Build.0 = Debug|Any CPU
    118     {1F2718DA-BF13-40EE-A7FD-EEDB4912E64E}.Debug|x64.ActiveCfg = Debug|x64
    119     {1F2718DA-BF13-40EE-A7FD-EEDB4912E64E}.Debug|x64.Build.0 = Debug|x64
    120     {1F2718DA-BF13-40EE-A7FD-EEDB4912E64E}.Debug|x86.ActiveCfg = Debug|x86
    121     {1F2718DA-BF13-40EE-A7FD-EEDB4912E64E}.Debug|x86.Build.0 = Debug|x86
    122     {1F2718DA-BF13-40EE-A7FD-EEDB4912E64E}.Release|Any CPU.ActiveCfg = Release|Any CPU
    123     {1F2718DA-BF13-40EE-A7FD-EEDB4912E64E}.Release|Any CPU.Build.0 = Release|Any CPU
    124     {1F2718DA-BF13-40EE-A7FD-EEDB4912E64E}.Release|x64.ActiveCfg = Release|x64
    125     {1F2718DA-BF13-40EE-A7FD-EEDB4912E64E}.Release|x64.Build.0 = Release|x64
    126     {1F2718DA-BF13-40EE-A7FD-EEDB4912E64E}.Release|x86.ActiveCfg = Release|x86
    127     {1F2718DA-BF13-40EE-A7FD-EEDB4912E64E}.Release|x86.Build.0 = Release|x86
    12874  EndGlobalSection
    12975  GlobalSection(SolutionProperties) = preSolution
  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3.csproj

    r7548 r7561  
    7676      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    7777    </Reference>
     78    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    7879    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    7980    <Reference Include="System" />
     
    8990  </ItemGroup>
    9091  <ItemGroup>
    91     <Compile Include="ProblemInstanceProviderView.cs">
    92       <SubType>UserControl</SubType>
    93     </Compile>
    94     <Compile Include="ProblemInstanceProviderView.Designer.cs">
    95       <DependentUpon>ProblemInstanceProviderView.cs</DependentUpon>
    96     </Compile>
    97     <Compile Include="ProblemView.cs">
    98       <SubType>UserControl</SubType>
    99     </Compile>
    100     <Compile Include="ProblemView.Designer.cs">
    101       <DependentUpon>ProblemView.cs</DependentUpon>
    102     </Compile>
    10392    <Compile Include="GQAPAssignmentArchiveView.cs">
    10493      <SubType>UserControl</SubType>
     
    126115      <Name>HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3</Name>
    127116    </ProjectReference>
    128     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    129       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    130       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    131     </ProjectReference>
    132117  </ItemGroup>
    133118  <ItemGroup>
    134     <EmbeddedResource Include="ProblemInstanceProviderView.resx">
    135       <DependentUpon>ProblemInstanceProviderView.cs</DependentUpon>
    136     </EmbeddedResource>
    137     <EmbeddedResource Include="ProblemView.resx">
    138       <DependentUpon>ProblemView.cs</DependentUpon>
    139     </EmbeddedResource>
    140119    <EmbeddedResource Include="GQAPAssignmentArchiveView.resx">
    141120      <DependentUpon>GQAPAssignmentArchiveView.cs</DependentUpon>
  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj

    r7523 r7561  
    8787      <Private>False</Private>
    8888    </Reference>
     89    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     90      <SpecificVersion>False</SpecificVersion>
     91      <Private>False</Private>
     92    </Reference>
    8993    <Reference Include="System" />
    9094    <Reference Include="System.Core" />
     
    170174      <Name>HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common-3.3</Name>
    171175    </ProjectReference>
    172     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    173       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    174       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    175     </ProjectReference>
    176176  </ItemGroup>
    177177  <ItemGroup />
  • branches/GeneralizedQAP/UnitTests/UnitTests.csproj

    r7523 r7561  
    7878      <Private>True</Private>
    7979    </Reference>
     80    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     81    <Reference Include="HeuristicLab.Problems.Instances.CordeauGQAP-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     82      <SpecificVersion>False</SpecificVersion>
     83      <Private>False</Private>
     84    </Reference>
    8085    <Reference Include="HeuristicLab.Random-3.3">
    8186      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
     
    98103  <ItemGroup>
    99104    <Compile Include="CordeauCrossoverTest.cs" />
    100     <Compile Include="CordeauGQAPInstanceProviderTest.cs" />
    101     <Compile Include="ElloumiCTAPInstanceProviderTest.cs" />
    102     <Compile Include="QAPLIBInstanceProviderTest.cs" />
    103105    <Compile Include="GQAPNMoveEvaluatorTest.cs" />
    104106    <Compile Include="Properties\AssemblyInfo.cs" />
    105     <Compile Include="TSPLIBInstanceProviderTest.cs" />
    106107  </ItemGroup>
    107108  <ItemGroup>
     
    113114      <Project>{C739E6D2-5680-4804-A810-8017DA0C238F}</Project>
    114115      <Name>HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3</Name>
    115     </ProjectReference>
    116     <ProjectReference Include="..\HeuristicLab.Problems.Instances.CordeauGQAP\3.3\HeuristicLab.Problems.Instances.CordeauGQAP-3.3.csproj">
    117       <Project>{1F2718DA-BF13-40EE-A7FD-EEDB4912E64E}</Project>
    118       <Name>HeuristicLab.Problems.Instances.CordeauGQAP-3.3</Name>
    119     </ProjectReference>
    120     <ProjectReference Include="..\HeuristicLab.Problems.Instances.ElloumiCTAP\3.3\HeuristicLab.Problems.Instances.ElloumiCTAP-3.3.csproj">
    121       <Project>{CCF61DA0-B226-4C0F-8052-29ACC6BDE6EE}</Project>
    122       <Name>HeuristicLab.Problems.Instances.ElloumiCTAP-3.3</Name>
    123     </ProjectReference>
    124     <ProjectReference Include="..\HeuristicLab.Problems.Instances.QAPLIB\3.3\HeuristicLab.Problems.Instances.QAPLIB-3.3.csproj">
    125       <Project>{73F29D43-5714-4069-8FAB-0D18FEB5F175}</Project>
    126       <Name>HeuristicLab.Problems.Instances.QAPLIB-3.3</Name>
    127     </ProjectReference>
    128     <ProjectReference Include="..\HeuristicLab.Problems.Instances.TSPLIB\3.3\HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj">
    129       <Project>{CE0F99D6-1C56-48A9-9B68-3E5B833703EF}</Project>
    130       <Name>HeuristicLab.Problems.Instances.TSPLIB-3.3</Name>
    131     </ProjectReference>
    132     <ProjectReference Include="..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    133       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    134       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    135116    </ProjectReference>
    136117  </ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.