Changeset 15719


Ignore:
Timestamp:
02/04/18 21:31:38 (19 months ago)
Author:
abeham
Message:

#1614:

  • branched analysis and analysis views
  • merged changes from #2457 into optimization and optimization.views
Location:
branches/1614_GeneralizedQAP
Files:
17 edited
4 copied

Legend:

Unmodified
Added
Removed
  • branches/1614_GeneralizedQAP/GeneralizedQAP.sln

    r15702 r15719  
    1212Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{68C6C157-08DA-414F-9256-CCCA13038399}"
    1313EndProject
    14 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7275B9B0-0E8D-471E-9F64-067E1F85BB71}"
    15 EndProject
    1614Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Optimization-3.3", "HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj", "{14AB8D24-25BC-400C-A846-4627AA945192}"
    1715EndProject
     
    2826Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Analysis.FitnessLandscape-3.3", "HeuristicLab.Analysis.FitnessLandscape\3.3\HeuristicLab.Analysis.FitnessLandscape-3.3.csproj", "{5FBDCD4A-3C2A-4EC6-83CE-34B29F43621A}"
    2927EndProject
     28Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Analysis-3.3", "HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj", "{887425B4-4348-49ED-A457-B7D2C26DDBF9}"
     29EndProject
     30Project("{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}"
     31EndProject
    3032Global
    31   GlobalSection(Performance) = preSolution
    32     HasPerformanceSessions = true
    33   EndGlobalSection
    3433  GlobalSection(SolutionConfigurationPlatforms) = preSolution
    3534    Debug|Any CPU = Debug|Any CPU
     
    173172    {5FBDCD4A-3C2A-4EC6-83CE-34B29F43621A}.Release|x86.ActiveCfg = Release|x86
    174173    {5FBDCD4A-3C2A-4EC6-83CE-34B29F43621A}.Release|x86.Build.0 = Release|x86
     174    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     175    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
     176    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Debug|x64.ActiveCfg = Debug|x64
     177    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Debug|x64.Build.0 = Debug|x64
     178    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Debug|x86.ActiveCfg = Debug|x86
     179    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Debug|x86.Build.0 = Debug|x86
     180    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
     181    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Release|Any CPU.Build.0 = Release|Any CPU
     182    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Release|x64.ActiveCfg = Release|x64
     183    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Release|x64.Build.0 = Release|x64
     184    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Release|x86.ActiveCfg = Release|x86
     185    {887425B4-4348-49ED-A457-B7D2C26DDBF9}.Release|x86.Build.0 = Release|x86
     186    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     187    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
     188    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Debug|x64.ActiveCfg = Debug|x64
     189    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Debug|x64.Build.0 = Debug|x64
     190    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Debug|x86.ActiveCfg = Debug|x86
     191    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Debug|x86.Build.0 = Debug|x86
     192    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
     193    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Release|Any CPU.Build.0 = Release|Any CPU
     194    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Release|x64.ActiveCfg = Release|x64
     195    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Release|x64.Build.0 = Release|x64
     196    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Release|x86.ActiveCfg = Release|x86
     197    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}.Release|x86.Build.0 = Release|x86
    175198  EndGlobalSection
    176199  GlobalSection(SolutionProperties) = preSolution
     
    192215    HasPerformanceSessions = true
    193216  EndGlobalSection
     217  GlobalSection(Performance) = preSolution
     218    HasPerformanceSessions = true
     219  EndGlobalSection
    194220EndGlobal
  • branches/1614_GeneralizedQAP/HeuristicLab.Algorithms.GRASP/3.3/HeuristicLab.Algorithms.GRASP-3.3.csproj

    r15698 r15719  
    4141  </PropertyGroup>
    4242  <ItemGroup>
    43     <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0">
    44       <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    45       <Private>False</Private>
    46     </Reference>
    4743    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0">
    4844      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     
    105101  </ItemGroup>
    106102  <ItemGroup>
     103    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     104      <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
     105      <Name>HeuristicLab.Analysis-3.3</Name>
     106      <Private>False</Private>
     107    </ProjectReference>
    107108    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    108109      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/HeuristicLab.Analysis.FitnessLandscape-3.3.csproj

    r15713 r15719  
    9494    <Reference Include="ALGLIB-3.7.0">
    9595      <HintPath>..\..\..\..\trunk\bin\ALGLIB-3.7.0.dll</HintPath>
    96       <Private>False</Private>
    97     </Reference>
    98     <Reference Include="HeuristicLab.Analysis-3.3">
    99       <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    10096      <Private>False</Private>
    10197    </Reference>
     
    256252  </ItemGroup>
    257253  <ItemGroup>
     254    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     255      <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
     256      <Name>HeuristicLab.Analysis-3.3</Name>
     257      <Private>False</Private>
     258    </ProjectReference>
    258259    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    259260      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj

    r14982 r15719  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
     
    5151    <DebugType>pdbonly</DebugType>
    5252    <Optimize>true</Optimize>
    53     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     53    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    5454    <DefineConstants>TRACE</DefineConstants>
    5555    <ErrorReport>prompt</ErrorReport>
     
    6262  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6363    <DebugSymbols>true</DebugSymbols>
    64     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     64    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    6565    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6666    <DebugType>full</DebugType>
     
    7171  </PropertyGroup>
    7272  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    73     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     73    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    7474    <DefineConstants>TRACE</DefineConstants>
    7575    <DocumentationFile>
     
    8484  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8585    <DebugSymbols>true</DebugSymbols>
    86     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     86    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    8787    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8888    <DebugType>full</DebugType>
     
    9393  </PropertyGroup>
    9494  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    95     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     95    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    9696    <DefineConstants>TRACE</DefineConstants>
    9797    <DocumentationFile>
     
    106106  <ItemGroup>
    107107    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    108       <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
     108      <HintPath>..\..\..\..\trunk\bin\ALGLIB-3.7.0.dll</HintPath>
     109      <Private>False</Private>
     110    </Reference>
     111    <Reference Include="HeuristicLab.Collections-3.3">
     112      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     113      <Private>False</Private>
     114    </Reference>
     115    <Reference Include="HeuristicLab.Common.Resources-3.3">
     116      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     117      <Private>False</Private>
     118    </Reference>
     119    <Reference Include="HeuristicLab.Common-3.3">
     120      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Common-3.3.dll</HintPath>
     121      <Private>False</Private>
     122    </Reference>
     123    <Reference Include="HeuristicLab.Core.Views-3.3">
     124      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
     125      <Private>False</Private>
     126    </Reference>
     127    <Reference Include="HeuristicLab.Core-3.3">
     128      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Core-3.3.dll</HintPath>
     129      <Private>False</Private>
     130    </Reference>
     131    <Reference Include="HeuristicLab.Data-3.3">
     132      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Data-3.3.dll</HintPath>
     133      <Private>False</Private>
     134    </Reference>
     135    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
     136      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     137      <Private>False</Private>
     138    </Reference>
     139    <Reference Include="HeuristicLab.MainForm-3.3">
     140      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
     141      <Private>False</Private>
     142    </Reference>
     143    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     144      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     145      <Private>False</Private>
     146    </Reference>
     147    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3">
     148      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
    109149      <Private>False</Private>
    110150    </Reference>
     
    246286      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    247287      <Name>HeuristicLab.Analysis-3.3</Name>
    248       <Private>False</Private>
    249     </ProjectReference>
    250     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    251       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    252       <Name>HeuristicLab.Collections-3.3</Name>
    253       <Private>False</Private>
    254     </ProjectReference>
    255     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    256       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    257       <Name>HeuristicLab.Common.Resources-3.3</Name>
    258       <Private>False</Private>
    259     </ProjectReference>
    260     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    261       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    262       <Name>HeuristicLab.Common-3.3</Name>
    263       <Private>False</Private>
    264     </ProjectReference>
    265     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    266       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    267       <Name>HeuristicLab.Core.Views-3.3</Name>
    268       <Private>False</Private>
    269     </ProjectReference>
    270     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    271       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    272       <Name>HeuristicLab.Core-3.3</Name>
    273       <Private>False</Private>
    274     </ProjectReference>
    275     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    276       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    277       <Name>HeuristicLab.Data-3.3</Name>
    278       <Private>False</Private>
    279     </ProjectReference>
    280     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    281       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    282       <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    283       <Private>False</Private>
    284     </ProjectReference>
    285     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    286       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    287       <Name>HeuristicLab.MainForm-3.3</Name>
    288       <Private>False</Private>
    289     </ProjectReference>
    290     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    291       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    292       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    293       <Private>False</Private>
    294     </ProjectReference>
    295     <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    296       <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    297       <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    298288      <Private>False</Private>
    299289    </ProjectReference>
  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

    r14734 r15719  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
     
    5151    <DebugType>pdbonly</DebugType>
    5252    <Optimize>true</Optimize>
    53     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     53    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    5454    <DefineConstants>TRACE</DefineConstants>
    5555    <ErrorReport>prompt</ErrorReport>
     
    6262  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6363    <DebugSymbols>true</DebugSymbols>
    64     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     64    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    6565    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6666    <DebugType>full</DebugType>
     
    7171  </PropertyGroup>
    7272  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    73     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     73    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    7474    <DefineConstants>TRACE</DefineConstants>
    7575    <DocumentationFile>
     
    8484  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8585    <DebugSymbols>true</DebugSymbols>
    86     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     86    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    8787    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8888    <DebugType>full</DebugType>
     
    9393  </PropertyGroup>
    9494  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    95     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     95    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    9696    <DefineConstants>TRACE</DefineConstants>
    9797    <DocumentationFile>
     
    106106  <ItemGroup>
    107107    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    108       <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
     108      <HintPath>..\..\..\..\trunk\bin\ALGLIB-3.7.0.dll</HintPath>
     109      <Private>False</Private>
     110    </Reference>
     111    <Reference Include="HeuristicLab.Collections-3.3">
     112      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     113      <Private>False</Private>
     114    </Reference>
     115    <Reference Include="HeuristicLab.Common.Resources-3.3">
     116      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     117      <Private>False</Private>
     118    </Reference>
     119    <Reference Include="HeuristicLab.Common-3.3">
     120      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Common-3.3.dll</HintPath>
     121      <Private>False</Private>
     122    </Reference>
     123    <Reference Include="HeuristicLab.Core-3.3">
     124      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Core-3.3.dll</HintPath>
     125      <Private>False</Private>
     126    </Reference>
     127    <Reference Include="HeuristicLab.Data-3.3">
     128      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Data-3.3.dll</HintPath>
     129      <Private>False</Private>
     130    </Reference>
     131    <Reference Include="HeuristicLab.Operators-3.3">
     132      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     133      <Private>False</Private>
     134    </Reference>
     135    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
     136      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     137      <Private>False</Private>
     138    </Reference>
     139    <Reference Include="HeuristicLab.Parameters-3.3">
     140      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     141      <Private>False</Private>
     142    </Reference>
     143    <Reference Include="HeuristicLab.Persistence-3.3">
     144      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     145      <Private>False</Private>
     146    </Reference>
     147    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     148      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    109149      <Private>False</Private>
    110150    </Reference>
     
    186226  </ItemGroup>
    187227  <ItemGroup>
    188     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    189       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    190       <Name>HeuristicLab.Collections-3.3</Name>
    191       <Private>False</Private>
    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       <Private>False</Private>
    197     </ProjectReference>
    198     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    199       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    200       <Name>HeuristicLab.Common-3.3</Name>
    201       <Private>False</Private>
    202     </ProjectReference>
    203     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    204       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    205       <Name>HeuristicLab.Core-3.3</Name>
    206       <Private>False</Private>
    207     </ProjectReference>
    208     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    209       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    210       <Name>HeuristicLab.Data-3.3</Name>
    211       <Private>False</Private>
    212     </ProjectReference>
    213     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    214       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    215       <Name>HeuristicLab.Operators-3.3</Name>
    216       <Private>False</Private>
    217     </ProjectReference>
    218     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    219       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    220       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    221       <Private>False</Private>
    222     </ProjectReference>
    223     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    224       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    225       <Name>HeuristicLab.Optimization-3.3</Name>
    226       <Private>False</Private>
    227     </ProjectReference>
    228     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    229       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    230       <Name>HeuristicLab.Parameters-3.3</Name>
    231       <Private>False</Private>
    232     </ProjectReference>
    233     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    234       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    235       <Name>HeuristicLab.Persistence-3.3</Name>
    236       <Private>False</Private>
    237     </ProjectReference>
    238     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    239       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    240       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    241       <Private>False</Private>
    242     </ProjectReference>
    243   </ItemGroup>
    244   <ItemGroup>
    245228    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
    246229      <Visible>False</Visible>
     
    259242    </BootstrapperPackage>
    260243  </ItemGroup>
    261   <ItemGroup />
     244  <ItemGroup>
     245    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     246      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
     247      <Name>HeuristicLab.Optimization-3.3</Name>
     248      <Private>False</Private>
     249    </ProjectReference>
     250  </ItemGroup>
    262251  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    263252  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • branches/1614_GeneralizedQAP/HeuristicLab.Optimization

  • branches/1614_GeneralizedQAP/HeuristicLab.Optimization.Views

  • branches/1614_GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r15688 r15719  
    391391      <Private>False</Private>
    392392    </Reference>
    393     <Reference Include="HeuristicLab.Analysis.Views-3.3, Version=3.3.0.0">
    394       <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Analysis.Views-3.3.dll</HintPath>
    395       <Private>False</Private>
    396     </Reference>
    397393    <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0">
    398394      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
     
    427423      <Private>False</Private>
    428424    </Reference>
    429     <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0">
    430       <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    431       <Private>False</Private>
    432     </Reference>
    433   </ItemGroup>
    434   <ItemGroup>
     425  </ItemGroup>
     426  <ItemGroup>
     427    <ProjectReference Include="..\..\HeuristicLab.Analysis.Views\3.3\HeuristicLab.Analysis.Views-3.3.csproj">
     428      <Project>{76945d76-ca61-4147-9dc2-0acdcddf87f9}</Project>
     429      <Name>HeuristicLab.Analysis.Views-3.3</Name>
     430      <Private>False</Private>
     431    </ProjectReference>
     432    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     433      <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
     434      <Name>HeuristicLab.Analysis-3.3</Name>
     435      <Private>False</Private>
     436    </ProjectReference>
    435437    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    436438      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
  • branches/1614_GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/RunView.cs

    r15605 r15719  
    9797
    9898    private void Content_PropertyChanged(object sender, PropertyChangedEventArgs e) {
     99      if (InvokeRequired) {
     100        Invoke((Action<object, PropertyChangedEventArgs>)Content_PropertyChanged, sender, e);
     101        return;
     102      }
    99103      if (e.PropertyName == "Color") {
    100104        if (InvokeRequired) this.Invoke((Action)UpdateColor, null);
     
    112116
    113117    private void ParametersOnItemsChanged(object sender, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>> e) {
     118      if (InvokeRequired) {
     119        Invoke((Action<object, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>>>)ParametersOnItemsChanged, sender, e);
     120        return;
     121      }
    114122      foreach (var item in e.OldItems) {
    115123        listView.Items.Remove(parametersItemToListViewItem[item.Key]);
     
    124132
    125133    private void ParametersOnItemsRemoved(object sender, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>> e) {
     134      if (InvokeRequired) {
     135        Invoke((Action<object, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>>>)ParametersOnItemsRemoved, sender, e);
     136        return;
     137      }
    126138      foreach (var item in e.Items) {
    127139        listView.Items.Remove(parametersItemToListViewItem[item.Key]);
     
    131143
    132144    private void ResultsOnItemsChanged(object sender, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>> e) {
     145      if (InvokeRequired) {
     146        Invoke((Action<object, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>>>)ResultsOnItemsChanged, sender, e);
     147        return;
     148      }
    133149      foreach (var item in e.OldItems) {
    134150        listView.Items.Remove(resultsItemToListViewItem[item.Key]);
     
    143159
    144160    private void ResultsOnItemsRemoved(object sender, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>> e) {
     161      if (InvokeRequired) {
     162        Invoke((Action<object, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>>>)ResultsOnItemsRemoved, sender, e);
     163        return;
     164      }
    145165      foreach (var item in e.Items) {
    146166        listView.Items.Remove(resultsItemToListViewItem[item.Key]);
  • branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3

    • Property svn:ignore
      •  

        old new  
        55*.vs10x
        66Plugin.cs
         7*.DotSettings
  • branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

    r15605 r15719  
    221221    }
    222222    public virtual void CollectResultValues(IDictionary<string, IItem> values) {
    223       values.Add("Execution Time", new TimeSpanValue(ExecutionTime));
     223      if (!Results.ContainsKey("Execution Time"))
     224        values.Add("Execution Time", new TimeSpanValue(ExecutionTime));
    224225      Results.CollectResultValues(values);
    225226    }
  • branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/Algorithms/EngineAlgorithm.cs

    r15605 r15719  
    170170        context = new ExecutionContext(context, operatorGraph.InitialOperator, globalScope);
    171171        engine.Prepare(context);
     172        engine.Log.Clear();
    172173      }
    173174    }
  • branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r15688 r15719  
    158158    <Compile Include="Interfaces\IPopulationReducer.cs" />
    159159    <Compile Include="MultiObjective\DominationCalculator.cs" />
     160    <Compile Include="Interfaces\IPreexistingSolutionCreator.cs" />
     161    <Compile Include="Interfaces\ISolutionModel.cs" />
    160162    <Compile Include="Results\IResultParameter.cs" />
    161163    <Compile Include="Interfaces\ISingleObjectiveOperator.cs" />
     
    173175    <Compile Include="MetaOptimizers\TimeLimitRun.cs" />
    174176    <Compile Include="Results\ResultParameter.cs" />
     177    <Compile Include="RunCollection.cs">
     178      <SubType>Code</SubType>
     179    </Compile>
    175180    <Compile Include="RunCollectionModification\RunCollectionRunRemover.cs" />
    176181    <Compile Include="Plugin.cs" />
     
    230235    <Compile Include="OptimizerList.cs" />
    231236    <Compile Include="Interfaces\IOptimizer.cs" />
    232     <Compile Include="RunCollection.cs" />
    233237    <Compile Include="Run.cs" />
    234238    <Compile Include="Results\IResult.cs" />
  • branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs

  • branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/Results/ResultParameter.cs

    r15605 r15719  
    4040      get { return resultCollectionName; }
    4141      set {
     42        if (value == null) throw new ArgumentNullException();
    4243        if (string.IsNullOrWhiteSpace(value)) throw new ArgumentNullException();
    4344        else if (!value.Equals(resultCollectionName)) {
  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3.csproj

    r15698 r15719  
    4242  </PropertyGroup>
    4343  <ItemGroup>
    44     <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0">
    45       <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    46       <Private>False</Private>
    47     </Reference>
    4844    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0">
    4945      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     
    146142  </ItemGroup>
    147143  <ItemGroup>
     144    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     145      <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
     146      <Name>HeuristicLab.Analysis-3.3</Name>
     147      <Private>False</Private>
     148    </ProjectReference>
    148149    <ProjectReference Include="..\..\HeuristicLab.Encodings.IntegerVectorEncoding\3.3\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj">
    149150      <Project>{ddfb14dd-2a85-493c-a52d-e69729bbaeb0}</Project>
  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj

    r15688 r15719  
    4141  </PropertyGroup>
    4242  <ItemGroup>
    43     <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0">
    44       <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    45       <Private>False</Private>
    46     </Reference>
    4743    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0">
    4844      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     
    162158  </ItemGroup>
    163159  <ItemGroup>
     160    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     161      <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
     162      <Name>HeuristicLab.Analysis-3.3</Name>
     163      <Private>False</Private>
     164    </ProjectReference>
    164165    <ProjectReference Include="..\..\HeuristicLab.Encodings.IntegerVectorEncoding\3.3\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj">
    165166      <Project>{ddfb14dd-2a85-493c-a52d-e69729bbaeb0}</Project>
Note: See TracChangeset for help on using the changeset viewer.