Changeset 12149 for branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/Alps.cs

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.

File:

• branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/Alps.cs (modified) (3 diffs)

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 });