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

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/ParameterConfigurations

Files:

• ParameterConfiguration.cs (modified) (12 diffs)
• SingleValuedParameterConfiguration.cs (modified) (2 diffs)

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ParameterConfigurations/ParameterConfiguration.cs

@@ -57 +57 @@
           }
           OnOptimizeChanged();
+          OnCombinationsCountChanged();
           OnToStringChanged();
+        }
+      }
+    }
+
+    [Storable]
+    protected long combinationsCount;
+    public virtual long CombinationsCount {
+      get { return combinationsCount; }
+      set {
+        if (combinationsCount != value) {
+          combinationsCount = value;
+          OnCombinationsCountChanged();
         }
       }
@@ -179 +192 @@
 
     #region Constructors and Cloning
-    public ParameterConfiguration(string parameterName, IValueParameter valueParameter, bool discoverValidValues) {
+    public ParameterConfiguration(string parameterName, IValueParameter valueParameter, bool discoverValidValues)
+      : base() {
       this.AutoPopulateValueConfigurations = true;
       this.ParameterName = parameterName;
@@ -202 +216 @@
       }
     }
-    public ParameterConfiguration(string parameterName, Type type, IItem actualValue, IEnumerable<IValueConfiguration> valueConfigurations) {
+    public ParameterConfiguration(string parameterName, Type type, IItem actualValue, IEnumerable<IValueConfiguration> valueConfigurations)
+      : base() {
       this.AutoPopulateValueConfigurations = false;
       this.ParameterName = parameterName;
@@ -211 +226 @@
       this.validTypes = new Type[] { type };
       this.IsNullable = false;
-      this.itemImage = valueConfigurations.Count() > 0 ? valueConfigurations.FirstOrDefault().ItemImage : null;
+      this.itemImage = valueConfigurations.Any() ? valueConfigurations.First().ItemImage : null;
       this.ValueConfigurations = new CheckedValueConfigurationList(valueConfigurations);
       this.ActualValue = new ConstrainedValue(actualValue, type, CreateValidValues(), this.IsNullable);
     }
-    public ParameterConfiguration(string parameterName, Type type, IItem actualValue) {
+    public ParameterConfiguration(string parameterName, Type type, IItem actualValue)
+      : base() {
       this.AutoPopulateValueConfigurations = true;
       this.ParameterName = parameterName;
@@ -231 +247 @@
       }
     }
-    protected ParameterConfiguration() { }
+    protected ParameterConfiguration() : base() { }
     [StorableConstructor]
     protected ParameterConfiguration(bool deserializing) { }
-
     protected ParameterConfiguration(ParameterConfiguration original, Cloner cloner)
       : base(original, cloner) {
@@ -316 +331 @@
               }
             }
+            valueConfiguration.CombinationsCountChanged += (sender, args) => OnCombinationsCountChanged();
             this.ValueConfigurations.Add(valueConfiguration, true);
           }
@@ -357 +373 @@
         return new List<Type> { parameter };
 
-      //TODO: not sure if this if makes sense; maybe only leave else branch here
+      // TODO: check if this makes sense; maybe only leave else branch here
       if (IsSubclassOfRawGeneric(typeof(OptionalConstrainedValueParameter<>), parameter.GetType())) {
         // use existing validvalues if known
@@ -391 +407 @@
 
       // copy value from ValidValues; this ensures that previously set ActualNames for a type are kept
-      IItem value = this.validValues.Where(v => v.GetType() == type).SingleOrDefault();
+      IItem value = this.validValues.SingleOrDefault(v => v.GetType() == type);
       if (value != null)
         return value;
@@ -425 +441 @@
     private void ValueConfigurations_CheckedItemsChanged(object sender, Collections.CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
       OnToStringChanged();
+      OnCombinationsCountChanged();
       KeepActualValueConfigurationIndexConsistent();
     }
@@ -430 +447 @@
     private void ValueConfigurations_ItemsRemoved(object sender, Collections.CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
       OnToStringChanged();
+      OnCombinationsCountChanged();
       KeepActualValueConfigurationIndexConsistent();
     }
     private void ValueConfigurations_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
       OnToStringChanged();
+      OnCombinationsCountChanged();
       KeepActualValueConfigurationIndexConsistent();
     }
@@ -451 +470 @@
     public virtual bool CanChangeName {
       get { return false; }
-    }
-    public override string ItemDescription {
-      get { return base.ItemDescription; }
-    }
-    public override string ItemName {
-      get { return base.ItemName; }
     }
     #endregion
@@ -494 +507 @@
     protected virtual void OnOptimizeChanged() {
       var handler = OptimizeChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+
+    public event EventHandler CombinationsCountChanged;
+    protected void OnCombinationsCountChanged() {
+      var handler = CombinationsCountChanged;
       if (handler != null) handler(this, EventArgs.Empty);
     }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ParameterConfigurations/SingleValuedParameterConfiguration.cs

@@ -29 +29 @@
   [StorableClass]
   public class SingleValuedParameterConfiguration : ParameterConfiguration {
-
     #region Constructors and Cloning
     [StorableConstructor]
     protected SingleValuedParameterConfiguration(bool deserializing) : base(deserializing) { }
+    protected SingleValuedParameterConfiguration(SingleValuedParameterConfiguration original, Cloner cloner) : base(original, cloner) { }
     public SingleValuedParameterConfiguration(string parameterName, IValueParameter valueParameter)
       : base(parameterName, valueParameter, false) {
@@ -57 +57 @@
         this.validValues,
         this.IsNullable);
-    }
-    protected SingleValuedParameterConfiguration(SingleValuedParameterConfiguration original, Cloner cloner)
-      : base(original, cloner) {
     }
     public override IDeepCloneable Clone(Cloner cloner) {