Changeset 5184 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3

Timestamp:

12/30/10 22:50:59 (14 years ago)

Author:

cneumuel

Message:

#1215

• enhanced combinations generator (now with batchruns!)
• fixed ActualNames for metaopt-alg
• added penalty for invalid solution-candidates (algs which throw exceptions)
• migrated to .NET 4.0

Location:

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

Files:

• HeuristicLab.Problems.MetaOptimization.Views-3.3.csproj (modified) (1 diff)
• MetaOptimizationProblemView.cs (modified) (1 diff)
• ValueConfigurationViews/ValueConfigurationCheckedItemList.cs (modified) (1 diff)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/HeuristicLab.Problems.MetaOptimization.Views-3.3.csproj

@@ -11 +11 @@
     <RootNamespace>HeuristicLab.Problems.MetaOptimization.Views</RootNamespace>
     <AssemblyName>HeuristicLab.Problems.MetaOptimization.Views-3.3</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />

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

@@ -62 +62 @@
         }
         if (result == System.Windows.Forms.DialogResult.OK) {
-          Experiment experiment = Content.ParameterConfigurationTree.GenerateExperiment(Content.Algorithm);
+          Experiment experiment;
+          if (Content.Repetitions.Value > 1) {
+            experiment = Content.ParameterConfigurationTree.GenerateExperiment(Content.Algorithm, true, Content.Repetitions.Value);
+          } else {
+            experiment = Content.ParameterConfigurationTree.GenerateExperiment(Content.Algorithm);
+          }
           MainFormManager.MainForm.ShowContent(experiment);
         }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/ValueConfigurationViews/ValueConfigurationCheckedItemList.cs

@@ -73 +73 @@
       if (objectSelectorDialog.ShowDialog(this) == DialogResult.OK) {
         try {
-          IItem value = objectSelectorDialog.Item;
+          IItem value = (IItem)objectSelectorDialog.Item.Clone();
           return new ValueConfiguration(value, value.GetType());
         }