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

Timestamp:

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

Author:

pkimmesw

Message:

#2665 Dynamic ErcValues, Separate Push from BenchmarkSuite Push

Location:

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

Files:

• Boolean (added)
• Boolean/BooleanErcOptions.cs (added)
• Boolean/BooleanRandomErcValue.cs (added)
• BooleanErcOptions.cs (deleted)
• Char (added)
• Char/CharErcOptions.cs (added)
• CharErcOptions.cs (deleted)
• ConstantsErcValue.cs (added)
• ErcOption.cs (modified) (1 diff)
• ErcOptionConvertible.cs (added)
• ErcOptions.cs (modified) (11 diffs)
• Float (added)
• Float/FloatConstantErcValue.cs (added)
• Float/FloatErcOptions.cs (added)
• Float/FloatRangeErcValue.cs (added)
• FloatErcOptions.cs (deleted)
• FloatVector (added)
• FloatVector/FloatVectorConstantsErcValue.cs (added)
• FloatVector/FloatVectorErcOptions.cs (added)
• FloatVectorErcOptions.cs (deleted)
• IErcValueItem.cs (added)
• IReadOnlyErcOptions.cs (added)
• IWeightedErcValueItem.cs (added)
• Integer (added)
• Integer/IntegerConstantErcValue.cs (added)
• Integer/IntegerErcOptions.cs (added)
• Integer/IntegerRangeErcValue.cs (added)
• IntegerErcOptions.cs (deleted)
• IntegerVector (added)
• IntegerVector/IntegerVectorConstantsErcValue.cs (added)
• IntegerVector/IntegerVectorErcOptions.cs (added)
• IntegerVectorErcOptions.cs (deleted)
• Interfaces (deleted)
• NameErcOptions.cs (deleted)
• String (added)
• String/StringConstantErcValue.cs (added)
• String/StringErcOptions.cs (added)
• String/StringRandomErcValue.cs (added)
• StringErcOptions.cs (deleted)
• StringVector (added)
• StringVector/StringVectorConstantsErcValue.cs (added)
• StringVector/StringVectorErcOptions.cs (added)
• StringVectorErcOptions.cs (deleted)
• VectorConstantsErcValue.cs (added)
• WeightedErcValueItem.cs (added)

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

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

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Base.Erc {
-  using HeuristicLab.Common;
-  using HeuristicLab.Core;
-  using HeuristicLab.Data;
-  using HeuristicLab.Parameters;
-  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Interfaces;
+  using System.Collections.Generic;
+
+  using Boolean;
+  using Char;
+  using Common;
+  using Core;
+  using Data;
+  using Float;
+  using FloatVector;
+  using Integer;
+  using IntegerVector;
+  using Parameters;
+  using Persistence.Default.CompositeSerializers.Storable;
+  using String;
+  using StringVector;
 
   [StorableClass]
@@ -24 +33 @@
 
       Parameters.Add(new FixedValueParameter<PercentValue>(ProbabilityParameterName));
-      Parameters.Add(new FixedValueParameter<IntegerErcOptions>(IntegerParameterName));
-      Parameters.Add(new FixedValueParameter<FloatErcOptions>(FloatParameterName));
-      Parameters.Add(new FixedValueParameter<CharErcOptions>(CharParameterName));
-      Parameters.Add(new FixedValueParameter<BooleanErcOptions>(BooleanParameterName));
-      Parameters.Add(new FixedValueParameter<StringErcOptions>(StringParameterName));
-      Parameters.Add(new FixedValueParameter<NameErcOptions>(NameParameterName));
-      Parameters.Add(new FixedValueParameter<IntegerVectorErcOptions>(IntegerVectorParameterName));
-      Parameters.Add(new FixedValueParameter<FloatVectorErcOptions>(FloatVectorParameterName));
-      Parameters.Add(new FixedValueParameter<StringVectorErcOptions>(StringVectorParameterName));
+      Parameters.Add(new ValueParameter<IntegerErcOptions>(IntegerParameterName));
+      Parameters.Add(new ValueParameter<FloatErcOptions>(FloatParameterName));
+      Parameters.Add(new ValueParameter<BooleanErcOptions>(BooleanParameterName));
+      Parameters.Add(new ValueParameter<StringErcOptions>(StringParameterName));
+      Parameters.Add(new ValueParameter<CharErcOptions>(CharParameterName));
+      Parameters.Add(new ValueParameter<StringErcOptions>(NameParameterName));
+      Parameters.Add(new ValueParameter<IntegerVectorErcOptions>(IntegerVectorParameterName));
+      Parameters.Add(new ValueParameter<FloatVectorErcOptions>(FloatVectorParameterName));
+      Parameters.Add(new ValueParameter<StringVectorErcOptions>(StringVectorParameterName));
     }
 
