Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5723


Ignore:
Timestamp:
03/16/11 22:32:33 (14 years ago)
Author:
abeham
Message:

#1330

  • Moved MDS into Analysis
  • Added test with some simple examples
Location:
branches/QAP
Files:
15 added
10 edited
3 copied

Legend:

Unmodified
Added
Removed

  • branches/QAP

    • Property svn:ignore

      •  

        old new  
        11*.suo
        22TestResults
         3*.testsettings

  • branches/QAP/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj

    r5163 r5723  
    9696  </PropertyGroup>
    9797  <ItemGroup>
     98    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     99      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     100    </Reference>
     101    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     102      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     103    </Reference>
     104    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     105      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     106    </Reference>
     107    <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     108      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll</HintPath>
     109    </Reference>
     110    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     111      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     112    </Reference>
    98113    <Reference Include="HeuristicLab.Data.Views-3.3">
    99       <HintPath>..\..\HeuristicLab.Data.Views\3.3\bin\Debug\HeuristicLab.Data.Views-3.3.dll</HintPath>
     114      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data.Views-3.3.dll</HintPath>
     115    </Reference>
     116    <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     117      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
     118    </Reference>
     119    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     120      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    100121    </Reference>
    101122    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     123    <Reference Include="HeuristicLab.Optimization.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     124      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
     125    </Reference>
     126    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     127      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     128    </Reference>
     129    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     130      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
     131    </Reference>
    102132    <Reference Include="System" />
    103133    <Reference Include="System.Core">
    … …  
    124154      <DependentUpon>AlleleFrequencyCollectionView.cs</DependentUpon>
    125155    </Compile>
     156    <Compile Include="CoordinatesHistoryView.cs">
     157      <SubType>UserControl</SubType>
     158    </Compile>
     159    <Compile Include="CoordinatesHistoryView.Designer.cs">
     160      <DependentUpon>CoordinatesHistoryView.cs</DependentUpon>
     161    </Compile>
     162    <Compile Include="CoordinatesView.cs">
     163      <SubType>UserControl</SubType>
     164    </Compile>
     165    <Compile Include="CoordinatesView.Designer.cs">
     166      <DependentUpon>CoordinatesView.cs</DependentUpon>
     167    </Compile>
    126168    <Compile Include="HeatMapHistoryView.cs">
    127169      <SubType>UserControl</SubType>
    … …  
    171213      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    172214      <Name>HeuristicLab.Analysis-3.3</Name>
    173     </ProjectReference>
    174     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    175       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    176       <Name>HeuristicLab.Collections-3.3</Name>
    177     </ProjectReference>
    178     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    179       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    180       <Name>HeuristicLab.Common-3.3</Name>
    181     </ProjectReference>
    182     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    183       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    184       <Name>HeuristicLab.Core.Views-3.3</Name>
    185     </ProjectReference>
    186     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    187       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    188       <Name>HeuristicLab.Core-3.3</Name>
    189     </ProjectReference>
    190     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    191       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    192       <Name>HeuristicLab.Data-3.3</Name>
    193     </ProjectReference>
    194     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    195       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    196       <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    197     </ProjectReference>
    198     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    199       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    200       <Name>HeuristicLab.MainForm-3.3</Name>
    201     </ProjectReference>
    202     <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    203       <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    204       <Name>HeuristicLab.Optimization.Views-3.3</Name>
    205     </ProjectReference>
    206     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    207       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    208       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    209     </ProjectReference>
    210     <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    211       <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    212       <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    213215    </ProjectReference>
    214216  </ItemGroup>
    … …  
    231233  </ItemGroup>
    232234  <ItemGroup>
     235    <EmbeddedResource Include="CoordinatesView.resx">
     236      <DependentUpon>CoordinatesView.cs</DependentUpon>
     237    </EmbeddedResource>
    233238    <EmbeddedResource Include="HeatMapView.resx">
    234239      <DependentUpon>HeatMapView.cs</DependentUpon>

  • branches/QAP/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

    r5374 r5723  
    1212    <AssemblyName>HeuristicLab.Analysis-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    14     <TargetFrameworkProfile></TargetFrameworkProfile>
     14    <TargetFrameworkProfile>
     15    </TargetFrameworkProfile>
    1516    <FileAlignment>512</FileAlignment>
    1617    <SignAssembly>true</SignAssembly>
    … …  
    9596  </PropertyGroup>
    9697  <ItemGroup>
     98    <Reference Include="ALGLIB-3.1.0">
     99      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\ALGLIB-3.1.0.dll</HintPath>
     100    </Reference>
     101    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     102      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     103    </Reference>
     104    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     105      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     106    </Reference>
     107    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     108      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     109    </Reference>
     110    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     111      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     112    </Reference>
     113    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     114      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     115    </Reference>
     116    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     117      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
     118    </Reference>
     119    <Reference Include="HeuristicLab.Optimization.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     120      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     121    </Reference>
     122    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     123      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll</HintPath>
     124    </Reference>
     125    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     126      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     127    </Reference>
     128    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     129      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     130    </Reference>
    97131    <Reference Include="System" />
    98132    <Reference Include="System.Core">
    … …  
    125159    <Compile Include="DataVisualization\HeatMap.cs" />
    126160    <Compile Include="DataVisualization\HeatMapHistory.cs" />
     161    <Compile Include="MultidimensionalScaling\CoordinatesHistory.cs" />
     162    <Compile Include="MultidimensionalScaling\MultidimensionalScaling.cs" />
     163    <Compile Include="MultidimensionalScaling\PopulationDiversityMDSAnalyzer.cs" />
    127164    <Compile Include="MultiObjective\RankBasedParetoFrontAnalyzer.cs" />
    128165    <Compile Include="MultiObjective\ParetoFrontAnalyzer.cs" />
    … …  
    145182  </ItemGroup>
    146183  <ItemGroup>
    147     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    148       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    149       <Name>HeuristicLab.Collections-3.3</Name>
    150     </ProjectReference>
    151     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    152       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    153       <Name>HeuristicLab.Common.Resources-3.3</Name>
    154     </ProjectReference>
    155     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    156       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    157       <Name>HeuristicLab.Common-3.3</Name>
    158     </ProjectReference>
    159     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    160       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    161       <Name>HeuristicLab.Core-3.3</Name>
    162     </ProjectReference>
    163     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    164       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    165       <Name>HeuristicLab.Data-3.3</Name>
    166     </ProjectReference>
    167     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    168       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    169       <Name>HeuristicLab.Operators-3.3</Name>
    170     </ProjectReference>
    171     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    172       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    173       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    174     </ProjectReference>
    175184    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    176185      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    177186      <Name>HeuristicLab.Optimization-3.3</Name>
    178     </ProjectReference>
    179     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    180       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    181       <Name>HeuristicLab.Parameters-3.3</Name>
    182     </ProjectReference>
    183     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    184       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    185       <Name>HeuristicLab.Persistence-3.3</Name>
    186     </ProjectReference>
    187     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    188       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    189       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    190187    </ProjectReference>
    191188  </ItemGroup>

  • branches/QAP/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r5560 r5723  
    9696  </PropertyGroup>
    9797  <ItemGroup>
     98    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     99      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     100    </Reference>
     101    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     102      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     103    </Reference>
     104    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     105      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     106    </Reference>
     107    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     108      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     109    </Reference>
     110    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     111      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     112    </Reference>
     113    <Reference Include="HeuristicLab.Operators-3.3">
     114      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
     115    </Reference>
     116    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     117      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll</HintPath>
     118    </Reference>
     119    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     120      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     121    </Reference>
     122    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     123      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     124    </Reference>
    98125    <Reference Include="System" />
    99126    <Reference Include="System.Core">
    … …  
    187214  </ItemGroup>
    188215  <ItemGroup>
    189     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    190       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    191       <Name>HeuristicLab.Collections-3.3</Name>
    192     </ProjectReference>
    193     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    194       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    195       <Name>HeuristicLab.Common.Resources-3.3</Name>
    196     </ProjectReference>
    197     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    198       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    199       <Name>HeuristicLab.Common-3.3</Name>
    200     </ProjectReference>
    201     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    202       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    203       <Name>HeuristicLab.Core-3.3</Name>
    204     </ProjectReference>
    205     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    206       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    207       <Name>HeuristicLab.Data-3.3</Name>
    208     </ProjectReference>
    209     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    210       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    211       <Name>HeuristicLab.Parameters-3.3</Name>
    212     </ProjectReference>
    213     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    214       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    215       <Name>HeuristicLab.Persistence-3.3</Name>
    216     </ProjectReference>
    217     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    218       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    219       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    220     </ProjectReference>
    221   </ItemGroup>
    222   <ItemGroup>
    223216    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
    224217      <Visible>False</Visible>

  • branches/QAP/HeuristicLab.Optimization/3.3/SingleObjectiveProblem.cs

    r5445 r5723  
    4141      : base() {
    4242      Parameters.Add(new ValueParameter<BoolValue>(MaximizationParameterName, "Set to false if the problem should be minimized."));
    43       Parameters.Add(new ValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem."));
     43      Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem."));
    4444    }
    4545
    46     public ValueParameter<BoolValue> MaximizationParameter {
     46    [StorableHook(HookType.AfterDeserialization)]
     47    protected virtual void AfterDeserialization() {
     48      // BackwardsCompatibility3.3
     49      #region Backwards compatible code (remove with 3.4)
     50      if (BestKnownQualityParameter is ValueParameter<DoubleValue>) {
     51        Parameters.Remove(BestKnownQualityParameterName);
     52        Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem."));
     53      }
     54      #endregion
     55    }
     56
     57    public IValueParameter<BoolValue> MaximizationParameter {
    4758      get { return (ValueParameter<BoolValue>)Parameters[MaximizationParameterName]; }
    4859    }
    … …  
    5566    }
    5667
    57     public ValueParameter<DoubleValue> BestKnownQualityParameter {
    58       get { return (ValueParameter<DoubleValue>)Parameters[BestKnownQualityParameterName]; }
     68    public IValueParameter<DoubleValue> BestKnownQualityParameter {
     69      get { return (IValueParameter<DoubleValue>)Parameters[BestKnownQualityParameterName]; }
    5970    }
    6071    IParameter ISingleObjectiveProblem.BestKnownQualityParameter {

  • branches/QAP/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/HeuristicLab.Problems.QuadraticAssignment.Views-3.3.csproj

    r5641 r5723  
    102102  </PropertyGroup>
    103103  <ItemGroup>
    104     <Reference Include="ALGLIB-3.1.0, Version=3.1.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    105       <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\ALGLIB-3.1.0.dll</HintPath>
    106     </Reference>
    107     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     104    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    108105      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    109106    </Reference>
    110107    <Reference Include="HeuristicLab.Common.Resources-3.3">
    111       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    112     </Reference>
    113     <Reference Include="HeuristicLab.Core-3.3">
    114       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    115     </Reference>
    116     <Reference Include="HeuristicLab.Core.Views-3.3">
    117       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll</HintPath>
    118     </Reference>
    119     <Reference Include="HeuristicLab.Data-3.3">
    120       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    121     </Reference>
    122     <Reference Include="HeuristicLab.Data.Views-3.3">
    123       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Data.Views-3.3.dll</HintPath>
     108      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     109    </Reference>
     110    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     111      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     112    </Reference>
     113    <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     114      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll</HintPath>
     115    </Reference>
     116    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     117      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    124118    </Reference>
    125119    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
    126       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
    127     </Reference>
    128     <Reference Include="HeuristicLab.MainForm-3.3">
    129       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
    130     </Reference>
    131     <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
    132       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    133     </Reference>
    134     <Reference Include="HeuristicLab.Optimization-3.3">
    135       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
     120      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     121    </Reference>
     122    <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     123      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
     124    </Reference>
     125    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     126      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    136127    </Reference>
    137128    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    138       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     129      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    139130    </Reference>
    140131    <Reference Include="System" />
    … …  
    146137  </ItemGroup>
    147138  <ItemGroup>
    148     <Compile Include="MultidimensionalScaling.cs" />
    149139    <Compile Include="QAPAssignmentView.cs">
    150140      <SubType>UserControl</SubType>
    … …  
    172162  <ItemGroup>
    173163    <None Include="HeuristicLab.snk" />
    174   </ItemGroup>
    175   <ItemGroup>
    176     <ProjectReference Include="..\..\HeuristicLab.Problems.QuadraticAssignment\3.3\HeuristicLab.Problems.QuadraticAssignment-3.3.csproj">
    177       <Project>{79271BC8-4446-40E2-BB89-9BE4E17174FE}</Project>
    178       <Name>HeuristicLab.Problems.QuadraticAssignment-3.3</Name>
    179     </ProjectReference>
    180164  </ItemGroup>
    181165  <ItemGroup>
    … …  
    190174    </EmbeddedResource>
    191175  </ItemGroup>
     176  <ItemGroup>
     177    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     178      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     179      <Name>HeuristicLab.Analysis-3.3</Name>
     180    </ProjectReference>
     181    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     182      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     183      <Name>HeuristicLab.Optimization-3.3</Name>
     184    </ProjectReference>
     185    <ProjectReference Include="..\..\HeuristicLab.Problems.QuadraticAssignment\3.3\HeuristicLab.Problems.QuadraticAssignment-3.3.csproj">
     186      <Project>{79271BC8-4446-40E2-BB89-9BE4E17174FE}</Project>
     187      <Name>HeuristicLab.Problems.QuadraticAssignment-3.3</Name>
     188    </ProjectReference>
     189  </ItemGroup>
    192190  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    193191  <PropertyGroup>

  • branches/QAP/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QAPView.cs

    r5648 r5723  
    2626using System.Globalization;
    2727using System.Windows.Forms;
     28using HeuristicLab.Analysis;
    2829using HeuristicLab.Common;
    2930using HeuristicLab.Data;

  • branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/HeuristicLab.Problems.QuadraticAssignment-3.3.csproj

    r5627 r5723  
    122122    <Reference Include="HeuristicLab.Operators-3.3">
    123123      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
    124     </Reference>
    125     <Reference Include="HeuristicLab.Optimization-3.3">
    126       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
    127124    </Reference>
    128125    <Reference Include="HeuristicLab.Parameters-3.3">
    … …  
    411408    <EmbeddedResource Include="Data\wil100.sln" />
    412409  </ItemGroup>
     410  <ItemGroup>
     411    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     412      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     413      <Name>HeuristicLab.Optimization-3.3</Name>
     414    </ProjectReference>
     415  </ItemGroup>
    413416  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    414417  <PropertyGroup>

  • branches/QAP/QAP.sln

    r5648 r5723  
    1010Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2179B537-87D1-4AD9-B5FF-75447F08BDBD}"
    1111  ProjectSection(SolutionItems) = preProject
     12    Local.testsettings = Local.testsettings
    1213    QAP.vsmdi = QAP.vsmdi
     14    TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
    1315  EndProjectSection
     16EndProject
     17Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Analysis-3.3", "HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj", "{887425B4-4348-49ED-A457-B7D2C26DDBF9}"
     18EndProject
     19Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Analysis.Views-3.3", "HeuristicLab.Analysis.Views\3.3\HeuristicLab.Analysis.Views-3.3.csproj", "{76945D76-CA61-4147-9DC2-0ACDCDDF87F9}"
     20EndProject
     21Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Optimization-3.3", "HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj", "{14AB8D24-25BC-400C-A846-4627AA945192}"
     22EndProject
     23Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Analysis.Tests-3.3", "HeuristicLab.Analysis\3.3\Tests\HeuristicLab.Analysis.Tests\HeuristicLab.Analysis.Tests-3.3.csproj", "{34C967E5-EEB1-4502-8035-122EDDEF44CB}"
    1424EndProject
    1525Global
    … …  
    6272    {00E73394-D41B-4C4F-963F-A59341FA1791}.Release|x86.ActiveCfg = Release|x86
    6373    {00E73394-D41B-4C4F-963F-A59341FA1791}.Release|x86.Build.0 = Release|x86
     74    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     75    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
     76    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Debug|x64.ActiveCfg = Debug|x64
     77    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Debug|x64.Build.0 = Debug|x64
     78    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Debug|x86.ActiveCfg = Debug|x86
     79    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Debug|x86.Build.0 = Debug|x86
     80    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
     81    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Release|Any CPU.Build.0 = Release|Any CPU
     82    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Release|x64.ActiveCfg = Release|x64
     83    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Release|x64.Build.0 = Release|x64
     84    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Release|x86.ActiveCfg = Release|x86
     85    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Release|x86.Build.0 = Release|x86
     86    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     87    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
     88    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Debug|x64.ActiveCfg = Debug|x64
     89    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Debug|x64.Build.0 = Debug|x64
     90    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Debug|x86.ActiveCfg = Debug|x86
     91    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Debug|x86.Build.0 = Debug|x86
     92    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
     93    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Release|Any CPU.Build.0 = Release|Any CPU
     94    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Release|x64.ActiveCfg = Release|x64
     95    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Release|x64.Build.0 = Release|x64
     96    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Release|x86.ActiveCfg = Release|x86
     97    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Release|x86.Build.0 = Release|x86
     98    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     99    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|Any CPU.Build.0 = Debug|Any CPU
     100    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x64.ActiveCfg = Debug|x64
     101    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x64.Build.0 = Debug|x64
     102    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x86.ActiveCfg = Debug|x86
     103    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x86.Build.0 = Debug|x86
     104    {14AB8D24-25BC-400C-A846-4627AA945192}.Release|Any CPU.ActiveCfg = Release|Any CPU
     105    {14AB8D24-25BC-400C-A846-4627AA945192}.Release|Any CPU.Build.0 = Release|Any CPU
     106    {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x64.ActiveCfg = Release|x64
     107    {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x64.Build.0 = Release|x64
     108    {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x86.ActiveCfg = Release|x86
     109    {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x86.Build.0 = Release|x86
     110    {34C967E5-EEB1-4502-8035-122EDDEF44CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     111    {34C967E5-EEB1-4502-8035-122EDDEF44CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
     112    {34C967E5-EEB1-4502-8035-122EDDEF44CB}.Debug|x64.ActiveCfg = Debug|Any CPU
     113    {34C967E5-EEB1-4502-8035-122EDDEF44CB}.Debug|x64.Build.0 = Debug|Any CPU
     114    {34C967E5-EEB1-4502-8035-122EDDEF44CB}.Debug|x86.ActiveCfg = Debug|Any CPU
     115    {34C967E5-EEB1-4502-8035-122EDDEF44CB}.Debug|x86.Build.0 = Debug|Any CPU
     116    {34C967E5-EEB1-4502-8035-122EDDEF44CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
     117    {34C967E5-EEB1-4502-8035-122EDDEF44CB}.Release|Any CPU.Build.0 = Release|Any CPU
     118    {34C967E5-EEB1-4502-8035-122EDDEF44CB}.Release|x64.ActiveCfg = Release|Any CPU
     119    {34C967E5-EEB1-4502-8035-122EDDEF44CB}.Release|x64.Build.0 = Release|Any CPU
     120    {34C967E5-EEB1-4502-8035-122EDDEF44CB}.Release|x86.ActiveCfg = Release|Any CPU
     121    {34C967E5-EEB1-4502-8035-122EDDEF44CB}.Release|x86.Build.0 = Release|Any CPU
    64122  EndGlobalSection
    65123  GlobalSection(SolutionProperties) = preSolution

  • branches/QAP/QAP.vsmdi

    r5648 r5723  
    22<TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
    33  <TestList name="Lists of Tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
    4     <RunConfiguration id="61dff98b-e5a1-4d2d-824e-d1f43f5ea4e3" name="Local" storage="local.testsettings" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     4    <RunConfiguration id="db66e284-3f43-4a50-8e06-ec86539024ba" name="Local" storage="local.testsettings" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    55  </TestList>
    66</TestLists>
Note: See TracChangeset for help on using the changeset viewer.