Changeset 5328

Timestamp:

01/18/11 17:47:49 (14 years ago)

Author:

cneumuel

Message:

#1215

• minor fixes

Location:

branches/HeuristicLab.MetaOptimization

Files:

• HeuristicLab.Problems.MetaOptimization.Views/3.3/MetaOptimizationProblemView.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/ConstrainedTypeValue.cs (modified) (2 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurationTree.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/MetaOptimizationProblem.cs (modified) (1 diff)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/MetaOptimizationProblemView.cs

@@ -56 +56 @@
     private void createExperimentButton_Click(object sender, EventArgs e) {
       if (Content != null) {
-        long count = Content.ParameterConfigurationTree.GetCombinationCount();
+        long max = 100000;
+        long count = Content.ParameterConfigurationTree.GetCombinationCount(max);
 
         System.Windows.Forms.DialogResult result = System.Windows.Forms.DialogResult.OK;
         if (count > 512) {
-          result = System.Windows.Forms.MessageBox.Show(string.Format("Do you really want to create {0} optimizers? Be aware that this might take a significant amount of time and memory.", count), "Create Experiment", System.Windows.Forms.MessageBoxButtons.OKCancel);
+          if (count == max) {
+            result = System.Windows.Forms.MessageBox.Show(string.Format("Do you really want to create more than {0}+ optimizers? Be aware that this might take a significant amount of time and memory.", count), "Create Experiment", System.Windows.Forms.MessageBoxButtons.OKCancel);
+          } else {
+            result = System.Windows.Forms.MessageBox.Show(string.Format("Do you really want to create {0} optimizers? Be aware that this might take a significant amount of time and memory.", count), "Create Experiment", System.Windows.Forms.MessageBoxButtons.OKCancel);
+          }
         }
         if (result == System.Windows.Forms.DialogResult.OK) {

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/ConstrainedTypeValue.cs

@@ -16 +16 @@
 
     [Storable]
-    IEnumerable<Type> validTypes;
+    private IEnumerable<Type> validTypes;
     public IEnumerable<Type> ValidTypes {
       get { return validTypes; }
@@ -49 +49 @@
 
     public ConstrainedTypeValue() : base() {
-      this.ValidTypes = ApplicationManager.Manager.GetTypes(typeof(T), true);
+      this.ValidTypes = ApplicationManager.Manager.GetTypes(typeof(T), true).ToList();
       this.Value = ValidTypes.First();
     }
     public ConstrainedTypeValue(Type value) : base() {
-      this.ValidTypes = ApplicationManager.Manager.GetTypes(typeof(T), true);
+      this.ValidTypes = ApplicationManager.Manager.GetTypes(typeof(T), true).ToList();
       this.Value = value;
     }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurationTree.cs

@@ -214 +214 @@
     }
 
-    public long GetCombinationCount() {
+    /// <summary>
+    /// returns the number of possible parameter combinations
+    /// </summary>
+    /// <param name="max">algorithm stops counting when max is reached. zero for infinite counting</param>
+    /// <returns></returns>
+    public long GetCombinationCount(long max) {
       long cnt = 0;
       foreach (var c in this) {
         cnt++;
+        if (max > 0 && cnt >= max) {
+          return cnt;
+        }
       }
       return cnt;

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/MetaOptimizationProblem.cs

@@ -40 +40 @@
     public const string ProblemTypeParameterName = "ProblemType";
     public const string ProblemsParameterName = "Problems";
-    public const string ParameterConfigurationTreeParameterName = "ParameterConfigurationTree";
+    public const string ParameterConfigurationTreeParameterName = "ParameterConfiguration";
     public const string RepetitionsParameterName = "Repetitions";