Free cookie consent management tool by TermsFeed Policy Generator

Changeset 17117


Ignore:
Timestamp:
07/08/19 15:52:20 (5 years ago)
Author:
abeham
Message:

#2931: merged to stable (16910, 16939, 16944, 17095)

Location:
stable
Files:
1 deleted
20 edited
7 copied

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab 3.3.sln

    r15593 r17117  
    5050    {F98A1740-9AC9-4D36-A582-6A2D0D06978D} = {F98A1740-9AC9-4D36-A582-6A2D0D06978D}
    5151    {B03C4E41-1D01-4C60-B0F4-DBB257D98CA8} = {B03C4E41-1D01-4C60-B0F4-DBB257D98CA8}
     52    {D1D69043-17E6-4B8C-BF41-0799C7E56032} = {D1D69043-17E6-4B8C-BF41-0799C7E56032}
    5253    {73F29D43-5714-4069-8FAB-0D18FEB5F175} = {73F29D43-5714-4069-8FAB-0D18FEB5F175}
    5354    {3E9E8944-44FF-40BB-A622-3A4A7DD0F198} = {3E9E8944-44FF-40BB-A622-3A4A7DD0F198}
    … …  
    8687    {9D792B6D-836B-46DC-9D69-50B4B1E7B87F} = {9D792B6D-836B-46DC-9D69-50B4B1E7B87F}
    8788    {399EBB6E-37A1-4AE4-B8CD-0D461FF286A3} = {399EBB6E-37A1-4AE4-B8CD-0D461FF286A3}
     89    {FA3B9270-48B7-4C77-9FEA-2A6EDE82E909} = {FA3B9270-48B7-4C77-9FEA-2A6EDE82E909}
    8890    {3C906172-E044-4DF0-B4FD-AA21192D5D3E} = {3C906172-E044-4DF0-B4FD-AA21192D5D3E}
    8991    {DC3D7072-7999-4719-B65D-3997744D5DC1} = {DC3D7072-7999-4719-B65D-3997744D5DC1}
    … …  
    459461EndProject
    460462Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3", "HeuristicLab.Algorithms.MOCMAEvolutionStrategy\3.3\HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3.csproj", "{0E2E224F-E9B2-41F3-B510-09183EEBA2AF}"
     463EndProject
     464Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ExactOptimization-3.3", "HeuristicLab.ExactOptimization\3.3\HeuristicLab.ExactOptimization-3.3.csproj", "{FA3B9270-48B7-4C77-9FEA-2A6EDE82E909}"
     465EndProject
     466Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ExactOptimization.Views-3.3", "HeuristicLab.ExactOptimization.Views\3.3\HeuristicLab.ExactOptimization.Views-3.3.csproj", "{D1D69043-17E6-4B8C-BF41-0799C7E56032}"
    461467EndProject
    462468Global
    … …  
    22342240    {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Release|x86.ActiveCfg = Release|x86
    22352241    {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Release|x86.Build.0 = Release|x86
     2242    {FA3B9270-48B7-4C77-9FEA-2A6EDE82E909}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2243    {FA3B9270-48B7-4C77-9FEA-2A6EDE82E909}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2244    {FA3B9270-48B7-4C77-9FEA-2A6EDE82E909}.Debug|x64.ActiveCfg = Debug|x64
     2245    {FA3B9270-48B7-4C77-9FEA-2A6EDE82E909}.Debug|x64.Build.0 = Debug|x64
     2246    {FA3B9270-48B7-4C77-9FEA-2A6EDE82E909}.Debug|x86.ActiveCfg = Debug|Any CPU
     2247    {FA3B9270-48B7-4C77-9FEA-2A6EDE82E909}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2248    {FA3B9270-48B7-4C77-9FEA-2A6EDE82E909}.Release|Any CPU.Build.0 = Release|Any CPU
     2249    {FA3B9270-48B7-4C77-9FEA-2A6EDE82E909}.Release|x64.ActiveCfg = Release|x64
     2250    {FA3B9270-48B7-4C77-9FEA-2A6EDE82E909}.Release|x64.Build.0 = Release|x64
     2251    {FA3B9270-48B7-4C77-9FEA-2A6EDE82E909}.Release|x86.ActiveCfg = Release|Any CPU
     2252    {D1D69043-17E6-4B8C-BF41-0799C7E56032}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2253    {D1D69043-17E6-4B8C-BF41-0799C7E56032}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2254    {D1D69043-17E6-4B8C-BF41-0799C7E56032}.Debug|x64.ActiveCfg = Debug|x64
     2255    {D1D69043-17E6-4B8C-BF41-0799C7E56032}.Debug|x64.Build.0 = Debug|x64
     2256    {D1D69043-17E6-4B8C-BF41-0799C7E56032}.Debug|x86.ActiveCfg = Debug|Any CPU
     2257    {D1D69043-17E6-4B8C-BF41-0799C7E56032}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2258    {D1D69043-17E6-4B8C-BF41-0799C7E56032}.Release|Any CPU.Build.0 = Release|Any CPU
     2259    {D1D69043-17E6-4B8C-BF41-0799C7E56032}.Release|x64.ActiveCfg = Release|x64
     2260    {D1D69043-17E6-4B8C-BF41-0799C7E56032}.Release|x64.Build.0 = Release|x64
     2261    {D1D69043-17E6-4B8C-BF41-0799C7E56032}.Release|x86.ActiveCfg = Release|Any CPU
    22362262  EndGlobalSection
    22372263  GlobalSection(SolutionProperties) = preSolution

  • stable/HeuristicLab.Core

  • stable/HeuristicLab.Core/3.3/Attributes/CreatableAttribute.cs

    r17097 r17117  
    3535      public const string PopulationBasedAlgorithms = Algorithms + SplitToken + "1" + OrderToken + "Population Based";
    3636      public const string SingleSolutionAlgorithms = Algorithms + SplitToken + "2" + OrderToken + "Single Solution";
     37      public const string ExactAlgorithms = Algorithms + SplitToken + "3" + OrderToken + "Exact";
    3738
    3839      public const string Problems = "2" + OrderToken + "Problems";

  • stable/HeuristicLab.Data

  • stable/HeuristicLab.Data.Views

  • stable/HeuristicLab.Data.Views/3.3

  • stable/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj

    r17097 r17117  
    221221      <DependentUpon>StringConvertibleMatrixView.cs</DependentUpon>
    222222    </Compile>
     223    <Compile Include="TextValueView.cs">
     224      <SubType>UserControl</SubType>
     225    </Compile>
     226    <Compile Include="TextValueView.Designer.cs">
     227      <DependentUpon>TextValueView.cs</DependentUpon>
     228    </Compile>
    223229    <Compile Include="StringConvertibleValueView.cs">
    224230      <SubType>UserControl</SubType>

  • stable/HeuristicLab.Data/3.3

  • stable/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj

    r17105 r17117  
    124124    <Compile Include="ComparisonType.cs" />
    125125    <Compile Include="EnumValue.cs" />
     126    <Compile Include="Interfaces\ITextValue.cs" />
    126127    <Compile Include="Interfaces\IValueTypeArray.cs" />
    127128    <Compile Include="Path Types\DirectoryValue.cs" />
    … …  
    151152    <Compile Include="StringConvertibleArray.cs" />
    152153    <Compile Include="StringMatrix.cs" />
     154    <Compile Include="TextValue.cs" />
    153155    <Compile Include="StringValue.cs" />
    154156    <Compile Include="TimeSpanValue.cs" />

  • stable/HeuristicLab.ExactOptimization.Views/3.3/HeuristicLab.ExactOptimization.Views-3.3.csproj

    r16910 r17117  
    1212    <AssemblyName>HeuristicLab.ExactOptimization.Views-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     14    <SignAssembly>true</SignAssembly>
     15    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    1416    <FileAlignment>512</FileAlignment>
    1517    <TargetFrameworkProfile />
    … …  
    1921    <DebugType>full</DebugType>
    2022    <Optimize>false</Optimize>
    21     <OutputPath>..\..\bin\</OutputPath>
     23    <OutputPath>bin\Debug\</OutputPath>
    2224    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2325    <ErrorReport>prompt</ErrorReport>
    … …  
    3032    <DebugType>pdbonly</DebugType>
    3133    <Optimize>true</Optimize>
    32     <OutputPath>..\..\bin\</OutputPath>
     34    <OutputPath>bin\Release\</OutputPath>
    3335    <DefineConstants>TRACE</DefineConstants>
    3436    <ErrorReport>prompt</ErrorReport>
    3537    <WarningLevel>4</WarningLevel>
    36     <Prefer32Bit>false</Prefer32Bit>
    37   </PropertyGroup>
    38   <PropertyGroup>
    39     <SignAssembly>true</SignAssembly>
    40   </PropertyGroup>
    41   <PropertyGroup>
    42     <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    43   </PropertyGroup>
    44   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    45     <DebugSymbols>true</DebugSymbols>
    46     <OutputPath>..\..\bin\</OutputPath>
    47     <DefineConstants>DEBUG;TRACE</DefineConstants>
    48     <DebugType>full</DebugType>
    49     <PlatformTarget>x86</PlatformTarget>
    50     <CodeAnalysisLogFile>bin\Debug\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    51     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    52     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    53     <ErrorReport>prompt</ErrorReport>
    54     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    55     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    56     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
    57     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    58     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
    59     <Prefer32Bit>false</Prefer32Bit>
    60   </PropertyGroup>
    61   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    62     <OutputPath>..\..\bin\</OutputPath>
    63     <DefineConstants>TRACE</DefineConstants>
    64     <Optimize>true</Optimize>
    65     <DebugType>pdbonly</DebugType>
    66     <PlatformTarget>x86</PlatformTarget>
    67     <CodeAnalysisLogFile>bin\Release\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    68     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    69     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    70     <ErrorReport>prompt</ErrorReport>
    71     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    72     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    73     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    74     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
    7538    <Prefer32Bit>false</Prefer32Bit>
    7639  </PropertyGroup>
    7740  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    7841    <DebugSymbols>true</DebugSymbols>
    79     <OutputPath>..\..\bin\</OutputPath>
     42    <OutputPath>bin\Debug\</OutputPath>
    8043    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8144    <DebugType>full</DebugType>
    8245    <PlatformTarget>x64</PlatformTarget>
    83     <CodeAnalysisLogFile>bin\Debug\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    84     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    85     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    86     <ErrorReport>prompt</ErrorReport>
    87     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    88     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    89     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
    90     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    91     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     46    <ErrorReport>prompt</ErrorReport>
    9247    <Prefer32Bit>false</Prefer32Bit>
    9348  </PropertyGroup>
    9449  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    95     <OutputPath>..\..\bin\</OutputPath>
     50    <OutputPath>bin\Release\</OutputPath>
    9651    <DefineConstants>TRACE</DefineConstants>
    9752    <Optimize>true</Optimize>
    9853    <DebugType>pdbonly</DebugType>
    9954    <PlatformTarget>x64</PlatformTarget>
    100     <CodeAnalysisLogFile>bin\Release\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    101     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    102     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    103     <ErrorReport>prompt</ErrorReport>
    104     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    105     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    106     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
    107     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    108     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
    109     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
     55    <ErrorReport>prompt</ErrorReport>
    11056    <Prefer32Bit>false</Prefer32Bit>
    11157  </PropertyGroup>
    … …  
    158104      <Project>{C38691AE-ECB4-489A-A05D-B035554E0168}</Project>
    159105      <Name>HeuristicLab.CodeEditor-3.4</Name>
    160       <Private>False</Private>
     106      <Private>True</Private>
    161107    </ProjectReference>
    162108    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    163109      <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
    164110      <Name>HeuristicLab.Common.Resources-3.3</Name>
    165       <Private>False</Private>
     111      <Private>True</Private>
    166112    </ProjectReference>
    167113    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    168114      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    169115      <Name>HeuristicLab.Common-3.3</Name>
    170       <Private>False</Private>
     116      <Private>True</Private>
    171117    </ProjectReference>
    172118    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    173119      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    174120      <Name>HeuristicLab.Core.Views-3.3</Name>
    175       <Private>False</Private>
     121      <Private>True</Private>
    176122    </ProjectReference>
    177123    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    178124      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    179125      <Name>HeuristicLab.Core-3.3</Name>
    180       <Private>False</Private>
     126      <Private>True</Private>
    181127    </ProjectReference>
    182128    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    183129      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    184130      <Name>HeuristicLab.Data.Views-3.3</Name>
    185       <Private>False</Private>
     131      <Private>True</Private>
    186132    </ProjectReference>
    187133    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    188134      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
    189135      <Name>HeuristicLab.Data-3.3</Name>
    190       <Private>False</Private>
     136      <Private>True</Private>
    191137    </ProjectReference>
    192138    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    193139      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    194140      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    195       <Private>False</Private>
     141      <Private>True</Private>
    196142    </ProjectReference>
    197143    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    198144      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    199145      <Name>HeuristicLab.MainForm-3.3</Name>
    200       <Private>False</Private>
     146      <Private>True</Private>
    201147    </ProjectReference>
    202148    <ProjectReference Include="..\..\HeuristicLab.ExactOptimization\3.3\HeuristicLab.ExactOptimization-3.3.csproj">
    203149      <Project>{fa3b9270-48b7-4c77-9fea-2a6ede82e909}</Project>
    204150      <Name>HeuristicLab.ExactOptimization-3.3</Name>
    205       <Private>False</Private>
     151      <Private>True</Private>
    206152    </ProjectReference>
    207153    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    208154      <Project>{662b4b15-8f4d-4ae5-b3eb-d91c215f5af2}</Project>
    209155      <Name>HeuristicLab.Optimization.Views-3.3</Name>
    210       <Private>False</Private>
     156      <Private>True</Private>
    211157    </ProjectReference>
    212158    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    213159      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    214160      <Name>HeuristicLab.Optimization-3.3</Name>
    215       <Private>False</Private>
     161      <Private>True</Private>
    216162    </ProjectReference>
    217163    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    218164      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    219165      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    220       <Private>False</Private>
     166      <Private>True</Private>
    221167    </ProjectReference>
    222168    <ProjectReference Include="..\..\HeuristicLab.Problems.Programmable.Views\3.3\HeuristicLab.Problems.Programmable.Views-3.3.csproj">
    223169      <Project>{6F023B90-2091-40A9-8AC0-B0338DFF8E5F}</Project>
    224170      <Name>HeuristicLab.Problems.Programmable.Views-3.3</Name>
    225       <Private>False</Private>
     171      <Private>True</Private>
    226172    </ProjectReference>
    227173    <ProjectReference Include="..\..\HeuristicLab.Problems.Programmable\3.3\HeuristicLab.Problems.Programmable-3.3.csproj">
    228174      <Project>{EE07BFF8-B23D-41F5-8AD7-AC9598D7A2C9}</Project>
    229175      <Name>HeuristicLab.Problems.Programmable-3.3</Name>
    230       <Private>False</Private>
     176      <Private>True</Private>
    231177    </ProjectReference>
    232178    <ProjectReference Include="..\..\HeuristicLab.Scripting.Views\3.3\HeuristicLab.Scripting.Views-3.3.csproj">
    233179      <Project>{0C2917C8-7AA8-4E18-800A-C4D064F992ED}</Project>
    234180      <Name>HeuristicLab.Scripting.Views-3.3</Name>
    235       <Private>False</Private>
     181      <Private>True</Private>
    236182    </ProjectReference>
    237183    <ProjectReference Include="..\..\HeuristicLab.Scripting\3.3\HeuristicLab.Scripting-3.3.csproj">
    238184      <Project>{21977CC3-1757-4B3B-87BD-FF817AAA900F}</Project>
    239185      <Name>HeuristicLab.Scripting-3.3</Name>
    240       <Private>False</Private>
     186      <Private>True</Private>
    241187    </ProjectReference>
    242188  </ItemGroup>
    … …  
    251197  </PropertyGroup>
    252198  <PropertyGroup>
    253     <PostBuildEvent>
    254     </PostBuildEvent>
     199    <PostBuildEvent>copy /y "$(TargetPath)" "$(SolutionDir)\bin"</PostBuildEvent>
    255200  </PropertyGroup>
    256201  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • stable/HeuristicLab.ExactOptimization/3.3/HeuristicLab.ExactOptimization-3.3.csproj

    r16910 r17117  
    1212    <AssemblyName>HeuristicLab.ExactOptimization-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     14    <SignAssembly>true</SignAssembly>
     15    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    1416    <FileAlignment>512</FileAlignment>
    1517    <TargetFrameworkProfile />
    … …  
    1921    <DebugType>full</DebugType>
    2022    <Optimize>false</Optimize>
    21     <OutputPath>..\..\bin\</OutputPath>
     23    <OutputPath>bin\Debug\</OutputPath>
    2224    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2325    <ErrorReport>prompt</ErrorReport>
    … …  
    3032    <DebugType>pdbonly</DebugType>
    3133    <Optimize>true</Optimize>
    32     <OutputPath>..\..\bin\</OutputPath>
     34    <OutputPath>bin\Release\</OutputPath>
    3335    <DefineConstants>TRACE</DefineConstants>
    3436    <ErrorReport>prompt</ErrorReport>
    3537    <WarningLevel>4</WarningLevel>
    36     <Prefer32Bit>false</Prefer32Bit>
    37   </PropertyGroup>
    38   <PropertyGroup>
    39     <SignAssembly>true</SignAssembly>
    40   </PropertyGroup>
    41   <PropertyGroup>
    42     <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    43   </PropertyGroup>
    44   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    45     <DebugSymbols>true</DebugSymbols>
    46     <OutputPath>..\..\bin\</OutputPath>
    47     <DefineConstants>DEBUG;TRACE</DefineConstants>
    48     <DebugType>full</DebugType>
    49     <PlatformTarget>x86</PlatformTarget>
    50     <CodeAnalysisLogFile>bin\Debug\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    51     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    52     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    53     <ErrorReport>prompt</ErrorReport>
    54     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    55     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    56     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
    57     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    58     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
    59     <Prefer32Bit>false</Prefer32Bit>
    60   </PropertyGroup>
    61   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    62     <OutputPath>..\..\bin\</OutputPath>
    63     <DefineConstants>TRACE</DefineConstants>
    64     <Optimize>true</Optimize>
    65     <DebugType>pdbonly</DebugType>
    66     <PlatformTarget>x86</PlatformTarget>
    67     <CodeAnalysisLogFile>bin\Release\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    68     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    69     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    70     <ErrorReport>prompt</ErrorReport>
    71     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    72     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    73     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    74     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
    7538    <Prefer32Bit>false</Prefer32Bit>
    7639  </PropertyGroup>
    7740  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    7841    <DebugSymbols>true</DebugSymbols>
    79     <OutputPath>..\..\bin\</OutputPath>
     42    <OutputPath>bin\Debug\</OutputPath>
    8043    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8144    <DebugType>full</DebugType>
    8245    <PlatformTarget>x64</PlatformTarget>
    83     <CodeAnalysisLogFile>bin\Debug\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    84     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    85     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    86     <ErrorReport>prompt</ErrorReport>
    87     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    88     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    89     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
    90     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    91     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     46    <ErrorReport>prompt</ErrorReport>
    9247    <Prefer32Bit>false</Prefer32Bit>
    9348  </PropertyGroup>
    9449  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    95     <OutputPath>..\..\bin\</OutputPath>
     50    <OutputPath>bin\Release\</OutputPath>
    9651    <DefineConstants>TRACE</DefineConstants>
    9752    <Optimize>true</Optimize>
    9853    <DebugType>pdbonly</DebugType>
    9954    <PlatformTarget>x64</PlatformTarget>
    100     <CodeAnalysisLogFile>bin\Release\Plugin.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    101     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    102     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    103     <ErrorReport>prompt</ErrorReport>
    104     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    105     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    106     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
    107     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    108     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
    109     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
     55    <ErrorReport>prompt</ErrorReport>
    11056    <Prefer32Bit>false</Prefer32Bit>
    11157  </PropertyGroup>
    … …  
    11460      <SpecificVersion>False</SpecificVersion>
    11561      <HintPath>..\..\bin\Google.OrTools.dll</HintPath>
    116       <Private>False</Private>
     62      <Private>True</Private>
    11763    </Reference>
    11864    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    11965      <SpecificVersion>False</SpecificVersion>
    12066      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
    121       <Private>False</Private>
     67      <Private>True</Private>
    12268    </Reference>
    12369    <Reference Include="System" />
    … …  
    189135      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    190136      <Name>HeuristicLab.Analysis-3.3</Name>
    191       <Private>False</Private>
     137      <Private>True</Private>
    192138    </ProjectReference>
    193139    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    194140      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    195141      <Name>HeuristicLab.Collections-3.3</Name>
    196       <Private>False</Private>
     142      <Private>True</Private>
    197143    </ProjectReference>
    198144    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    199145      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    200146      <Name>HeuristicLab.Common.Resources-3.3</Name>
    201       <Private>False</Private>
     147      <Private>True</Private>
    202148    </ProjectReference>
    203149    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    204150      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    205151      <Name>HeuristicLab.Common-3.3</Name>
    206       <Private>False</Private>
     152      <Private>True</Private>
    207153    </ProjectReference>
    208154    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    209155      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    210156      <Name>HeuristicLab.Core-3.3</Name>
    211       <Private>False</Private>
     157      <Private>True</Private>
    212158    </ProjectReference>
    213159    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    214160      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    215161      <Name>HeuristicLab.Data-3.3</Name>
    216       <Private>False</Private>
     162      <Private>True</Private>
    217163    </ProjectReference>
    218164    <ProjectReference Include="..\..\HeuristicLab.Encodings.BinaryVectorEncoding\3.3\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj">
    219165      <Project>{66D249C3-A01D-42A8-82A2-919BC8EC3D83}</Project>
    220166      <Name>HeuristicLab.Encodings.BinaryVectorEncoding-3.3</Name>
    221       <Private>False</Private>
     167      <Private>True</Private>
    222168    </ProjectReference>
    223169    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    224170      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    225171      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
    226       <Private>False</Private>
     172      <Private>True</Private>
    227173    </ProjectReference>
    228174    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    229175      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    230176      <Name>HeuristicLab.Optimization-3.3</Name>
    231       <Private>False</Private>
     177      <Private>True</Private>
    232178    </ProjectReference>
    233179    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    234180      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    235181      <Name>HeuristicLab.Parameters-3.3</Name>
    236       <Private>False</Private>
     182      <Private>True</Private>
    237183    </ProjectReference>
    238184    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    239185      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    240186      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    241       <Private>False</Private>
     187      <Private>True</Private>
    242188    </ProjectReference>
    243189    <ProjectReference Include="..\..\HeuristicLab.Problems.Knapsack\3.3\HeuristicLab.Problems.Knapsack-3.3.csproj">
    244190      <Project>{E10F395F-C8A6-48AD-B470-9AA7A1F43809}</Project>
    245191      <Name>HeuristicLab.Problems.Knapsack-3.3</Name>
    246       <Private>False</Private>
     192      <Private>True</Private>
    247193    </ProjectReference>
    248194    <ProjectReference Include="..\..\HeuristicLab.Problems.Programmable\3.3\HeuristicLab.Problems.Programmable-3.3.csproj">
    249195      <Project>{EE07BFF8-B23D-41F5-8AD7-AC9598D7A2C9}</Project>
    250196      <Name>HeuristicLab.Problems.Programmable-3.3</Name>
    251       <Private>False</Private>
     197      <Private>True</Private>
    252198    </ProjectReference>
    253199    <ProjectReference Include="..\..\HeuristicLab.Problems.TravelingSalesman\3.3\HeuristicLab.Problems.TravelingSalesman-3.3.csproj">
    254200      <Project>{D767C38D-8014-46B0-9A32-03A3AECCE34A}</Project>
    255201      <Name>HeuristicLab.Problems.TravelingSalesman-3.3</Name>
    256       <Private>False</Private>
     202      <Private>True</Private>
    257203    </ProjectReference>
    258204    <ProjectReference Include="..\..\HeuristicLab.Scripting\3.3\HeuristicLab.Scripting-3.3.csproj">
    259205      <Project>{21977CC3-1757-4B3B-87BD-FF817AAA900F}</Project>
    260206      <Name>HeuristicLab.Scripting-3.3</Name>
    261       <Private>False</Private>
     207      <Private>True</Private>
    262208    </ProjectReference>
    263209  </ItemGroup>
    … …  
    272218  </PropertyGroup>
    273219  <PropertyGroup>
    274     <PostBuildEvent>
    275     </PostBuildEvent>
     220    <PostBuildEvent>copy /y "$(TargetPath)" "$(SolutionDir)\bin"
     221copy /y "$(TargetPath).config" "$(SolutionDir)\bin"</PostBuildEvent>
    276222  </PropertyGroup>
    277223  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • stable/HeuristicLab.ExtLibs

  • stable/HeuristicLab.ExtLibs.sln

    r17105 r17117  
    7878EndProject
    7979Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Attic", "HeuristicLab.ExtLibs\HeuristicLab.Attic\1.0.0\HeuristicLab.Attic.csproj", "{44A10478-D290-43C2-9757-F08F5292FEA5}"
     80EndProject
     81Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.OrTools-7.0.0", "HeuristicLab.ExtLibs\HeuristicLab.OrTools\7.0.0\HeuristicLab.OrTools-7.0.0\HeuristicLab.OrTools-7.0.0.csproj", "{AEC895BC-C519-49D3-9A94-6B1C71AD6671}"
    8082EndProject
    8183Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Protobuf", "HeuristicLab.ExtLibs\HeuristicLab.Protobuf\3.6.1\HeuristicLab.Protobuf.csproj", "{44B10478-D290-43D3-9757-C08F5292FEA5}"
    … …  
    507509    {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|x86.ActiveCfg = Release|Any CPU
    508510    {44A10478-D290-43C2-9757-F08F5292FEA5}.Release|x86.Build.0 = Release|Any CPU
     511    {AEC895BC-C519-49D3-9A94-6B1C71AD6671}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     512    {AEC895BC-C519-49D3-9A94-6B1C71AD6671}.Debug|Any CPU.Build.0 = Debug|Any CPU
     513    {AEC895BC-C519-49D3-9A94-6B1C71AD6671}.Debug|x64.ActiveCfg = Debug|x64
     514    {AEC895BC-C519-49D3-9A94-6B1C71AD6671}.Debug|x64.Build.0 = Debug|x64
     515    {AEC895BC-C519-49D3-9A94-6B1C71AD6671}.Debug|x86.ActiveCfg = Debug|x86
     516    {AEC895BC-C519-49D3-9A94-6B1C71AD6671}.Debug|x86.Build.0 = Debug|x86
     517    {AEC895BC-C519-49D3-9A94-6B1C71AD6671}.Release|Any CPU.ActiveCfg = Release|Any CPU
     518    {AEC895BC-C519-49D3-9A94-6B1C71AD6671}.Release|Any CPU.Build.0 = Release|Any CPU
     519    {AEC895BC-C519-49D3-9A94-6B1C71AD6671}.Release|x64.ActiveCfg = Release|x64
     520    {AEC895BC-C519-49D3-9A94-6B1C71AD6671}.Release|x64.Build.0 = Release|x64
     521    {AEC895BC-C519-49D3-9A94-6B1C71AD6671}.Release|x86.ActiveCfg = Release|x86
     522    {AEC895BC-C519-49D3-9A94-6B1C71AD6671}.Release|x86.Build.0 = Release|x86
    509523    {44B10478-D290-43D3-9757-C08F5292FEA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    510524    {44B10478-D290-43D3-9757-C08F5292FEA5}.Debug|Any CPU.Build.0 = Debug|Any CPU

  • stable/HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Google.OrTools_version.txt

    r16419 r17117  
    33GitHub [2]. The library was compiled with Visual Studio 2017 for x64.
    44
    5 [1]: https://github.com/ddorfmeister/or-tools/commit/e13f4bb73f09966332206204d443747e3762555f
     5[1]: https://github.com/ddorfmeister/or-tools/commit/eb3d72b09219e1aef48182b77cf26b153e9fc9a1
    66[2]: https://github.com/google/or-tools

  • stable/HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/HeuristicLab.OrTools-7.0.0.csproj

    r16910 r17117  
    4343  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    4444    <DebugSymbols>true</DebugSymbols>
    45     <OutputPath>bin\x64\Debug\</OutputPath>
     45    <OutputPath>..\..\..\..\bin\</OutputPath>
    4646    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4747    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    … …  
    5252  </PropertyGroup>
    5353  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    54     <OutputPath>bin\x64\Release\</OutputPath>
     54    <OutputPath>..\..\..\..\bin\</OutputPath>
    5555    <DefineConstants>TRACE</DefineConstants>
    5656    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    … …  
    6363  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    6464    <DebugSymbols>true</DebugSymbols>
    65     <OutputPath>bin\x86\Debug\</OutputPath>
     65    <OutputPath>..\..\..\..\bin\</OutputPath>
    6666    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6767    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    … …  
    7272  </PropertyGroup>
    7373  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    74     <OutputPath>bin\x86\Release\</OutputPath>
     74    <OutputPath>..\..\..\..\bin\</OutputPath>
    7575    <DefineConstants>TRACE</DefineConstants>
    7676    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

  • stable/HeuristicLab.Optimization

  • stable/HeuristicLab.Optimization.Views

  • stable/HeuristicLab.Optimization.Views/3.3/BasicAlgorithmView.cs

    r17097 r17117  
    3737      base.SetEnabledStateOfControls();
    3838      pauseButton.Enabled &= Content != null && Content.SupportsPause;
     39      stopButton.Enabled &= Content != null && Content.SupportsStop;
    3940    }
    4041
    … …  
    4243      base.SetEnabledStateOfExecutableButtons();
    4344      pauseButton.Enabled &= Content != null && Content.SupportsPause;
     45      stopButton.Enabled &= Content != null && Content.SupportsStop;
    4446    }
    4547  }

  • stable/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs

    r17097 r17117  
    3636
    3737    public abstract bool SupportsPause { get; }
     38    public virtual bool SupportsStop {
     39      get { return true; }
     40    }
    3841
    3942    [Storable]
    … …  
    106109      // CancellationToken.ThrowIfCancellationRequested() must be called from within the Run method, otherwise stop does nothing
    107110      // alternatively check the IsCancellationRequested property of the cancellation token
     111      if (!SupportsStop)
     112        throw new NotSupportedException("Stop is not supported by this algorithm.");
     113
    108114      base.Stop();
    109115      if (ExecutionState == ExecutionState.Paused) OnStopped();
Note: See TracChangeset for help on using the changeset viewer.