Changeset 8535 for branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ParameterConfigurationTree.cs

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

File:

• branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ParameterConfigurationTree.cs (modified) (4 diffs)

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ParameterConfigurationTree.cs

@@ -37 +37 @@
   [StorableClass]
   public class ParameterConfigurationTree : ParameterizedValueConfiguration, IEnumerable {
+    [Storable]
+    private long combinationsCount;
+    public long CombinationsCount {
+      get { return combinationsCount; }
+      private set {
+        if (combinationsCount != value) {
+          combinationsCount = value;
+          OnCombinationsCountChanged();
+        }
+      }
+    }
+
     [Storable]
     private DoubleValue quality;
@@ -213 +225 @@
       this.Name = algorithm.ItemName;
 
-      var algproblemitem = new AlgorithmProblemItem();
-      algproblemitem.AlgorithmParameter.Value = algorithm;
-      algproblemitem.ProblemParameter.Value = problem;
+      var algProblemItem = new AlgorithmProblemItem();
+      algProblemItem.AlgorithmParameter.Value = algorithm;
+      algProblemItem.ProblemParameter.Value = problem;
       this.discoverValidValues = false;
 
-      this.parameterConfigurations.Add(new SingleValuedParameterConfiguration("Algorithm", algproblemitem.AlgorithmParameter));
-      this.parameterConfigurations.Add(new SingleValuedParameterConfiguration("Problem", algproblemitem.ProblemParameter));
+      var algConfig = new SingleValuedParameterConfiguration("Algorithm", algProblemItem.AlgorithmParameter);
+      var problemConfig = new SingleValuedParameterConfiguration("Problem", algProblemItem.ProblemParameter);
+
+      algConfig.CombinationsCountChanged += new EventHandler(UpdateConfigurationsCount);
+      problemConfig.CombinationsCountChanged += new EventHandler(UpdateConfigurationsCount);
+
+      this.parameterConfigurations.Add(algConfig);
+      this.parameterConfigurations.Add(problemConfig);
 
       // problems can be modified in the list of problem instances, so the parameters which are not Optimize=true, 
       // must not be modifiable in the parameter configuration tree. otherwise the parameter values would be ambiguous
       ProblemConfiguration.ValuesReadOnly = true;
+
+      CombinationsCount = GetCombinationCount(0);
     }
 
@@ -233 +253 @@
     private void AfterDeserialization() {
       if (ProblemConfiguration != null) ProblemConfiguration.ValuesReadOnly = true;
+      CombinationsCount = GetCombinationCount(0);
     }
     #endregion
@@ -265 +286 @@
     private void Quality_ValueChanged(object sender, EventArgs e) {
       OnQualityChanged();
+    }
+
+    private void UpdateConfigurationsCount(object sender, EventArgs e) {
+      CombinationsCount = GetCombinationCount(0);
     }