Changeset 13475 for branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem

Timestamp:

12/16/15 17:04:35 (9 years ago)

Author:

abeham

Message:

#2457, #2431: updated from trunk, worked on okb connection for downloading knowledge base

Location:

branches/PerformanceComparison

Files:

• . (modified) (1 prop)
• HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystem.cs (modified) (3 diffs)

branches/PerformanceComparison

@@ -2 +2 @@
 *.suo
 *.user
+.git
+.gitignore

@@ -2 +2 @@
 *.suo
 *.user
+.git
+.gitignore

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystem.cs

@@ -71 +71 @@
         algorithmInstances = value;
         OnPropertyChanged("AlgorithmInstances");
+        // TODO: Attach event handlers
       }
     }
@@ -155 +156 @@
       var runCollection = sender as RunCollection;
       if (runCollection != null && runCollection.UpdateOfRunsInProgress) return;
-      UpdateInstanceMap();
       UpdateSuggestions();
     }
 
-    private void UpdateInstanceMap() {
+    public void UpdateInstanceMap() {
       var flaValues = ProblemInstances.ResultNames
                       .Where(x => x.StartsWith("Characteristic.")
@@ -203 +203 @@
           } else instance.Results.Add("Projection.PCA2", new DoubleValue(y));
 
+          instanceCounter++;
+
           var bkQuality = ((DoubleValue)instance.Parameters["BestKnownQuality"]).Value;
           var maximization = ((BoolValue)instance.Parameters["Maximization"]).Value;
+
+          if (!algInstRunDict.ContainsKey(probInstanceName)) continue;
           foreach (var kvp in algInstRunDict[probInstanceName]) {
             var algInstanceName = kvp.Key;
-            foreach (var run in kvp.Value) {
-              // TODO: Things needs to be configurable here (table name, targets)
-              foreach (var target in new[] { 1, 1.01, 1.05, 1.1, 1.2, 1.5 }) {
-                var result = ExpectedRuntimeHelper.CalculateErt(kvp.Value, "QualityPerEvaluations", bkQuality * target, maximization);
-                var resultName = algInstanceName + "@" + ((target - 1) * 100) + "%";
-                if (run.Results.TryGetValue(resultName, out item))
-                  ((DoubleValue)item).Value = result.ExpectedRuntime;
-                else run.Results.Add(resultName, new DoubleValue(result.ExpectedRuntime));
-              }
+            // TODO: Things needs to be configurable here (table name, targets)
+            foreach (var target in new[] { 1, 1.01, 1.05, 1.1, 1.2, 1.5 }) {
+              var result = ExpectedRuntimeHelper.CalculateErt(kvp.Value, "QualityPerEvaluations", bkQuality * target, maximization);
+              var resultName = algInstanceName + "@" + ((target - 1) * 100) + "%";
+              if (instance.Results.TryGetValue(resultName, out item)) {
+                ((DoubleValue)item).Value = Math.Log10(result.ExpectedRuntime);
+              } else instance.Results.Add(resultName, new DoubleValue(Math.Log10(result.ExpectedRuntime)));
             }
           }

@@ -2 +2 @@
 *.suo
 *.user
+.git
+.gitignore