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

Timestamp:

03/31/11 03:24:02 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

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

Files:

• . (modified) (1 prop)
• Query/Views/CombinedFilterView.Designer.cs (modified) (1 diff)
• Query/Views/CombinedFilterView.cs (modified) (1 diff)
• Query/Views/EqualityComparisonBoolFilterView.Designer.cs (modified) (1 diff)
• Query/Views/EqualityComparisonBoolFilterView.cs (modified) (1 diff)
• Query/Views/EqualityComparisonFilterView.Designer.cs (modified) (1 diff)
• Query/Views/EqualityComparisonFilterView.cs (modified) (1 diff)
• Query/Views/FilterView.Designer.cs (modified) (1 diff)
• Query/Views/FilterView.cs (modified) (1 diff)
• Query/Views/OrdinalComparisonDateTimeFilterView.Designer.cs (modified) (1 diff)
• Query/Views/OrdinalComparisonDateTimeFilterView.cs (modified) (1 diff)
• Query/Views/OrdinalComparisonDoubleFilterView.Designer.cs (modified) (1 diff)
• Query/Views/OrdinalComparisonDoubleFilterView.cs (modified) (1 diff)
• Query/Views/OrdinalComparisonFilterView.Designer.cs (modified) (1 diff)
• Query/Views/OrdinalComparisonFilterView.cs (modified) (1 diff)
• Query/Views/OrdinalComparisonFloatFilterView.Designer.cs (modified) (1 diff)
• Query/Views/OrdinalComparisonFloatFilterView.cs (modified) (1 diff)
• Query/Views/OrdinalComparisonIntFilterView.Designer.cs (modified) (1 diff)
• Query/Views/OrdinalComparisonIntFilterView.cs (modified) (1 diff)
• Query/Views/OrdinalComparisonLongFilterView.Designer.cs (modified) (1 diff)
• Query/Views/OrdinalComparisonLongFilterView.cs (modified) (1 diff)
• Query/Views/QueryView.Designer.cs (modified) (6 diffs)
• Query/Views/QueryView.cs (modified) (5 diffs)
• Query/Views/StringComparisonAvailableValuesFilterView.Designer.cs (modified) (1 diff)
• Query/Views/StringComparisonAvailableValuesFilterView.cs (modified) (1 diff)
• Query/Views/StringComparisonFilterView.Designer.cs (modified) (1 diff)
• Query/Views/StringComparisonFilterView.cs (modified) (1 diff)

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

@@ -3 +3 @@
 *.user
 HeuristicLabClientsOKBPlugin.cs
+*.vs10x

@@ -3 +3 @@
 *.user
 HeuristicLabClientsOKBPlugin.cs
+*.vs10x

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -55 +55 @@
       this.resultsGroupBox = new System.Windows.Forms.GroupBox();
       this.includeBinaryValuesCheckBox = new System.Windows.Forms.CheckBox();
-      this.deserializeBlobsCheckBox = new System.Windows.Forms.CheckBox();
       this.resultsInfoPanel = new System.Windows.Forms.Panel();
       this.abortButton = new System.Windows.Forms.Button();
@@ -157 +156 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.resultsGroupBox.Controls.Add(this.includeBinaryValuesCheckBox);
-      this.resultsGroupBox.Controls.Add(this.deserializeBlobsCheckBox);
       this.resultsGroupBox.Controls.Add(this.refreshResultsButton);
       this.resultsGroupBox.Controls.Add(this.runCollectionView);
@@ -172 +170 @@
       this.includeBinaryValuesCheckBox.Checked = true;
       this.includeBinaryValuesCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.includeBinaryValuesCheckBox.Location = new System.Drawing.Point(74, 24);
+      this.includeBinaryValuesCheckBox.Location = new System.Drawing.Point(53, 24);
       this.includeBinaryValuesCheckBox.Name = "includeBinaryValuesCheckBox";
       this.includeBinaryValuesCheckBox.Size = new System.Drawing.Size(128, 17);
@@ -178 +176 @@
       this.includeBinaryValuesCheckBox.Text = "&Include Binary Values";
       this.includeBinaryValuesCheckBox.UseVisualStyleBackColor = true;
-      // 
-      // deserializeBlobsCheckBox
-      // 
-      this.deserializeBlobsCheckBox.AutoSize = true;
-      this.deserializeBlobsCheckBox.Checked = true;
-      this.deserializeBlobsCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.deserializeBlobsCheckBox.Location = new System.Drawing.Point(225, 24);
-      this.deserializeBlobsCheckBox.Name = "deserializeBlobsCheckBox";
-      this.deserializeBlobsCheckBox.Size = new System.Drawing.Size(144, 17);
-      this.deserializeBlobsCheckBox.TabIndex = 2;
-      this.deserializeBlobsCheckBox.Text = "&Deserialize Binary Values";
-      this.deserializeBlobsCheckBox.UseVisualStyleBackColor = true;
       // 
       // resultsInfoPanel
@@ -291 +277 @@
     private System.Windows.Forms.GroupBox resultsGroupBox;
     private System.Windows.Forms.Panel filterPanel;
-    private System.Windows.Forms.CheckBox deserializeBlobsCheckBox;
     private System.Windows.Forms.Panel resultsInfoPanel;
     private System.Windows.Forms.ProgressBar resultsProgressBar;

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -75 +75 @@
     private void LoadResultsAsync(int batchSize) {
       bool includeBinaryValues = includeBinaryValuesCheckBox.Checked;
-      bool deserialize = deserializeBlobsCheckBox.Checked;
 
       Cursor = Cursors.AppStarting;
@@ -100 +99 @@
         while (ids.Count() > 0) {
           cancellationToken.ThrowIfCancellationRequested();
-          runs.AddRange(QueryClient.Instance.GetRuns(ids.Take(batchSize), includeBinaryValues).Select(x => ConvertToOptimizationRun(x, deserialize)));
+          runs.AddRange(QueryClient.Instance.GetRuns(ids.Take(batchSize), includeBinaryValues).Select(x => ConvertToOptimizationRun(x)));
           ids = ids.Skip(batchSize);
           Invoke(new Action(() => {
@@ -182 +181 @@
     }
 
-    private Optimization.IRun ConvertToOptimizationRun(Run run, bool deserialize) {
+    private Optimization.IRun ConvertToOptimizationRun(Run run) {
       Optimization.Run optRun = new Optimization.Run();
       foreach (Value value in run.ParameterValues)
-        optRun.Parameters.Add(value.Name, ConvertToItem(value, deserialize));
+        optRun.Parameters.Add(value.Name, ConvertToItem(value));
       foreach (Value value in run.ResultValues)
-        optRun.Results.Add(value.Name, ConvertToItem(value, deserialize));
+        optRun.Results.Add(value.Name, ConvertToItem(value));
       return optRun;
     }
 
-    private IItem ConvertToItem(Value value, bool deserialize) {
+    private IItem ConvertToItem(Value value) {
       if (value is BinaryValue) {
-        if (deserialize) {
-          IItem item = null;
-          using (MemoryStream stream = new MemoryStream(((BinaryValue)value).Value)) {
+        IItem item = null;
+        BinaryValue binaryValue = (BinaryValue)value;
+        if (binaryValue.Value != null) {
+          using (MemoryStream stream = new MemoryStream(binaryValue.Value)) {
             try {
               item = XmlParser.Deserialize<IItem>(stream);
@@ -202 +202 @@
             stream.Close();
           }
-          return item != null ? item : new Data.StringValue(value.DataType.Name);
-        } else {
-          return new Data.StringValue(value.DataType.Name);
         }
+        return item != null ? item : new Data.StringValue(value.DataType.Name);
       } else if (value is BoolValue) {
         return new Data.BoolValue(((BoolValue)value).Value);

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

@@ -3 +3 @@
 *.user
 HeuristicLabClientsOKBPlugin.cs
+*.vs10x