Changeset 5304 for branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views

Timestamp:

01/17/11 05:03:21 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views

Files:

• AndFilterView.Designer.cs (deleted)
• AndFilterView.cs (deleted)
• CombinedFilterView.cs (modified) (2 diffs)
• OrFilterView.Designer.cs (deleted)
• OrFilterView.cs (deleted)
• QueryView.Designer.cs (modified) (6 diffs)
• QueryView.cs (modified) (4 diffs)

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/CombinedFilterView.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
@@ -48 +49 @@
       base.OnContentChanged();
       RemoveFilters();
+      label.Text = string.Empty;
       if (Content != null) {
+        string nl = Environment.NewLine;
+        label.Text = Content.Operation == BooleanOperation.And ? "A" + nl + "N" + nl + "D" : "O" + nl + "R";
+
         foreach (Filter filter in Content.Filters)
           AddFilter(filter);

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/QueryView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(QueryView));
       this.refreshResultsButton = new System.Windows.Forms.Button();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-      this.showRunsButton = new System.Windows.Forms.Button();
-      this.runCollectionView = new HeuristicLab.Clients.OKB.RunCollectionView();
+      this.runCollectionView = new HeuristicLab.Optimization.Views.RunCollectionView();
       this.splitContainer = new System.Windows.Forms.SplitContainer();
       this.filtersGroupBox = new System.Windows.Forms.GroupBox();
+      this.filterPanel = new System.Windows.Forms.Panel();
       this.resultsGroupBox = new System.Windows.Forms.GroupBox();
-      this.nrOfRunsButton = new System.Windows.Forms.Button();
-      this.filterPanel = new System.Windows.Forms.Panel();
+      this.deserializeBlobsCheckBox = new System.Windows.Forms.CheckBox();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
       this.splitContainer.Panel1.SuspendLayout();
@@ -73 +73 @@
       this.refreshResultsButton.UseVisualStyleBackColor = true;
       this.refreshResultsButton.Click += new System.EventHandler(this.refreshResultsButton_Click);
-      // 
-      // showRunsButton
-      // 
-      this.showRunsButton.Location = new System.Drawing.Point(36, 19);
-      this.showRunsButton.Name = "showRunsButton";
-      this.showRunsButton.Size = new System.Drawing.Size(75, 24);
-      this.showRunsButton.TabIndex = 1;
-      this.showRunsButton.Text = "&Show Runs";
-      this.showRunsButton.UseVisualStyleBackColor = true;
-      this.showRunsButton.Click += new System.EventHandler(this.showRunsButton_Click);
       // 
       // runCollectionView
@@ -130 +120 @@
       this.filtersGroupBox.Text = "Filters";
       // 
-      // resultsGroupBox
-      // 
-      this.resultsGroupBox.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.resultsGroupBox.Controls.Add(this.nrOfRunsButton);
-      this.resultsGroupBox.Controls.Add(this.refreshResultsButton);
-      this.resultsGroupBox.Controls.Add(this.runCollectionView);
-      this.resultsGroupBox.Controls.Add(this.showRunsButton);
-      this.resultsGroupBox.Location = new System.Drawing.Point(0, 3);
-      this.resultsGroupBox.Name = "resultsGroupBox";
-      this.resultsGroupBox.Size = new System.Drawing.Size(734, 211);
-      this.resultsGroupBox.TabIndex = 0;
-      this.resultsGroupBox.TabStop = false;
-      this.resultsGroupBox.Text = "Results";
-      // 
-      // nrOfRunsButton
-      // 
-      this.nrOfRunsButton.Location = new System.Drawing.Point(117, 19);
-      this.nrOfRunsButton.Name = "nrOfRunsButton";
-      this.nrOfRunsButton.Size = new System.Drawing.Size(75, 23);
-      this.nrOfRunsButton.TabIndex = 3;
-      this.nrOfRunsButton.Text = "No. of Runs";
-      this.nrOfRunsButton.UseVisualStyleBackColor = true;
-      this.nrOfRunsButton.Click += new System.EventHandler(this.nrOfRunsButton_Click);
-      // 
       // filterPanel
       // 
@@ -165 +129 @@
       this.filterPanel.Size = new System.Drawing.Size(722, 189);
       this.filterPanel.TabIndex = 0;
+      // 
+      // resultsGroupBox
+      // 
+      this.resultsGroupBox.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.resultsGroupBox.Controls.Add(this.deserializeBlobsCheckBox);
+      this.resultsGroupBox.Controls.Add(this.refreshResultsButton);
+      this.resultsGroupBox.Controls.Add(this.runCollectionView);
+      this.resultsGroupBox.Location = new System.Drawing.Point(0, 3);
+      this.resultsGroupBox.Name = "resultsGroupBox";
+      this.resultsGroupBox.Size = new System.Drawing.Size(734, 211);
+      this.resultsGroupBox.TabIndex = 0;
+      this.resultsGroupBox.TabStop = false;
+      this.resultsGroupBox.Text = "Results";
+      // 
+      // deserializeBlobsCheckBox
+      // 
+      this.deserializeBlobsCheckBox.AutoSize = true;
+      this.deserializeBlobsCheckBox.Checked = true;
+      this.deserializeBlobsCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
+      this.deserializeBlobsCheckBox.Location = new System.Drawing.Point(62, 24);
+      this.deserializeBlobsCheckBox.Name = "deserializeBlobsCheckBox";
+      this.deserializeBlobsCheckBox.Size = new System.Drawing.Size(106, 17);
+      this.deserializeBlobsCheckBox.TabIndex = 3;
+      this.deserializeBlobsCheckBox.Text = "&Deserialize Blobs";
+      this.deserializeBlobsCheckBox.UseVisualStyleBackColor = true;
       // 
       // QueryView
@@ -179 +170 @@
       this.filtersGroupBox.ResumeLayout(false);
       this.resultsGroupBox.ResumeLayout(false);
+      this.resultsGroupBox.PerformLayout();
       this.ResumeLayout(false);
 
@@ -187 +179 @@
     private System.Windows.Forms.Button refreshResultsButton;
     private System.Windows.Forms.ToolTip toolTip;
-    private RunCollectionView runCollectionView;
-    private System.Windows.Forms.Button showRunsButton;
+    private HeuristicLab.Optimization.Views.RunCollectionView runCollectionView;
     private System.Windows.Forms.SplitContainer splitContainer;
     private System.Windows.Forms.GroupBox filtersGroupBox;
     private System.Windows.Forms.GroupBox resultsGroupBox;
-    private System.Windows.Forms.Button nrOfRunsButton;
     private System.Windows.Forms.Panel filterPanel;
+    private System.Windows.Forms.CheckBox deserializeBlobsCheckBox;
 
   }

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/QueryView.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
+using HeuristicLab.Optimization;
+using HeuristicLab.Persistence.Default.Xml;
 
 namespace HeuristicLab.Clients.OKB {
@@ -30 +36 @@
   [Content(typeof(OKBClient), false)]
   public sealed partial class QueryView : HeuristicLab.MainForm.WindowsForms.View {
-    private AndFilterView andFilterView;
+    private CombinedFilterView combinedFilterView;
 
     public QueryView() {
@@ -40 +46 @@
       this.Cursor = Cursors.AppStarting;
 
-      Func<AndFilter> func = () => {
-        return OKBClient.Instance.GetFilters().OfType<AndFilter>().FirstOrDefault();
+      Func<CombinedFilter> func = () => {
+        return OKBClient.Instance.GetFilters().OfType<CombinedFilter>().Where(x => x.Operation == BooleanOperation.And).FirstOrDefault();
       };
 
       func.BeginInvoke((IAsyncResult result) => {
-        AndFilter filter = func.EndInvoke(result);
-        if (InvokeRequired) Invoke(new Action<AndFilter>(FinishedLoadingAndFilter), filter);
-        else FinishedLoadingAndFilter(filter);
+        CombinedFilter filter = func.EndInvoke(result);
+        if (InvokeRequired) Invoke(new Action<CombinedFilter>(FinishedLoadingFilter), filter);
+        else FinishedLoadingFilter(filter);
       }, null);
     }
 
-    private void FinishedLoadingAndFilter(AndFilter filter) {
+    private void FinishedLoadingFilter(CombinedFilter filter) {
       if (filter != null) {
-        andFilterView = (AndFilterView)MainFormManager.CreateView(typeof(AndFilterView));
-        andFilterView.Content = (AndFilter)filter.Clone();
-        Control control = (Control)andFilterView;
+        combinedFilterView = (CombinedFilterView)MainFormManager.CreateView(typeof(CombinedFilterView));
+        combinedFilterView.Content = (CombinedFilter)filter.Clone();
+        Control control = (Control)combinedFilterView;
         control.Dock = DockStyle.Fill;
         filterPanel.Controls.Add(control);
@@ -65 +71 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      resultsGroupBox.Enabled = andFilterView != null;
-      showRunsButton.Enabled = (runCollectionView.Content != null) && (runCollectionView.Content.Count > 0);
+      resultsGroupBox.Enabled = combinedFilterView != null;
     }
 
     private void refreshResultsButton_Click(object sender, EventArgs e) {
-      DateTime start = DateTime.Now;
-      runCollectionView.Content = OKBClient.Instance.QueryRuns(andFilterView.Content);
-      MessageBox.Show((DateTime.Now - start).ToString());
+      bool deserialize = deserializeBlobsCheckBox.Checked;
+
+      System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch();
+      sw.Start();
+      long count = OKBClient.Instance.GetNumberOfQueryResults(combinedFilterView.Content);
+      sw.Stop();
+      MessageBox.Show(count.ToString() + " Runs");
+      if (MessageBox.Show(sw.Elapsed.ToString(), "GetNumberOfQueryResults", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
+
+      sw.Restart();
+      var ids = OKBClient.Instance.GetQueryResultIds(combinedFilterView.Content);
+      sw.Stop();
+      if (MessageBox.Show(sw.Elapsed.ToString(), "GetQueryResultIds", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
+
+      sw.Restart();
+      List<QueryResult> results = new List<QueryResult>();
+      while (ids.Count() > 0) {
+        results.AddRange(OKBClient.Instance.GetQueryResults(ids.Take(50)));
+        ids = ids.Skip(50);
+      }
+      sw.Stop();
+      if (MessageBox.Show(sw.Elapsed.ToString(), "GetQueryResults", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
+
+      sw.Restart();
+      IEnumerable<QueryResult> res = results.AsEnumerable();
+      RunCollection runs = new RunCollection();
+      runCollectionView.Content = runs;
+      while (res.Count() > 0) {
+        runs.AddRange(res.Take(50).Select(x => ConvertToOptimizationRun(x, deserialize)));
+        res = res.Skip(50);
+      }
+      sw.Stop();
+      MessageBox.Show(sw.Elapsed.ToString(), "Conversion", MessageBoxButtons.OK);
+
       SetEnabledStateOfControls();
     }
 
-    private void showRunsButton_Click(object sender, EventArgs e) {
-      DateTime start = DateTime.Now;
-      MainFormManager.MainForm.ShowContent(OKBClient.Instance.ConvertOKBRunsToOptimizationRuns(runCollectionView.Content));
-      MessageBox.Show((DateTime.Now - start).ToString());
+    private Optimization.IRun ConvertToOptimizationRun(QueryResult queryResult, bool deserialize) {
+      Optimization.Run run = new Optimization.Run();
+      foreach (QueryValue value in queryResult.AlgorithmParameters)
+        run.Parameters.Add(value.Name, ConvertToItem(value, deserialize));
+      foreach (QueryValue value in queryResult.ProblemParameters)
+        run.Parameters.Add(value.Name, ConvertToItem(value, deserialize));
+      foreach (QueryValue value in queryResult.Results)
+        run.Results.Add(value.Name, ConvertToItem(value, deserialize));
+      return run;
     }
 
-    private void nrOfRunsButton_Click(object sender, EventArgs e) {
-      long runs = OKBClient.Instance.QueryNumberOfRuns(andFilterView.Content);
-      MessageBox.Show(runs.ToString());
+    private IItem ConvertToItem(QueryValue value, bool deserialize) {
+      if (value is QueryBlobValue) {
+        if (deserialize) {
+          IItem item = null;
+          using (MemoryStream stream = new MemoryStream(((QueryBlobValue)value).Value)) {
+            try {
+              item = XmlParser.Deserialize<IItem>(stream);
+            }
+            catch (Exception) { }
+            stream.Close();
+          }
+          return item != null ? item : new StringValue(((QueryBlobValue)value).DataTypeName);
+        } else {
+          return new StringValue(((QueryBlobValue)value).DataTypeName);
+        }
+      } else if (value is QueryBoolValue) {
+        return new BoolValue(((QueryBoolValue)value).Value);
+      } else if (value is QueryFloatValue) {
+        return new DoubleValue(((QueryFloatValue)value).Value);
+      } else if (value is QueryIntValue) {
+        return new IntValue((int)((QueryIntValue)value).Value);
+      } else if (value is QueryStringValue) {
+        return new StringValue(((QueryStringValue)value).Value);
+      }
+      return null;
     }
   }