@@ -51 +60 @@
     }
 
+    IErcValueItem<int> IReadOnlyErcOptions.IntegerErcOptions { get { return IntegerErcOptions; } }
+    IErcValueItem<double> IReadOnlyErcOptions.FloatErcOptions { get { return FloatErcOptions; } }
+    IErcValueItem<bool> IReadOnlyErcOptions.BooleanErcOptions { get { return BooleanErcOptions; } }
+    IErcValueItem<char> IReadOnlyErcOptions.CharErcOptions { get { return CharErcOptions; } }
+    IErcValueItem<string> IReadOnlyErcOptions.StringErcOptions { get { return StringErcOptions; } }
+    IErcValueItem<string> IReadOnlyErcOptions.NameErcOptions { get { return NameErcOptions; } }
+    IErcValueItem<IReadOnlyList<int>> IReadOnlyErcOptions.IntegerVectorErcOptions { get { return IntegerVectorErcOptions; } }
+    IErcValueItem<IReadOnlyList<double>> IReadOnlyErcOptions.FloatVectorErcOptions { get { return FloatVectorErcOptions; } }
+    IErcValueItem<IReadOnlyList<string>> IReadOnlyErcOptions.StringVectorErcOptions { get { return StringVectorErcOptions; } }
+
     public IValueParameter<IntegerErcOptions> IntegerErcOptionsParameter
     {
@@ -62 +81 @@
     }
 
-    IReadOnlyIntegerErcOptions IReadOnlyErcOptions.IntegerErcOptions
-    {
-      get { return IntegerErcOptions; }
-    }
-
     public IValueParameter<FloatErcOptions> FloatErcOptionsParameter
     {
@@ -76 +90 @@
       get { return this.FloatErcOptionsParameter.Value; }
       set { this.FloatErcOptionsParameter.Value = value; }
-    }
-
-    IReadOnlyFloatErcOptions IReadOnlyErcOptions.FloatErcOptions
-    {
-      get { return FloatErcOptions; }
     }
 
@@ -97 +106 @@
     }
 
-    IReadOnlyCharErcOptions IReadOnlyErcOptions.CharErcOptions
-    {
-      get { return CharErcOptions; }
-    }
-
     public IValueParameter<BooleanErcOptions> BooleanErcOptionsParameter
     {
@@ -111 +115 @@
       get { return BooleanErcOptionsParameter.Value; }
       set { BooleanErcOptionsParameter.Value = value; }
-    }
-
-    IReadOnlyBooleanErcOptions IReadOnlyErcOptions.BooleanErcOptions
-    {
-      get { return BooleanErcOptions; }
     }
 
@@ -129 +128 @@
     }
 
-    IReadOnlyStringErcOptions IReadOnlyErcOptions.StringErcOptions
+    public IValueParameter<StringErcOptions> NameParameter
     {
-      get { return StringErcOptions; }
+      get { return (IValueParameter<StringErcOptions>)Parameters[NameParameterName]; }
     }
 
-    public IValueParameter<NameErcOptions> NameParameter
-    {
-      get { return (IValueParameter<NameErcOptions>)Parameters[NameParameterName]; }
-    }
-
-    public NameErcOptions NameErcOptions
+    public StringErcOptions NameErcOptions
     {
       get { return NameParameter.Value; }
       set { NameParameter.Value = value; }
-    }
-
-    IReadOnlyNameErcOptions IReadOnlyErcOptions.NameErcOptions
-    {
-      get { return NameErcOptions; }
     }
 
@@ -161 +150 @@
     }
 
-    IReadOnlyVectorErcOptions<int> IReadOnlyErcOptions.IntegerVectorErcOptions
-    {
-      get { return IntegerVectorErcOptions; }
-    }
-
     public IValueParameter<StringVectorErcOptions> StringVectorParameter
     {
@@ -175 +159 @@
       get { return StringVectorParameter.Value; }
       set { StringVectorParameter.Value = value; }
-    }
-
-    IReadOnlyVectorErcOptions<string> IReadOnlyErcOptions.StringVectorErcOptions
-    {
-      get { return StringVectorErcOptions; }
     }
 
@@ -193 +172 @@
     }
 
-    IReadOnlyVectorErcOptions<double> IReadOnlyErcOptions.FloatVectorErcOptions
-    {
-      get { return FloatVectorErcOptions; }
-    }
-
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ErcOptions(this, cloner);