Changeset 13485 for branches

Timestamp:

12/18/15 12:42:13 (9 years ago)

Author:

abeham

Message:

#2457:

• fixed bugs in iterated sampling view
• worked on download runs from okb feature

Location:

branches/PerformanceComparison

Files:

• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionIteratedSamplingView.cs (modified) (6 diffs)
• HeuristicLab.OptimizationExpertSystem.Views/3.3/ExpertSystemView.Designer.cs (modified) (5 diffs)
• HeuristicLab.OptimizationExpertSystem.Views/3.3/ExpertSystemView.cs (modified) (5 diffs)
• HeuristicLab.OptimizationExpertSystem.Views/3.3/ExpertSystemView.resx (modified) (3 diffs)
• HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystem.cs (modified) (2 diffs)
• HeuristicLab.OptimizationExpertSystem/3.3/HeuristicLab.OptimizationExpertSystem-3.3.csproj (modified) (3 diffs)
• PerformanceComparison.sln (modified) (2 diffs)

branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionIteratedSamplingView.cs

@@ -26 +26 @@
 using System.Linq;
 using System.Windows.Forms.DataVisualization.Charting;
-using HeuristicLab.MainForm.WindowsForms;
-using HeuristicLab.MainForm;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Data;
+using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Optimization.Views.RunCollectionViews {
@@ -268 +268 @@
       bestProbability = 1.0;
       var bestProbabilityEffort = 0.0;
+      var succ = 0;
       foreach (var d in data) {
         if (double.IsNaN(d.Item2)) continue;
-        double succ = 0.0, unsucc = 0.0;
-        foreach (var e in data) {
-          if (e.Item1 <= d.Item1 && HasAchievedTarget(maximization, e, target)) succ++;
-          else if (e.Item1 >= d.Item1) unsucc++;
-        }
+        if (HasAchievedTarget(maximization, d, target)) succ++;
         // probability of having no successful run with effort d.Item1
-        var prob = (1.0 - succ / (succ + unsucc));
+        var prob = (1.0 - succ / (double)data.Count);
         // normalizing probability to effort 1 (assuming exponential convergence)
         prob = Math.Pow(prob, 1.0 / d.Item1);
@@ -293 +290 @@
     private void UpdateGraph(double cutoff, double bestProbability, double target, bool maximization) {
       var table = (string)dataTableComboBox.SelectedItem;
-      var result = ExpectedRuntimeHelper.CalculateErt(GetRunsFiltered().ToList(), table, target, maximization);
-      var lambda = 1.0 / result.ExpectedRuntime;
       var runs = GetRunsFiltered().Select(x => (IndexedDataTable<double>)x.Results[table]).ToList();
       var evaluations = runs.SelectMany(x => x.Rows.First().Values.Select(y => y.Item1)).Distinct().OrderBy(x => x).ToList();
@@ -332 +327 @@
       }
 
-      var minimum = hits.First(x => x.Value > 0).Key;
-
       enhancedChart.SuspendRepaint();
 
@@ -346 +339 @@
       var series2 = enhancedChart.Series["rldApproximationSeries"];
       series2.Points.Clear();
-      foreach (var e in Enumerable.Range(0, (int)Math.Ceiling(evaluations.Max()))) {
-        series2.Points.AddXY(e, Math.Max(0, 1.0 - Math.Exp(-lambda * (e - minimum))));
+      var evalMax = evaluations.Max();
+      var steps = evalMax / 100.0;
+
+      var result = ExpectedRuntimeHelper.CalculateErt(GetRunsFiltered().ToList(), table, target, maximization);
+      var lambda = 1.0 / result.ExpectedRuntime;
+      foreach (var e in Enumerable.Range(0, 100)) {
+        var x = e * steps;
+        series2.Points.AddXY(x, Math.Max(0, 1.0 - Math.Exp(-lambda * x)));
       }
       var series3 = enhancedChart.Series["optimalSeries"];
       series3.Points.Clear();
-      lambda = -Math.Log(bestProbability);
-      foreach (var e in Enumerable.Range(0, (int)Math.Ceiling(evaluations.Max())))
-        series3.Points.AddXY(e, Math.Max(0, 1.0 - Math.Exp(-lambda * (e - minimum))));
+      if (bestProbability <= 0) bestProbability = 1 - lambda;
+      foreach (var e in Enumerable.Range(0, 100)) {
+        var x = e * steps;
+        series3.Points.AddXY(x, Math.Max(0, 1.0 - Math.Pow(bestProbability, x)));
+      }
 
       enhancedChart.Annotations.Clear();
@@ -359 +360 @@
         var annotation = new VerticalLineAnnotation();
         annotation.AnchorDataPoint = series.Points[cutOffIdx];
-        annotation.Height = -20;
+        annotation.Height = series.Points[cutOffIdx].YValues[0] > enhancedChart.ChartAreas[series.ChartArea].AxisY.Maximum / 2.0 ? 10 : -10;
         annotation.LineWidth = 2;
         annotation.StartCap = LineAnchorCapStyle.Arrow;

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Views/3.3/ExpertSystemView.Designer.cs

@@ -47 +47 @@
       this.suggestedInstancesComboBox = new System.Windows.Forms.ComboBox();
       this.runsTabPage = new System.Windows.Forms.TabPage();
-      this.runsView = new HeuristicLab.Optimization.Views.RunCollectionView();
       this.okbTabPage = new System.Windows.Forms.TabPage();
       this.algorithmInstancesViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
@@ -57 +56 @@
       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
       this.okbDownloadButton = new System.Windows.Forms.Button();
+      this.runsView = new HeuristicLab.Optimization.Views.RunCollectionView();
+      this.progressPanel = new System.Windows.Forms.Panel();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.tabControl.SuspendLayout();
@@ -230 +231 @@
       this.runsTabPage.UseVisualStyleBackColor = true;
       // 
-      // runsView
-      // 
-      this.runsView.Caption = "RunCollection View";
-      this.runsView.Content = null;
-      this.runsView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.runsView.Location = new System.Drawing.Point(3, 3);
-      this.runsView.Name = "runsView";
-      this.runsView.ReadOnly = false;
-      this.runsView.Size = new System.Drawing.Size(532, 329);
-      this.runsView.TabIndex = 1;
-      // 
       // okbTabPage
       // 
+      this.okbTabPage.Controls.Add(this.progressPanel);
       this.okbTabPage.Controls.Add(this.okbDownloadButton);
       this.okbTabPage.Controls.Add(this.algorithmInstancesViewHost);
@@ -351 +342 @@
       this.okbDownloadButton.UseVisualStyleBackColor = true;
       this.okbDownloadButton.Click += new System.EventHandler(this.okbDownloadButton_Click);
+      // 
+      // runsView
+      // 
+      this.runsView.Caption = "RunCollection View";
+      this.runsView.Content = null;
+      this.runsView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.runsView.Location = new System.Drawing.Point(3, 3);
+      this.runsView.Name = "runsView";
+      this.runsView.ReadOnly = false;
+      this.runsView.Size = new System.Drawing.Size(532, 329);
+      this.runsView.TabIndex = 1;
+      // 
+      // progressPanel
+      // 
+      this.progressPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.progressPanel.Location = new System.Drawing.Point(6, 35);
+      this.progressPanel.Name = "progressPanel";
+      this.progressPanel.Size = new System.Drawing.Size(526, 294);
+      this.progressPanel.TabIndex = 2;
+      this.progressPanel.Visible = false;
       // 
       // ExpertSystemView
@@ -405 +418 @@
     private MainForm.WindowsForms.ViewHost problemInstancesView;
     private System.Windows.Forms.Button okbDownloadButton;
+    private System.Windows.Forms.Panel progressPanel;
   }
 }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Views/3.3/ExpertSystemView.cs

@@ -23 +23 @@
 using System.Collections;
 using System.ComponentModel;
-using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using HeuristicLab.Clients.OKB.Administration;
-using HeuristicLab.Clients.OKB.Query;
 using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
-using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.Xml;
 using HeuristicLab.PluginInfrastructure;
 
@@ -43 +38 @@
     protected TypeSelectorDialog problemTypeSelectorDialog;
     protected virtual bool SuppressEvents { get; set; }
+    private bool okbDownloadInProgress;
 
     public new ExpertSystem Content {
@@ -85 +81 @@
       base.OnContentChanged();
       SuppressEvents = true;
+      okbDownloadInProgress = false;
       try {
         if (Content == null) {
@@ -114 +111 @@
       algorithmViewHost.Enabled = Content != null && !ReadOnly && !Locked;
       runsView.Enabled = Content != null;
-      algorithmInstancesViewHost.Enabled = Content != null;
+      algorithmInstancesViewHost.Enabled = Content != null && !okbDownloadInProgress;
       refreshMapButton.Enabled = Content != null;
-      okbDownloadButton.Enabled = Content != null && Content.Problem != null && !ReadOnly && !Locked;
+      okbDownloadButton.Enabled = Content != null && Content.Problem != null && !ReadOnly && !Locked && !okbDownloadInProgress;
     }
 
@@ -293 +290 @@
 
     private void okbDownloadButton_Click(object sender, EventArgs e) {
-      var queryClient = QueryClient.Instance;
-      queryClient.Refresh();
-
-      var problemTypeFilter = (StringComparisonAvailableValuesFilter)queryClient.Filters.Single(x => x.Label == "Problem Data Type Name");
-      problemTypeFilter.Value = Content.Problem.GetType().Name;
-
-      var runIds = queryClient.GetRunIds(problemTypeFilter).ToList();
-      var count = queryClient.GetNumberOfRuns(problemTypeFilter);
-      if (count > 0) {
-        var list = new ItemList<IAlgorithm>();
-        var adminClient = AdministrationClient.Instance;
-        adminClient.Refresh();
-        var runs = queryClient.GetRuns(runIds, true).ToList();
-        foreach (var rGroup in runs.GroupBy(x => x.Algorithm.Id)) {
-          var data = AdministrationClient.GetAlgorithmData(rGroup.Key);
-          if (data != null) {
-            using (var stream = new MemoryStream(data)) {
-              try {
-                var alg = (IAlgorithm)XmlParser.Deserialize<IContent>(stream);
-                alg.Runs.AddRange(rGroup.Select(x => queryClient.ConvertToOptimizationRun(x)));
-                list.Add(alg);
-              } catch (Exception) { }
-              stream.Close();
-            }
-          }
-        }
-        Content.AlgorithmInstances = list;
+      var progress = new Progress();
+      progress.ProgressStateChanged += OkbDownloadProgressOnStateChanged;
+      Content.UpdateKnowledgeBaseAsync(progress);
+      MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().AddOperationProgressToView(progressPanel, progress);
+      progressPanel.Visible = true;
+      SetEnabledStateOfControls();
+    }
+
+    private void OkbDownloadProgressOnStateChanged(object sender, EventArgs eventArgs) {
+      var progress = (IProgress)sender;
+      okbDownloadInProgress = progress.ProgressState == ProgressState.Started;
+      SetEnabledStateOfControls();
+      if (!okbDownloadInProgress) {
+        progressPanel.Visible = false;
+        progress.ProgressStateChanged -= OkbDownloadProgressOnStateChanged;
       }
     }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Views/3.3/ExpertSystemView.resx

@@ -121 +121 @@
     <value>17, 17</value>
   </metadata>
+  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>140, 17</value>
@@ -128 +131 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
-        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsPAAALDwGS+QOlAAACeUlE
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACeUlE
         QVQ4T6WSWUiUURiG/4suurJIjUIwskQsEAMjqosQpUVNKbdCSRPKrQVDMddmXEedGdcpFXNGnUYdrSzF
         sEIoFInQcqHE1CwoKsXUUMnt6XfEye0munjgnO+c9+HjO0cA/osNi2tJLdA6SXN13MwoI12lJ06uiV8+
@@ -145 +148 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
-        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsPAAALDwGS+QOlAAABmElE
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAABmElE
         QVQ4T42QTUsCURSGJWgVtWkb9AfatKhN1L4I2rRoX9BvEIJ+QG4qFNKKCAMtEPqAUMiKamESEmpoWiKa
         YuZnmuOo83bufKUYgy+8c849957n3jk6ALJXOWAxBAulfrKwEAOW+L/9/y0locEzXs9SI3BB8UXKxVp1

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
-using System.Collections.Generic;
 using System.Drawing;
+using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using HeuristicLab.Analysis;
+using HeuristicLab.Common;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Common;
-using HeuristicLab.Common.Resources;
-using HeuristicLab.Data;
+using HeuristicLab.Persistence.Default.Xml;
 
 namespace HeuristicLab.OptimizationExpertSystem {
@@ -222 +226 @@
         }
       } finally { ProblemInstances.UpdateOfRunsInProgress = false; }
+    }
+
+    private static readonly HashSet<string> InterestingValueNames = new HashSet<string>() {
+      "QualityPerEvaluations", "Problem Name", "Problem Type", "Algorithm Name", "Algorithm Type", "Maximization"
+    };
+
+    public async void UpdateKnowledgeBaseAsync(IProgress progress) {
+      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));
+    }
+
+    private void DoUpdateKnowledgeBase(IProgress progress) {
+      var queryClient = Clients.OKB.Query.QueryClient.Instance;
+      var adminClient = Clients.OKB.Administration.AdministrationClient.Instance;
+      try {
+        progress.Status = "Refreshing query client...";
+        queryClient.Refresh();
+        var interestingValues = queryClient.ValueNames.Where(x => InterestingValueNames.Contains(x.Name)).ToList();
+
+        var problemTypeFilter = (Clients.OKB.Query.StringComparisonAvailableValuesFilter)queryClient.Filters.Single(x => x.Label == "Problem Data Type Name");
+        problemTypeFilter.Value = Problem.GetType().Name;
+
+        progress.Status = "Obtaining number of runs...";
+        var count = queryClient.GetNumberOfRuns(problemTypeFilter);
+        if (count == 0) return;
+
+        var runIds = queryClient.GetRunIds(problemTypeFilter).ToList();
+        adminClient.Refresh();
+        var i = 0;
+        var conversions = new List<Task>();
+        var runGroup = new Dictionary<Tuple<long, string>, List<IRun>>();
+        while (i < count) {
+          var nextIds = runIds.Skip(i).Take(500).ToList();
+          progress.Status = string.Format("Downloading runs {0} to {1} of {2}...", i, i + nextIds.Count, count);
+          var okbRuns = queryClient.GetRunsWithValues(nextIds, true, interestingValues);
+          conversions.Add(Task.Factory.StartNew(() => {
+            var hlRuns = okbRuns.AsParallel().Select(x => new { Id = x.Algorithm.Id, Name = x.Algorithm.Name, Run = queryClient.ConvertToOptimizationRun(x) })
+                                .GroupBy(x => Tuple.Create(x.Id, x.Name)).ToList();
+            lock (runGroup) {
+              foreach (var hr in hlRuns) {
+                List<IRun> runList;
+                if (!runGroup.TryGetValue(hr.Key, out runList)) {
+                  runList = new List<IRun>();
+                  runGroup[hr.Key] = runList;
+                }
+                runList.AddRange(hr.Select(x => x.Run));
+              }
+            }
+          }));
+          i += nextIds.Count;
+          progress.ProgressValue = 0.8 * (i / (double)count);
+        }
+        Task.WaitAll(conversions.ToArray());
+        var list = new ItemList<IAlgorithm>();
+        i = 0;
+        foreach (var rGroup in runGroup) {
+          progress.Status = string.Format("Downloading algorithm {0}...", rGroup.Key.Item2);
+          var data = Clients.OKB.Administration.AdministrationClient.GetAlgorithmData(rGroup.Key.Item1);
+          if (data != null) {
+            using (var stream = new MemoryStream(data)) {
+              try {
+                var alg = (IAlgorithm)XmlParser.Deserialize<IContent>(stream);
+                alg.Runs.AddRange(rGroup.Value);
+                list.Add(alg);
+              } catch (Exception) { }
+              stream.Close();
+            }
+          }
+          i++;
+          progress.ProgressValue = 0.8 + 0.2 * (i / (double)runGroup.Count);
+        }
+        AlgorithmInstances = list;
+      } finally { progress.Finish(); }
     }
 

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/HeuristicLab.OptimizationExpertSystem-3.3.csproj

@@ -78 +78 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Clients.OKB-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Clients.OKB-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Collections-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
@@ -99 +104 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Persistence-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
@@ -110 +120 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

branches/PerformanceComparison/PerformanceComparison.sln

@@ -2 +2 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Analysis-3.3", "HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj", "{887425B4-4348-49ED-A457-B7D2C26DDBF9}"
@@ -102 +102 @@
     HideSolutionNode = FALSE
   EndGlobalSection
+  GlobalSection(Performance) = preSolution
+    HasPerformanceSessions = true
+  EndGlobalSection
 EndGlobal