Changeset 8535 for branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ValueConfigurations

Timestamp:

08/29/12 09:22:21 (12 years ago)

Author:

jkarder

Message:

#1853:

• enhanced combinations count calculation
• restructured code
• minor code improvements
• added license information

Location:

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ValueConfigurations

Files:

• CheckedValueConfigurationCollection.cs (modified) (5 diffs)
• NullValueConfiguration.cs (modified) (2 diffs)
• ParameterizedValueConfiguration.cs (modified) (3 diffs)
• RangeValueConfiguration.cs (modified) (4 diffs)
• ValueConfiguration.cs (modified) (3 diffs)

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ValueConfigurations/CheckedValueConfigurationCollection.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Encodings.ParameterConfigurationEncoding {
-  // todo: check that at least 1 elements needs to be selected
-  // todo: control creatable item types
+  // TODO: check that at least 1 element needs to be selected
+  // TODO: control creatable item types
   [StorableClass]
   public class CheckedValueConfigurationList : CheckedItemList<IValueConfiguration>, ICheckedValueConfigurationList {
@@ -44 +44 @@
     }
 
-    public CheckedValueConfigurationList(IItemSet<IItem> validValues) {
-      this.validValues = validValues;
-      RegisterEvents();
-    }
-    public CheckedValueConfigurationList(IEnumerable<IValueConfiguration> collection)
-      : base(collection) {
-      validValues = null;
-      // event wiring not needed
-    }
-    public CheckedValueConfigurationList() {
-      RegisterEvents();
-    }
+    #region Constructors and Cloning
     [StorableConstructor]
     protected CheckedValueConfigurationList(bool deserializing)
@@ -67 +56 @@
       RegisterEvents();
     }
-
+    public CheckedValueConfigurationList(IItemSet<IItem> validValues)
+      : base() {
+      this.validValues = validValues;
+      RegisterEvents();
+    }
+    public CheckedValueConfigurationList(IEnumerable<IValueConfiguration> collection)
+      : base(collection) {
+      validValues = null;
+      // event wiring not needed
+    }
+    public CheckedValueConfigurationList()
+      : base() {
+      RegisterEvents();
+    }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new CheckedValueConfigurationList(this, cloner);
@@ -75 +77 @@
       RegisterEvents();
     }
+    #endregion
 
     private void RegisterEvents() {
       this.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsAdded);
-      this.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsRemoved);
     }
 
     private void DeregisterEvents() {
-      this.ItemsRemoved -= new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsRemoved);
       this.ItemsAdded -= new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsAdded);
     }
@@ -95 +96 @@
       }
     }
-
-    private void CheckedValueConfigurationList_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
-      // auch collectionreset gehört berücksichtigt
-      // funktioniert so nicht ganz, weil die view das hinzufügen nicht mitkriegt
-      //if (this.Count < minItemCount) {
-      //  foreach (var item in e.Items) {
-      //    if (this.Count >= minItemCount)
-      //      break;
-      //    this.Add(item);
-      //  }
-      //}
-    }
-
   }
 }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ValueConfigurations/NullValueConfiguration.cs

@@ -28 +28 @@
   [StorableClass]
   public class NullValueConfiguration : ValueConfiguration {
-
-    public NullValueConfiguration() {
-      this.ActualValue = new ConstrainedValue(null, null, null, true);
-      this.IsOptimizable = false;
-    }
+    #region Constructors and Cloning
     [StorableConstructor]
     protected NullValueConfiguration(bool deserializing) : base(deserializing) { }
@@ -38 +34 @@
       : base(original, cloner) {
     }
+    public NullValueConfiguration()
+      : base() {
+      this.ActualValue = new ConstrainedValue(null, null, null, true);
+      this.IsOptimizable = false;
+    }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new NullValueConfiguration(this, cloner);
     }
