Changeset 14952 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/ErcOptionConvertible.cs

Timestamp:

05/10/17 11:23:05 (7 years ago)

Author:

pkimmesw

Message:

#2665 Added IsNoop to Expression, Made Expressions storable, Fixed Debugger, Fixed and improved problem data and result visualisation, Added custom ErcOption view, Added problem difficulty to problem data name

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis.Base/Erc/ErcOptionConvertible.cs (modified) (4 diffs)

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

@@ -10 +10 @@
 
   [StorableClass]
-  public abstract class ErcOptionConvertible<TValue, TValueItem> : CheckedItemCollection<IWeightedErcValueItem<TValueItem>>, IErcValueItem<TValue> {
+  public abstract class ErcOptionConvertible<TValue, TValueItem> : CheckedItemCollection<WeightedErcItem<TValueItem>>, IErcItem<TValue> {
     [Storable]
     protected bool isEnabled;
@@ -16 +16 @@
     public event EventHandler<bool> EnabledChanged;
 
-    protected ErcOptionConvertible() : this(false, new IWeightedErcValueItem<TValueItem>[0]) { }
+    protected ErcOptionConvertible() : this(false, new WeightedErcItem<TValueItem>[0]) { }
 
-    protected ErcOptionConvertible(bool isEnabled, params IWeightedErcValueItem<TValueItem>[] values) : base(values) {
+    protected ErcOptionConvertible(bool isEnabled, params WeightedErcItem<TValueItem>[] values) : base(values) {
       this.isEnabled = isEnabled;
       SetEnabledChangedHandler(values);
@@ -42 +42 @@
     }
 
-    private void SetEnabledChangedHandler(IEnumerable<IWeightedErcValueItem<TValueItem>> values) {
+    private void SetEnabledChangedHandler(IEnumerable<WeightedErcItem<TValueItem>> values) {
       foreach (var item in values)
         item.EnabledChanged += ErcValueItemEnabledChanged;
     }
 
-    protected override void OnItemsAdded(IEnumerable<IWeightedErcValueItem<TValueItem>> items) {
+    protected override void OnItemsAdded(IEnumerable<WeightedErcItem<TValueItem>> items) {
       base.OnItemsAdded(items);
       SetEnabledChangedHandler(items);
     }
 
-    protected override void OnItemsRemoved(IEnumerable<IWeightedErcValueItem<TValueItem>> items) {
+    protected override void OnItemsRemoved(IEnumerable<WeightedErcItem<TValueItem>> items) {
       base.OnItemsRemoved(items);
 
@@ -60 +60 @@
 
     private void ErcValueItemEnabledChanged(object sender, bool state) {
-      SetItemCheckedState((IWeightedErcValueItem<TValueItem>)sender, state);
+      SetItemCheckedState((WeightedErcItem<TValueItem>)sender, state);
     }
 
-    protected override void OnCheckedItemsChanged(IEnumerable<IWeightedErcValueItem<TValueItem>> items) {
+    protected override void OnCheckedItemsChanged(IEnumerable<WeightedErcItem<TValueItem>> items) {
       base.OnCheckedItemsChanged(items);