Changeset 17097 for stable/HeuristicLab.Selection/3.3/EvolutionStrategyOffspringSelector.cs

Timestamp:

07/07/19 23:40:10 (5 years ago)

Author:

mkommend

Message:

#2520: Merged 16565 - 16579 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Selection/3.3/EvolutionStrategyOffspringSelector.cs (modified) (4 diffs)

stable/HeuristicLab.Selection/3.3/EvolutionStrategyOffspringSelector.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.Collections.Generic;
-using System.Runtime.InteropServices;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +27 @@
 using HeuristicLab.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Selection {
   [Item("EvolutionStrategyOffspringSelector", "Selects among the offspring population those that are designated successful and discards the unsuccessful offspring, except for some lucky losers. It expects the parent scopes to be below the first sub-scope, and offspring scopes to be below the second sub-scope separated again in two sub-scopes, the first with the failed offspring and the second with successful offspring.")]
-  [StorableClass]
+  [StorableType("CE585C3C-5139-44F0-9CB2-CC901A290831")]
   public class EvolutionStrategyOffspringSelector : SingleSuccessorOperator {
-
+    [StorableType("F1CA99A7-E9C2-49F3-8030-5CEE407357AA")]
     private class FitnessComparer : IComparer<IScope> {
 
       #region IComparer<IScope> Member
-
-      private String qualityParameterName;
+      [Storable]
+      private string qualityParameterName;
+      [Storable]
       private bool maximization;
 
-      public FitnessComparer(String qualityParamName, bool maximization) {
+      [StorableConstructor]
+      protected FitnessComparer(StorableConstructorFlag _) { }
+
+      public FitnessComparer(string qualityParamName, bool maximization) {
         this.qualityParameterName = qualityParamName;
         this.maximization = maximization;
@@ -113 +116 @@
 
     [StorableConstructor]
-    protected EvolutionStrategyOffspringSelector(bool deserializing) : base(deserializing) { }
+    protected EvolutionStrategyOffspringSelector(StorableConstructorFlag _) : base(_) { }
     protected EvolutionStrategyOffspringSelector(EvolutionStrategyOffspringSelector original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {