Changeset 16662 for branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Algorithms.GeneticAlgorithm/3.3

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.GeneticAlgorithm (modified) (1 prop)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs (modified) (5 diffs)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithmMainLoop.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/HeuristicLab.Algorithms.GeneticAlgorithm-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithmMainLoop.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.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.
@@ -22 +22 @@
 using System;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
@@ -30 +31 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Random;
@@ -40 +40 @@
   [Item("Genetic Algorithm (GA)", "A genetic algorithm.")]
   [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 100)]
-  [StorableClass]
+  [StorableType("B63D21BD-D6AE-474B-A319-AC92CCB30AF6")]
   public sealed class GeneticAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
     public string Filename { get; set; }
@@ -213 +213 @@
     }
     [StorableConstructor]
-    private GeneticAlgorithm(bool deserializing) : base(deserializing) { }
+    private GeneticAlgorithm(StorableConstructorFlag _) : base(_) { }
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithmMainLoop.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.
@@ -26 +26 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Selection;
 
@@ -34 +34 @@
   /// </summary>
   [Item("GeneticAlgorithmMainLoop", "An operator which represents the main loop of a genetic algorithm.")]
-  [StorableClass]
+  [StorableType("890C1856-16C9-45F0-A0DD-67A152A70D28")]
   public sealed class GeneticAlgorithmMainLoop : AlgorithmOperator {
     #region Parameter properties
@@ -92 +92 @@
 
     [StorableConstructor]
-    private GeneticAlgorithmMainLoop(bool deserializing) : base(deserializing) { }
+    private GeneticAlgorithmMainLoop(StorableConstructorFlag _) : base(_) { }
     private GeneticAlgorithmMainLoop(GeneticAlgorithmMainLoop original, Cloner cloner)
       : base(original, cloner) {

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

@@ -20 +20 @@
     <StartupObject>
     </StartupObject>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -112 +112 @@
     </Reference>
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -210 +211 @@
       <Install>true</Install>
     </BootstrapperPackage>
+  </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="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.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.
@@ -30 +30 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Random;
@@ -40 +40 @@
   [Item("Island Genetic Algorithm (Island-GA)", "An island genetic algorithm.")]
   [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 110)]
-  [StorableClass]
+  [StorableType("C36FD509-4EF2-4BA7-9483-8CFCEF7EDA91")]
   public sealed class IslandGeneticAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
     public string Filename { get; set; }
@@ -203 +203 @@
 
     [StorableConstructor]
-    private IslandGeneticAlgorithm(bool deserializing) : base(deserializing) { }
+    private IslandGeneticAlgorithm(StorableConstructorFlag _) : base(_) { }
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithmMainLoop.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.
@@ -27 +27 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Selection;
 
@@ -35 +35 @@
   /// </summary>
   [Item("IslandGeneticAlgorithmMainLoop", "An island genetic algorithm main loop operator.")]
-  [StorableClass]
+  [StorableType("E015F135-AA23-4425-A84A-DEF880185D0A")]
   public sealed class IslandGeneticAlgorithmMainLoop : AlgorithmOperator {
     #region Parameter Properties
@@ -119 +119 @@
 
     [StorableConstructor]
-    private IslandGeneticAlgorithmMainLoop(bool deserializing) : base(deserializing) { }
+    private IslandGeneticAlgorithmMainLoop(StorableConstructorFlag _) : base(_) { }
     private IslandGeneticAlgorithmMainLoop(IslandGeneticAlgorithmMainLoop original, Cloner cloner)
       : base(original, cloner) {

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Algorithms.GeneticAlgorithm/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")]
   [PluginDependency("HeuristicLab.Selection", "3.3")]

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Algorithms.GeneticAlgorithm/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.