Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/08/19 00:23:12 (5 years ago)
Author:
mkommend
Message:

#2520: Merged 16584, 16585,16594,16595, 16625, 16658, 16659, 16672, 16707, 16729, 16792, 16796, 16797, 16799, 16819, 16906, 16907, 16908, 16933, 16945, 16992, 16994, 16995, 16996, 16997, 17014, 17015, 17017, 17020, 17021, 17022, 17023, 17024, 17029, 17086, 17087, 17088, 17089 into stable.

Location:
stable
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Optimization

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

    r17097 r17105  
    105105  </PropertyGroup>
    106106  <ItemGroup>
    107     <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
    108       <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    109     </Reference>
    110     <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    111       <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
    112     </Reference>
    113107    <Reference Include="System" />
    114108    <Reference Include="System.Core">
    … …  
    116110    </Reference>
    117111    <Reference Include="System.Drawing" />
    118     <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
    119       <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
    120     </Reference>
    121112    <Reference Include="System.Xml.Linq">
    122113      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    … …  
    195186    <Compile Include="Termination\Terminator.cs" />
    196187    <Compile Include="Termination\ThresholdTerminator.cs" />
    197     <None Include="packages.config" />
    198188    <None Include="Plugin.cs.frame" />
    199189    <Compile Include="Algorithms\Algorithm.cs" />
    … …  
    340330    </BootstrapperPackage>
    341331  </ItemGroup>
    342   <ItemGroup />
     332  <ItemGroup>
     333    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     334      <SpecificVersion>False</SpecificVersion>
     335      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
     336      <Private>False</Private>
     337    </Reference>
     338  </ItemGroup>
    343339  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    344340  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • stable/HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs

    r17097 r17105  
    112112    // BackwardsCompatibility3.3
    113113    #region Backwards compatible code (remove with 3.4)
    114     [Storable(AllowOneWay = true)]
     114    [Storable(OldName = "algorithm")]
    115115    private IAlgorithm algorithm {
    116116      set { optimizer = value; }

  • stable/HeuristicLab.Optimization/3.3/Plugin.cs.frame

    r17097 r17105  
    3535  [PluginDependency("HeuristicLab.Operators", "3.3")]
    3636  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    37   [PluginDependency("HeuristicLab.Persistence", "3.3")]
     37  [PluginDependency("HeuristicLab.Attic", "1.0")]
    3838  public class HeuristicLabOptimizationPlugin : PluginBase {
    3939  }

  • stable/HeuristicLab.Optimization/3.3/Problems/Problem.cs

    r17097 r17105  
    8484    // BackwardsCompatibility3.3
    8585    #region Backwards compatible code, remove with 3.4
    86     [Storable(Name = "Operators", AllowOneWay = true)]
     86    [Storable(OldName = "Operators")]
    8787    private IEnumerable<IOperator> StorableOperators {
    8888      set {

  • stable/HeuristicLab.Optimization/3.3/RunCollection.cs

    r17097 r17105  
    125125    // BackwardsCompatibility3.3
    126126    #region Backwards compatible code, remove with 3.4
    127     [Storable(AllowOneWay = true)]
     127    [Storable(OldName = "AlgorithmName")]
    128128    private string AlgorithmName {
    129129      set { optimizerName = value; }
Note: See TracChangeset for help on using the changeset viewer.