Changeset 12149

Timestamp:

03/06/15 13:07:20 (9 years ago)

Author:

pfleck

Message:

#2269 Removed AgingScheme type which inherited from EnumValue. Instead used EnumValue directly.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• AgingScheme.cs (modified) (2 diffs)
• AgingSchemeCalculator.cs (modified) (1 diff)
• Alps.cs (modified) (3 diffs)

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AgingScheme.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
-using HeuristicLab.Core;
-using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-
 namespace HeuristicLab.Algorithms.ALPS {
-  public enum AgingSchemes {
+  public enum AgingScheme {
     Linear,
     Fibonacci,
@@ -32 +27 @@
     Exponential
   }
-
-  [Item("AgingScheme", "Represents a certain type of an aging scheme.")]
-  [StorableClass]
-  public class AgingScheme : EnumValue<AgingSchemes> {
-    [StorableConstructor]
-    protected AgingScheme(bool deserializing) : base(deserializing) { }
-    protected AgingScheme(AgingScheme original, Cloner cloner) : base(original, cloner) { }
-
-    public AgingScheme() : base(AgingSchemes.Linear) { }
-    public AgingScheme(AgingSchemes type) : base(type) { }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new AgingScheme(this, cloner);
-    }
-  }
 }

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AgingSchemeCalculator.cs

@@ -27 +27 @@
 namespace HeuristicLab.Algorithms.ALPS {
   public static class AgingSchemeCalculator {
-    public static IntArray CalculateAgeLimits(AgingSchemes scheme, int ageGap, int numberOfLayers) {
+    public static IntArray CalculateAgeLimits(AgingScheme scheme, int ageGap, int numberOfLayers) {
       IEnumerable<int> schemeGenerator;
       switch (scheme) {
-        case AgingSchemes.Linear: schemeGenerator = LinearAgingScheme(); break;
-        case AgingSchemes.Fibonacci: schemeGenerator = FibonacciAgingScheme(); break;
-        case AgingSchemes.Polynomial: schemeGenerator = PolynomialAgingScheme(2); break;
-        case AgingSchemes.Exponential: schemeGenerator = ExponentialAgingScheme(2); break;
+        case AgingScheme.Linear: schemeGenerator = LinearAgingScheme(); break;
+        case AgingScheme.Fibonacci: schemeGenerator = FibonacciAgingScheme(); break;
+        case AgingScheme.Polynomial: schemeGenerator = PolynomialAgingScheme(2); break;
+        case AgingScheme.Exponential: schemeGenerator = ExponentialAgingScheme(2); break;
         default: throw new NotSupportedException("Aging Scheme " + scheme + " is not supported.");
       }

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/Alps.cs

@@ -66 +66 @@
       get { return (IValueParameter<IntValue>)Parameters["NumberOfLayers"]; }
     }
-    private IValueParameter<AgingScheme> AgingSchemeParameter {
-      get { return (IValueParameter<AgingScheme>)Parameters["AgingScheme"]; }
+    private IValueParameter<EnumValue<AgingScheme>> AgingSchemeParameter {
+      get { return (IValueParameter<EnumValue<AgingScheme>>)Parameters["AgingScheme"]; }
     }
     private IValueParameter<IntValue> AgeGapParameter {
@@ -105 +105 @@
       set { NumberOfLayersParameter.Value = value; }
     }
-    public AgingScheme AgingScheme {
+    public EnumValue<AgingScheme> AgingScheme {
       get { return AgingSchemeParameter.Value; }
       set { AgingSchemeParameter.Value = value; }
@@ -164 +164 @@
       Parameters.Add(new FixedValueParameter<MultiAnalyzer>("LayerAnalyzer", "The operator used to analyze each layer.", new MultiAnalyzer()));
       Parameters.Add(new ValueParameter<IntValue>("NumberOfLayers", "The number of layers.", new IntValue(10)));
-      Parameters.Add(new ValueParameter<AgingScheme>("AgingScheme", "The aging scheme for setting the age-limits for the layers.", new AgingScheme(AgingSchemes.Polynomial)));
+      Parameters.Add(new ValueParameter<EnumValue<AgingScheme>>("AgingScheme", "The aging scheme for setting the age-limits for the layers.", new EnumValue<AgingScheme>(ALPS.AgingScheme.Polynomial)));
       Parameters.Add(new ValueParameter<IntValue>("AgeGap", "The frequency of reseeding the lowest layer and scaling factor for the age-limits for the layers", new IntValue(20)));
       Parameters.Add(new ValueParameter<IntArray>("AgeLimits", new IntArray(new int[0])) { Hidden = true });