Changeset 9364 for branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/CreateExperimentDialog.cs

Timestamp:

04/16/13 16:23:59 (12 years ago)

Author:

ascheibe

Message:

#1886 added repetitions for random parameter configurations

File:

• branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/CreateExperimentDialog.cs (modified) (4 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/CreateExperimentDialog.cs

@@ -44 +44 @@
       set {
         optimizer = value;
-        Experiment = null;
+        Experiments = null;
         okButton.Enabled = optimizer != null;
         SetTabControlVisibility();
@@ -52 +52 @@
     }
 
-    public Experiment Experiment { get; private set; }
+    public List<Experiment> Experiments { get; private set; }
 
     private bool createBatchRun;
@@ -75 +75 @@
       // do not set the Optimizer property here, because we want to delay instance discovery to the time when the form loads
       this.optimizer = optimizer;
-      Experiment = null;
+      Experiments = null;
       okButton.Enabled = optimizer != null;
 
@@ -715 +715 @@
     private void experimentCreationBackgroundWorker_DoWork(object sender, DoWorkEventArgs e) {
       backgroundWorkerWaitHandle.Set(); // notify the ok button that we're busy now
-      failedInstances = new StringBuilder();
-      var localExperiment = new Experiment();
-
-      int counter = 0, totalVariations = GetNumberOfVariations();
-      int totalInstances = instances.Values.SelectMany(x => x).Count();
-      if (totalInstances == 0) {
-        try {
-          AddParameterVariations(Optimizer, localExperiment, ref counter, totalVariations);
-        }
-        catch (OperationCanceledException) {
-          e.Cancel = true;
-          return;
-        }
-        experimentCreationBackgroundWorker.ReportProgress(100, string.Empty);
-      } else {
-        foreach (var provider in instances.Keys) {
-          foreach (var descriptor in instances[provider]) {
-            var algorithm = (IAlgorithm)Optimizer.Clone();
-            bool failed = false;
-            try {
-              ProblemInstanceManager.LoadData(provider, descriptor, (IProblemInstanceConsumer)algorithm.Problem);
-            }
-            catch (Exception ex) {
-              failedInstances.AppendLine(descriptor.Name + ": " + ex.Message);
-              failed = true;
-            }
-            if (!failed) {
+
+      int b = int.Parse(repetitionsTextBox.Text);
+      for (int i = 0; i < b; i++) {
+        failedInstances = new StringBuilder();
+        var localExperiment = new Experiment();
+
+        int counter = 0, totalVariations = GetNumberOfVariations();
+        int totalInstances = instances.Values.SelectMany(x => x).Count();
+        if (totalInstances == 0) {
+          try {
+            AddParameterVariations(Optimizer, localExperiment, ref counter, totalVariations);
+          }
+          catch (OperationCanceledException) {
+            e.Cancel = true;
+            return;
+          }
+          experimentCreationBackgroundWorker.ReportProgress(100, string.Empty);
+        } else {
+          foreach (var provider in instances.Keys) {
+            foreach (var descriptor in instances[provider]) {
+              var algorithm = (IAlgorithm)Optimizer.Clone();
+              bool failed = false;
               try {
-                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);
+                ProblemInstanceManager.LoadData(provider, descriptor, (IProblemInstanceConsumer)algorithm.Problem);
+              }
+              catch (Exception ex) {
+                failedInstances.AppendLine(descriptor.Name + ": " + ex.Message);
+                failed = true;
+              }
+              if (!failed) {
+                try {
+                  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;
-                return;
-              }
-            } else experimentCreationBackgroundWorker.ReportProgress((int)Math.Round((100.0 * counter) / totalVariations), "Loading failed (" + descriptor.Name + ")");
-          }
-        }
-      }
-      // this step can take some time
-      SetMode(DialogMode.PreparingExperiment);
-      experimentCreationBackgroundWorker.ReportProgress(-1);
-      localExperiment.Prepare(true);
-      experimentCreationBackgroundWorker.ReportProgress(100);
-      Experiment = localExperiment;
+                catch (OperationCanceledException) {
+                  e.Cancel = true;
+                  return;
+                }
+              } else experimentCreationBackgroundWorker.ReportProgress((int)Math.Round((100.0 * counter) / totalVariations), "Loading failed (" + descriptor.Name + ")");
+            }
+          }
+        }
+        // this step can take some time
+        SetMode(DialogMode.PreparingExperiment);
+        experimentCreationBackgroundWorker.ReportProgress(-1);
+        localExperiment.Prepare(true);
+        experimentCreationBackgroundWorker.ReportProgress(100);
+        if (Experiments == null) Experiments = new List<Experiment>();
+        Experiments.Add(localExperiment);
+      }
     }