Changeset 8474 for trunk/sources

Timestamp:

08/11/12 10:34:27 (12 years ago)

Author:

abeham

Message:

#1914:

• Set name of batch run to "repetitions times optimizer name"
• Added parent experiment for each instance when there are more than one instance and more than one variation per instance

File:

• trunk/sources/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs

@@ -473 +473 @@
     private void AddOptimizer(IOptimizer optimizer, Experiment experiment) {
       if (createBatchRun) {
-        var batchRun = new BatchRun();
-        batchRun.Repetitions = repetitions;
-        batchRun.Optimizer = optimizer;
+        var batchRun = new BatchRun(repetitions.ToString() + "x " + optimizer.Name) {
+          Repetitions = repetitions,
+          Optimizer = optimizer
+        };
         experiment.Optimizers.Add(batchRun);
       } else {
@@ -708 +709 @@
 
       int counter = 0, totalVariations = GetNumberOfVariations();
-      if (instances.Count == 0) {
+      int totalInstances = instances.Values.SelectMany(x => x).Count();
+      if (totalInstances == 0) {
         try {
           AddParameterVariations(Optimizer, localExperiment, ref counter, totalVariations);
@@ -729 +731 @@
             if (!failed) {
               try {
-                AddParameterVariations(algorithm, localExperiment, ref counter, totalVariations);
+                if (totalInstances > 1 && totalVariations / totalInstances > 1) {
+                  var experiment = new Experiment(descriptor.Name);
+                  AddParameterVariations(algorithm, experiment, ref counter, totalVariations);
+                  localExperiment.Optimizers.Add(experiment);
+                } else {
+                  AddParameterVariations(algorithm, localExperiment, ref counter, totalVariations);
+                }
               } catch (OperationCanceledException) {
                 e.Cancel = true;