Changeset 15171 for branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ExperimentFactory.cs

Timestamp:

07/08/17 12:31:54 (7 years ago)

Author:

jkarder

Message:

#1853: worked on ParameterConfigurationEncoding

• updated to .NET 4.5
• replaced CreateExperimentDialogV2 with CreateExperimentView
• improved experiment generation
• fixed plugin dependencies and cleaned project references

Location:

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3

Files:

• . (modified) (1 prop)
• ExperimentFactory.cs (modified) (4 diffs)

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using HeuristicLab.Optimization;
@@ -32 +33 @@
       get { return experimentGenerationProgress; }
       private set {
-        if (experimentGenerationProgress != value) {
-          experimentGenerationProgress = value;
-          OnExperimentGenerationProgressChanged();
-        }
+        experimentGenerationProgress = value;
+        OnExperimentGenerationProgressChanged();
       }
     }
@@ -47 +46 @@
     public Experiment GenerateExperiment(IAlgorithm algorithm, ParameterConfigurationTree configuration, bool createBatchRuns, int repetitions, Dictionary<IProblemInstanceProvider, HashSet<IDataDescriptor>> problemInstances, CancellationToken ct) {
       var experiment = new Experiment();
-      var algorithms = new List<IAlgorithm>(1 + problemInstances.Values.Count) { (IAlgorithm)algorithm.Clone() };
-      foreach (var provider in problemInstances) {
-        foreach (var descriptor in provider.Value) {
-          var alg = (IAlgorithm)algorithm.Clone();
-          ProblemInstanceManager.LoadData(provider.Key, descriptor, (IProblemInstanceConsumer)alg.Problem);
-          algorithms.Add(alg);
+      var algorithms = new List<IAlgorithm>();
+
+      if (problemInstances.Values.Sum(x => x.Count) > 0) {
+        foreach (var provider in problemInstances) {
+          foreach (var descriptor in provider.Value) {
+            var alg = (IAlgorithm)algorithm.Clone();
+            ProblemInstanceManager.LoadData(provider.Key, descriptor, (IProblemInstanceConsumer)alg.Problem);
+            algorithms.Add(alg);
+          }
         }
-      }
+      } else algorithms.Add((IAlgorithm)algorithm.Clone());
+
       ExperimentGenerationProgress = 0;
+
       foreach (var alg in algorithms) {
         foreach (ParameterizedValueConfiguration combination in configuration) {
@@ -74 +78 @@
         }
       }
+
       return experiment;
     }