+    #endregion
 
     public override string ToString() {

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ValueConfigurations/ParameterizedValueConfiguration.cs

@@ -83 +83 @@
     [StorableConstructor]
     protected ParameterizedValueConfiguration(bool deserializing) : base(deserializing) { }
-    public ParameterizedValueConfiguration() {
+    protected ParameterizedValueConfiguration(ParameterizedValueConfiguration original, Cloner cloner)
+      : base(original, cloner) {
+      this.discoverValidValues = original.discoverValidValues;
+      this.ParameterConfigurations = cloner.Clone(original.parameterConfigurations);
+    }
+    public ParameterizedValueConfiguration()
+      : base() {
       this.ParameterConfigurations = new ItemList<IParameterConfiguration>();
     }
@@ -89 +95 @@
       : base(value, valueDataType) {
       this.discoverValidValues = discoverValidValues;
-    }
-    protected ParameterizedValueConfiguration(ParameterizedValueConfiguration original, Cloner cloner)
-      : base(original, cloner) {
-      this.discoverValidValues = original.discoverValidValues;
-      this.ParameterConfigurations = cloner.Clone(original.parameterConfigurations);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -107 +108 @@
           if (valueParameter != null) {
             var pc = new ParameterConfiguration(valueParameter.Name, valueParameter, discoverValidValues);
+            pc.CombinationsCountChanged += (sender, args) => OnCombinationsCountChanged();
             this.parameterConfigurations.Add(pc);
           }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ValueConfigurations/RangeValueConfiguration.cs

@@ -46 +46 @@
     [StorableConstructor]
     protected RangeValueConfiguration(bool deserializing) : base(deserializing) { }
-    public RangeValueConfiguration() {
-
-    }
     protected RangeValueConfiguration(RangeValueConfiguration original, Cloner cloner)
       : base(original, cloner) {
@@ -54 +51 @@
       RegisterRangeConstraintEvents();
     }
+    public RangeValueConfiguration() : base() { }
     public RangeValueConfiguration(IItem value, Type valueDataType)
       : base(value, valueDataType) {
@@ -68 +66 @@
       }
     }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new RangeValueConfiguration(this, cloner);
-    }
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
       RegisterRangeConstraintEvents();
     }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new RangeValueConfiguration(this, cloner);
+    }
     #endregion
 
     private void RegisterRangeConstraintEvents() {
-      if (this.RangeConstraint != null) this.RangeConstraint.ToStringChanged += new EventHandler(RangeConstraint_ToStringChanged);
+      if (this.RangeConstraint != null) {
+        this.RangeConstraint.ToStringChanged += new EventHandler(RangeConstraint_ToStringChanged);
+        this.RangeConstraint.LowerBoundChanged += new EventHandler(RangeConstraintParametersChanged);
+        this.RangeConstraint.UpperBoundChanged += new EventHandler(RangeConstraintParametersChanged);
+        this.RangeConstraint.StepSizeChanged += new EventHandler(RangeConstraintParametersChanged);
+      }
     }
+
     private void DeregisterRangeConstraintEvents() {
-      if (this.RangeConstraint != null) this.RangeConstraint.ToStringChanged -= new EventHandler(RangeConstraint_ToStringChanged);
+      if (this.RangeConstraint != null) {
+        this.RangeConstraint.ToStringChanged -= new EventHandler(RangeConstraint_ToStringChanged);
+        this.RangeConstraint.LowerBoundChanged -= new EventHandler(RangeConstraintParametersChanged);
+        this.RangeConstraint.UpperBoundChanged -= new EventHandler(RangeConstraintParametersChanged);
+        this.RangeConstraint.StepSizeChanged -= new EventHandler(RangeConstraintParametersChanged);
+      }
     }
 
@@ -119 +128 @@
       OnToStringChanged();
     }
+    private void RangeConstraintParametersChanged(object sender, EventArgs e) {
+      OnCombinationsCountChanged();
+    }
     #endregion
   }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ValueConfigurations/ValueConfiguration.cs

@@ -61 +61 @@
           optimize = value;
           OnOptimizeChanged();
+          OnCombinationsCountChanged();
           OnToStringChanged();
         }
@@ -117 +118 @@
     }
     protected ValueConfiguration() : base() { }
-    protected ValueConfiguration(IItem value, Type valueDataType) {
+    protected ValueConfiguration(IItem value, Type valueDataType)
+      : base() {
       this.ActualValue = new ConstrainedValue(value, valueDataType, new ItemSet<IItem> { value }, false);
       this.IsOptimizable = true;
@@ -168 +170 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
+
+    public event EventHandler CombinationsCountChanged;
+    protected void OnCombinationsCountChanged() {
+      var handler = CombinationsCountChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     #endregion