Changeset 12571 for branches/ALPS

Timestamp:

07/02/15 11:52:30 (9 years ago)

Author:

pfleck

Message:

#2350

• Fixed Plugin dependencies.
• Added missing Hook.
• Sealed some classes and fixed some access modifier.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3

Files:

• AlpsSsGeneticAlgorithm.cs (modified) (2 diffs)
• AlpsSsGeneticAlgorithmMainLoop.cs (modified) (1 diff)
• AlpsSsGeneticAlgorithmMainOperator.cs (modified) (1 diff)
• AlpsSsMover.cs (modified) (1 diff)
• NamedSubScopeProcessor.cs (modified) (3 diffs)
• NamedSubScopesCreator.cs (modified) (2 diffs)
• Plugin.cs.frame (modified) (2 diffs)
• RandomIntAssigner.cs (modified) (1 diff)
• RandomLayerProcessor.cs (modified) (1 diff)
• ScopeIndexAssigner.cs (modified) (2 diffs)
• SteadyStateMatingPoolCreator.cs (modified) (1 diff)

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithm.cs

@@ -39 +39 @@
   [Creatable("Algorithms")]
   [StorableClass]
-  public class AlpsSsGeneticAlgorithm : Alps {
+  public sealed class AlpsSsGeneticAlgorithm : Alps {
     #region Parameter Properties
     private IValueParameter<IntValue> LayerSizeParameter {
@@ -113 +113 @@
     private AlpsSsGeneticAlgorithm(bool deserializing)
       : base(deserializing) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      Initialize();
+    }
     private AlpsSsGeneticAlgorithm(AlpsSsGeneticAlgorithm original, Cloner cloner)
       : base(original, cloner) {

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithmMainLoop.cs

@@ -32 +32 @@
   [Item("AlpsSsGeneticAlgorithmMainLoop", "An ALPS steady-state genetic algorithm main loop operator.")]
   [StorableClass]
-  public class AlpsSsGeneticAlgorithmMainLoop : AlgorithmOperator {
+  public sealed class AlpsSsGeneticAlgorithmMainLoop : AlgorithmOperator {
     #region Parameter Properties
     public ValueLookupParameter<BoolValue> MaximizationParameter {

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithmMainOperator.cs

@@ -30 +30 @@
   [Item("AlpsSsGeneticAlgorithmMainOperator", "")]
   [StorableClass]
-  public class AlpsSsGeneticAlgorithmMainOperator : AlgorithmOperator {
+  public sealed class AlpsSsGeneticAlgorithmMainOperator : AlgorithmOperator {
     [StorableConstructor]
     private AlpsSsGeneticAlgorithmMainOperator(bool deserializing)

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsMover.cs

@@ -33 +33 @@
   [Item("AlpsSsMover", "")]
   [StorableClass]
-  public class AlpsSsMover : SingleSuccessorOperator, IStochasticOperator {
+  public sealed class AlpsSsMover : SingleSuccessorOperator, IStochasticOperator {
     #region Parameter Properties
     private ILookupParameter<IntValue> LayerParameter {

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/NamedSubScopeProcessor.cs

@@ -30 +30 @@
   [Item("NamedSubScopeProcessor", "")]
   [StorableClass]
-  public class NamedSubScopeProcessor : SingleSuccessorOperator {
+  public sealed class NamedSubScopeProcessor : SingleSuccessorOperator {
 
     #region Parameter Properties
@@ -47 +47 @@
 
     [StorableConstructor]
-    protected NamedSubScopeProcessor(bool deserializing) : base(deserializing) { }
+    private NamedSubScopeProcessor(bool deserializing) : base(deserializing) { }
     public NamedSubScopeProcessor()
       : base() {
@@ -53 +53 @@
       Parameters.Add(new LookupParameter<IScope>("TargetScope"));
     }
-    protected NamedSubScopeProcessor(NamedSubScopeProcessor original, Cloner cloner)
+    private NamedSubScopeProcessor(NamedSubScopeProcessor original, Cloner cloner)
       : base(original, cloner) {
     }

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/NamedSubScopesCreator.cs

@@ -30 +30 @@
   [Item("NamedSubScopesCreator", "An operator which create named subscopes.")]
   [StorableClass]
-  public class NamedSubScopesCreator : SingleSuccessorOperator {
+  public sealed class NamedSubScopesCreator : SingleSuccessorOperator {
     #region Parameter Properties
     public IValueLookupParameter<StringArray> NamesParameter {
@@ -38 +38 @@
 
     [StorableConstructor]
-    protected NamedSubScopesCreator(bool deserializing) : base(deserializing) { }
-    protected NamedSubScopesCreator(NamedSubScopesCreator original, Cloner cloner)
+    private NamedSubScopesCreator(bool deserializing) : base(deserializing) { }
+    private NamedSubScopesCreator(NamedSubScopesCreator original, Cloner cloner)
       : base(original, cloner) {
     }

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/Plugin.cs.frame

@@ -28 +28 @@
   [Plugin("HeuristicLab.Algorithms.ALPS.SteadyState", "Provides a Steady-State version of the Age-Layered Population Structure (ALPS) as described in G. S. Hornby, A Steady-State Version of the Age-Layered Population Structure EA, in Genetic Programming Theory and Practice VII, R. Riolo, U.-M. O’Reilly, and T. McConaghy, Eds. Springer US, 2010, pp. 87–102.", "3.3.11.$WCREV$")]
   [PluginFile("HeuristicLab.Algorithms.ALPS.SteadyState-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Analysis", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
@@ -41 +40 @@
   [PluginDependency("HeuristicLab.Selection", "3.3")]
   [PluginDependency("HeuristicLab.Algorithms.ALPS", "3.3")]
-  public class HeuristicLabAlgorithmsALPSPlugin : PluginBase {
+  public class HeuristicLabAlgorithmsALPSSteadyStatePlugin : PluginBase {
   }
 }

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/RandomIntAssigner.cs

@@ -31 +31 @@
   [Item("RandomIntAssigner", "An operator which sets a random value to a parameter")]
   [StorableClass]
-  public class RandomIntAssigner : SingleSuccessorOperator, IStochasticOperator {
+  public sealed class RandomIntAssigner : SingleSuccessorOperator, IStochasticOperator {
     public LookupParameter<IntValue> LeftSideParameter {
       get { return (LookupParameter<IntValue>)Parameters["LeftSide"]; }

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/RandomLayerProcessor.cs

@@ -33 +33 @@
   [Item("RandomLayerProcessor", "An operator which applies a specified operator on a random selected sub-scope (layer).")]
   [StorableClass]
-  public class RandomLayerProcessor : SingleSuccessorOperator, IStochasticOperator {
+  public sealed class RandomLayerProcessor : SingleSuccessorOperator, IStochasticOperator {
     private OperatorParameter OperatorParameter {
       get { return (OperatorParameter)Parameters["Operator"]; }

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/ScopeIndexAssigner.cs

@@ -31 +31 @@
   [Item("ScopeIndexAssigner", "Description missing")]
   [StorableClass]
-  public class ScopeIndexAssigner : SingleSuccessorOperator {
+  public sealed class ScopeIndexAssigner : SingleSuccessorOperator {
     #region Parameter Properties
     public ILookupParameter<IntValue> ValueParameter {
@@ -39 +39 @@
 
     [StorableConstructor]
-    protected ScopeIndexAssigner(bool deserializing) : base(deserializing) { }
+    private ScopeIndexAssigner(bool deserializing) : base(deserializing) { }
     public ScopeIndexAssigner()
       : base() {
       Parameters.Add(new LookupParameter<IntValue>("Value"));
     }
-    protected ScopeIndexAssigner(ScopeIndexAssigner original, Cloner cloner)
+    private ScopeIndexAssigner(ScopeIndexAssigner original, Cloner cloner)
       : base(original, cloner) {
     }

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/SteadyStateMatingPoolCreator.cs

@@ -31 +31 @@
   [Item("SteadyStateMatingPoolCreator", "")]
   [StorableClass]
-  public class SteadyStateMatingPoolCreator : SingleSuccessorOperator {
+  public sealed class SteadyStateMatingPoolCreator : SingleSuccessorOperator {
     private ILookupParameter<IScope> WorkingScopeParameter {
       get { return (ILookupParameter<IScope>)Parameters["WorkingScope"]; }