Changeset 13718 for branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common

Timestamp:

03/18/16 16:15:10 (8 years ago)

Author:

abeham

Message:

#2457: worked on expert system

File:

• branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/ExpertSystem.cs (modified) (3 diffs)

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

@@ -251 +251 @@
       // It has to be decided somehow which problem instances to include in order to obtain the set of features that is expressive and available
       var allCharacteristics = ProblemInstances.Select(x => new HashSet<string>(x.Results.Where(y => y.Key.StartsWith("Characteristic.", StringComparison.Ordinal)).Select(y => y.Key))).ToList();
+      if (allCharacteristics.Count == 0) return;
+
       var commonCharacteristics = filter.Count > 0 ? filter : allCharacteristics[0];
       for (var i = 0; i < allCharacteristics.Count; i++)
@@ -446 +448 @@
     }
 
-    public async void UpdateKnowledgeBaseAsync(IProgress progress) {
+    public Task UpdateKnowledgeBaseAsync(IProgress progress = null) {
+      if (progress == null) progress = new Progress(string.Empty);
       progress.Start("Updating Knowledge Base from OKB");
-      await Task.Factory.StartNew(() => { DoUpdateKnowledgeBase(progress); }, TaskCreationOptions.LongRunning);
-    }
-
-    public void UpdateKnowledgeBase() {
-      DoUpdateKnowledgeBase(new Progress(string.Empty, ProgressState.Started));
+      OnDownloadStarted(progress);
+      return Task.Factory.StartNew(() => { DoUpdateKnowledgeBase(progress); }, TaskCreationOptions.LongRunning);
+    }
+
+    public void UpdateKnowledgeBase(IProgress progress = null) {
+      UpdateKnowledgeBaseAsync(progress).Wait();
     }
 
@@ -632 +636 @@
       if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));
     }
+
+    public event EventHandler<EventArgs<IProgress>> DownloadStarted;
+    private void OnDownloadStarted(IProgress progress) {
+      var handler = DownloadStarted;
+      if (handler != null) handler(this, new EventArgs<IProgress>(progress));
+    }
   }
 }