Changeset 16662 for branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Algorithms.RandomSearch

Timestamp:

03/07/19 17:42:41 (6 years ago)

Author:

gkronber

Message:

#2925: merged all changes from trunk to branch (up to r16659)

Location:

branches/2925_AutoDiffForDynamicalModels

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.RandomSearch (modified) (1 prop)
• HeuristicLab.Algorithms.RandomSearch/3.3/HeuristicLab.Algorithms.RandomSearch-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Algorithms.RandomSearch/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Algorithms.RandomSearch/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Algorithms.RandomSearch/3.3/RandomSearchAlgorithm.cs (modified) (4 diffs)

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Algorithms.RandomSearch/3.3/HeuristicLab.Algorithms.RandomSearch-3.3.csproj

@@ -10 +10 @@
     <RootNamespace>HeuristicLab.Algorithms.RandomSearch</RootNamespace>
     <AssemblyName>HeuristicLab.Algorithms.RandomSearch-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -75 +75 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
@@ -134 +135 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Algorithms.RandomSearch/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -37 +37 @@
   [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
-  [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Attic", "1.0")]
   [PluginDependency("HeuristicLab.Random", "3.3")]
   public class HeuristicLabAlgorithmsRandomPlugin : PluginBase {

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Algorithms.RandomSearch/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Algorithms.RandomSearch/3.3/RandomSearchAlgorithm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -31 +31 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Random;
 
@@ -37 +37 @@
   [Item("Random Search Algorithm (RS)", "A random search algorithm.")]
   [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 150)]
-  [StorableClass]
+  [StorableType("51EFBCCE-00A7-4E97-8177-85774E71E681")]
   public sealed class RandomSearchAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
     public string Filename { get; set; }
@@ -128 +128 @@
     #region Constructors
     [StorableConstructor]
-    private RandomSearchAlgorithm(bool deserializing)
-      : base(deserializing) { }
+    private RandomSearchAlgorithm(StorableConstructorFlag _) : base(_) { }
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {