Changeset 14897 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/ErcOption.cs

Timestamp:

04/28/17 22:52:08 (7 years ago)

Author:

pkimmesw

Message:

#2665 Dynamic ErcValues, Separate Push from BenchmarkSuite Push

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/ErcOption.cs (modified) (1 diff)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/ErcOption.cs

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Base.Erc {
-  using Base.Erc.Interfaces;
-  using Common;
-  using Core;
-  using Data;
-  using Parameters;
-  using Persistence.Default.CompositeSerializers.Storable;
+  using HeuristicLab.Common;
+  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
   [StorableClass]
-  public abstract class ErcOption : ParameterizedNamedItem, IReadOnlyErcOption {
-    private const string IsEnabledParameterName = "IsEnabled";
+  public abstract class ErcOption<T> : ErcOptionConvertible<T, T> {
+    protected ErcOption() : this(false, new IWeightedErcValueItem<T>[0]) { }
 
-    protected ErcOption() {
-      Parameters.Add(new FixedValueParameter<BoolValue>(IsEnabledParameterName));
+    protected ErcOption(bool isEnabled, params IWeightedErcValueItem<T>[] values)
+        : base(x => x, isEnabled, values) { }
+
+    [StorableConstructor]
+    protected ErcOption(bool deserializing)
+        : base(deserializing) {
     }
 
-    [StorableConstructor]
-    protected ErcOption(bool deserializing) : base(deserializing) { }
-
-    protected ErcOption(ErcOption origin, Cloner cloner) : base(origin, cloner) { }
-
-    public IValueParameter<BoolValue> IsEnabledParameter
-    {
-      get { return (IValueParameter<BoolValue>)Parameters[IsEnabledParameterName]; }
-    }
-
-    public bool IsEnabled
-    {
-      get { return IsEnabledParameter.Value.Value; }
-      set { IsEnabledParameter.Value.Value = value; }
+    protected ErcOption(ErcOptionConvertible<T, T> origin, Cloner cloner)
+        : base(origin, cloner) {
     }
   }