Ignore:
Timestamp:
07/11/15 17:36:13 (5 years ago)
Author:
ascheibe
Message:

#2306 merged r12604, r12606, r12640 into stable

Location:
stable
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.NK/HeuristicLab.Problems.NK.csproj

    r12594 r12730  
    109109  </PropertyGroup>
    110110  <ItemGroup>
    111     <Reference Include="HeuristicLab.Collections-3.3">
    112       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    113     </Reference>
    114     <Reference Include="HeuristicLab.Common-3.3">
    115       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    116     </Reference>
    117     <Reference Include="HeuristicLab.Core-3.3">
    118       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    119     </Reference>
    120     <Reference Include="HeuristicLab.Data-3.3">
    121       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    122     </Reference>
    123     <Reference Include="HeuristicLab.Encodings.BinaryVectorEncoding-3.3">
    124       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.dll</HintPath>
    125       <Private>False</Private>
    126     </Reference>
    127     <Reference Include="HeuristicLab.Operators-3.3">
    128       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    129     </Reference>
    130     <Reference Include="HeuristicLab.Optimization-3.3">
    131       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    132     </Reference>
    133     <Reference Include="HeuristicLab.Parameters-3.3">
    134       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    135     </Reference>
    136     <Reference Include="HeuristicLab.Persistence-3.3">
    137       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    138     </Reference>
    139     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    140       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    141     </Reference>
    142     <Reference Include="HeuristicLab.Problems.Binary-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    143       <SpecificVersion>False</SpecificVersion>
    144       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Problems.Binary-3.3.dll</HintPath>
    145     </Reference>
    146     <Reference Include="HeuristicLab.Random-3.3">
    147       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
    148     </Reference>
    149111    <Reference Include="System" />
    150112    <Reference Include="System.Core" />
     
    185147    <None Include="Properties\AssemblyInfo.cs.frame" />
    186148  </ItemGroup>
     149  <ItemGroup>
     150    <ProjectReference Include="..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     151      <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
     152      <Name>HeuristicLab.Collections-3.3</Name>
     153      <Private>False</Private>
     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      <Private>False</Private>
     159    </ProjectReference>
     160    <ProjectReference Include="..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     161      <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
     162      <Name>HeuristicLab.Core-3.3</Name>
     163      <Private>False</Private>
     164    </ProjectReference>
     165    <ProjectReference Include="..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     166      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
     167      <Name>HeuristicLab.Data-3.3</Name>
     168      <Private>False</Private>
     169    </ProjectReference>
     170    <ProjectReference Include="..\HeuristicLab.Encodings.BinaryVectorEncoding\3.3\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj">
     171      <Project>{66d249c3-a01d-42a8-82a2-919bc8ec3d83}</Project>
     172      <Name>HeuristicLab.Encodings.BinaryVectorEncoding-3.3</Name>
     173      <Private>False</Private>
     174    </ProjectReference>
     175    <ProjectReference Include="..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     176      <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
     177      <Name>HeuristicLab.Operators-3.3</Name>
     178      <Private>False</Private>
     179    </ProjectReference>
     180    <ProjectReference Include="..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     181      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
     182      <Name>HeuristicLab.Optimization-3.3</Name>
     183      <Private>False</Private>
     184    </ProjectReference>
     185    <ProjectReference Include="..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     186      <Project>{56f9106a-079f-4c61-92f6-86a84c2d84b7}</Project>
     187      <Name>HeuristicLab.Parameters-3.3</Name>
     188      <Private>False</Private>
     189    </ProjectReference>
     190    <ProjectReference Include="..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     191      <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
     192      <Name>HeuristicLab.Persistence-3.3</Name>
     193      <Private>False</Private>
     194    </ProjectReference>
     195    <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     196      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
     197      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     198      <Private>False</Private>
     199    </ProjectReference>
     200    <ProjectReference Include="..\HeuristicLab.Problems.Binary\3.3\HeuristicLab.Problems.Binary-3.3.csproj">
     201      <Project>{fc627be5-0f93-47d8-bd2e-530ea2b8aa5f}</Project>
     202      <Name>HeuristicLab.Problems.Binary-3.3</Name>
     203      <Private>False</Private>
     204    </ProjectReference>
     205    <ProjectReference Include="..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     206      <Project>{f4539fb6-4708-40c9-be64-0a1390aea197}</Project>
     207      <Name>HeuristicLab.Random-3.3</Name>
     208      <Private>False</Private>
     209    </ProjectReference>
     210  </ItemGroup>
    187211  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    188212  <PropertyGroup>
  • stable/HeuristicLab.Problems.NK/NKLandscape.cs

    r12596 r12730  
    3535namespace HeuristicLab.Problems.NK {
    3636  [Item("NK Landscape", "Represents an NK landscape optimization problem.")]
    37   [Creatable("Problems")]
     37  [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 215)]
    3838  [StorableClass]
    3939  public sealed class NKLandscape : BinaryProblem {
  • stable/HeuristicLab.Problems.NK/Plugin.cs.frame

    r12566 r12730  
    3636  [PluginDependency("HeuristicLab.Problems.Binary", "3.3")]
    3737  [PluginDependency("HeuristicLab.Random", "3.3")]   
    38   public class HeuristicProblemsNKPlugin : PluginBase { }
     38  public class HeuristicLabProblemsNKPlugin : PluginBase { }
    3939}
Note: See TracChangeset for help on using the changeset viewer.