Changeset 3694

Timestamp:

05/07/10 04:45:45 (14 years ago)

Author:

swagner

Message:

Implemented reviewers' comments (#893)

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/Clipboard.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemArrayView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemListView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/VariableValueView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/VariableView.cs (modified) (1 diff)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/BatchRunView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Algorithm.cs (modified) (3 diffs)
• HeuristicLab.Parameters.Views/3.3/ValueLookupParameterView.cs (modified) (1 diff)
• HeuristicLab.Parameters.Views/3.3/ValueParameterView.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionSolutionView.Designer.cs (modified) (10 diffs)
• HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionSolutionView.resx (deleted)

trunk/sources/HeuristicLab.Core.Views/3.3/Clipboard.cs

@@ -249 +249 @@
       T item = e.Data.GetData("Value") as T;
       if (!ReadOnly && (type != null) && (item != null)) {
-        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
+        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
         else if (((e.KeyState & 4) == 4) && !itemListViewItemTable.ContainsKey(item)) e.Effect = DragDropEffects.Move;  // SHIFT key
         else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;

trunk/sources/HeuristicLab.Core.Views/3.3/ItemArrayView.cs

@@ -259 +259 @@
         ListViewItem listViewItem = itemsListView.GetItemAt(p.X, p.Y);
         if (listViewItem != null) {
-          if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
+          if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
           else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
           else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;

trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -212 +212 @@
       Type type = e.Data.GetData("Type") as Type;
       if (!Content.IsReadOnly && !ReadOnly && (type != null) && (typeof(T).IsAssignableFrom(type))) {
-        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
+        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
         else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
         else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;

trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.cs

@@ -247 +247 @@
       Type type = e.Data.GetData("Type") as Type;
       if (!Content.IsReadOnly && !ReadOnly && (type != null) && (typeof(T).IsAssignableFrom(type))) {
-        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
+        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
         else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
         else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;

trunk/sources/HeuristicLab.Core.Views/3.3/VariableValueView.cs

@@ -104 +104 @@
       Type type = e.Data.GetData("Type") as Type;
       if (!ReadOnly && (type != null) && (typeof(IItem).IsAssignableFrom(type))) {
-        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
+        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
         else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
         else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;

trunk/sources/HeuristicLab.Core.Views/3.3/VariableView.cs

@@ -132 +132 @@
       Type type = e.Data.GetData("Type") as Type;
       if (!ReadOnly && (type != null) && (typeof(IItem).IsAssignableFrom(type))) {
-        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
+        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
         else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
         else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphView.cs

@@ -225 +225 @@
       Type type = e.Data.GetData("Type") as Type;
       if (!ReadOnly && (type != null) && (typeof(IOperator).IsAssignableFrom(type))) {
-        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key        
+        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
         else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
         else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;

trunk/sources/HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs

@@ -230 +230 @@
       Type type = e.Data.GetData("Type") as Type;
       if ((type != null) && (Content.ProblemType.IsAssignableFrom(type))) {
-        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
+        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
         else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
         else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;

trunk/sources/HeuristicLab.Optimization.Views/3.3/BatchRunView.cs

@@ -215 +215 @@
       Type type = e.Data.GetData("Type") as Type;
       if ((type != null) && (typeof(IAlgorithm).IsAssignableFrom(type))) {
-        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
+        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
         else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
         else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs

@@ -232 +232 @@
       Type type = e.Data.GetData("Type") as Type;
       if (!Content.IsReadOnly && !ReadOnly && (type != null) && (typeof(IRun).IsAssignableFrom(type))) {
-        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
+        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
         else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
         else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;

trunk/sources/HeuristicLab.Optimization/3.3/Algorithm.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -199 +200 @@
     }
     public virtual void CollectResultValues(IDictionary<string, IItem> values) {
+      values.Add("Execution Time", new TimeSpanValue(ExecutionTime));
       foreach (IResult result in Results)
         values.Add(result.Name, result.Value);
@@ -242 +244 @@
       ExecutionState = ExecutionState.Stopped;
       runsCounter++;
-      runs.Add(new Run(string.Format("{0} Run {1} ({2})", Name, runsCounter, ExecutionTime), this));
+      runs.Add(new Run(string.Format("{0} Run {1}", Name, runsCounter), this));
       EventHandler handler = Stopped;
       if (handler != null) handler(this, EventArgs.Empty);

trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueLookupParameterView.cs

@@ -144 +144 @@
       Type type = e.Data.GetData("Type") as Type;
       if (!ReadOnly && (type != null) && (Content.DataType.IsAssignableFrom(type))) {
-        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
+        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
         else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
         else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;

trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueParameterView.cs

@@ -132 +132 @@
       Type type = e.Data.GetData("Type") as Type;
       if (!ReadOnly && (type != null) && (Content.DataType.IsAssignableFrom(type))) {
-        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key
+        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
         else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
         else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;

trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj

@@ -146 +146 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="SingleObjectiveTestFunctionSolutionView.resx">
-      <DependentUpon>SingleObjectiveTestFunctionSolutionView.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionSolutionView.Designer.cs

@@ -32 +32 @@
       this.textualTabPage = new System.Windows.Forms.TabPage();
       this.graphicalTabPage = new System.Windows.Forms.TabPage();
+      this.pictureBox = new System.Windows.Forms.PictureBox();
       this.label1 = new System.Windows.Forms.Label();
-      this.pictureBox = new System.Windows.Forms.PictureBox();
       this.splitContainer1.Panel1.SuspendLayout();
       this.splitContainer1.Panel2.SuspendLayout();
@@ -47 +47 @@
       // qualityView
       // 
+      this.qualityView.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.qualityView.Caption = null;
       this.qualityView.Content = null;
-      this.qualityView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.qualityView.Location = new System.Drawing.Point(3, 16);
+      this.qualityView.Location = new System.Drawing.Point(6, 19);
       this.qualityView.Name = "qualityView";
       this.qualityView.ReadOnly = false;
-      this.qualityView.Size = new System.Drawing.Size(485, 31);
-      this.qualityView.TabIndex = 1;
+      this.qualityView.Size = new System.Drawing.Size(479, 32);
+      this.qualityView.TabIndex = 0;
       this.qualityView.ViewType = null;
       // 
@@ -62 +64 @@
       this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
       this.splitContainer1.IsSplitterFixed = true;
-      this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+      this.splitContainer1.Location = new System.Drawing.Point(3, 3);
       this.splitContainer1.Name = "splitContainer1";
       this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
@@ -76 +78 @@
       this.splitContainer1.Panel2MinSize = 30;
       this.splitContainer1.Size = new System.Drawing.Size(491, 304);
-      this.splitContainer1.TabIndex = 7;
+      this.splitContainer1.SplitterDistance = 60;
+      this.splitContainer1.TabIndex = 0;
       // 
       // groupBox3
       // 
+      this.groupBox3.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.groupBox3.Controls.Add(this.qualityView);
-      this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill;
       this.groupBox3.Location = new System.Drawing.Point(0, 0);
       this.groupBox3.Name = "groupBox3";
-      this.groupBox3.Size = new System.Drawing.Size(491, 50);
-      this.groupBox3.TabIndex = 6;
+      this.groupBox3.Size = new System.Drawing.Size(491, 57);
+      this.groupBox3.TabIndex = 0;
       this.groupBox3.TabStop = false;
       this.groupBox3.Text = "Quality";
@@ -91 +96 @@
       // groupBox4
       // 
+      this.groupBox4.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.groupBox4.Controls.Add(this.realVectorView);
-      this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.groupBox4.Location = new System.Drawing.Point(0, 0);
+      this.groupBox4.Location = new System.Drawing.Point(0, 3);
       this.groupBox4.Name = "groupBox4";
-      this.groupBox4.Size = new System.Drawing.Size(491, 250);
-      this.groupBox4.TabIndex = 6;
+      this.groupBox4.Size = new System.Drawing.Size(491, 237);
+      this.groupBox4.TabIndex = 0;
       this.groupBox4.TabStop = false;
       this.groupBox4.Text = "Real vector";
@@ -102 +109 @@
       // realVectorView
       // 
+      this.realVectorView.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.realVectorView.Caption = null;
       this.realVectorView.Content = null;
-      this.realVectorView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.realVectorView.Location = new System.Drawing.Point(3, 16);
+      this.realVectorView.Location = new System.Drawing.Point(6, 19);
       this.realVectorView.Name = "realVectorView";
       this.realVectorView.ReadOnly = false;
-      this.realVectorView.Size = new System.Drawing.Size(485, 231);
-      this.realVectorView.TabIndex = 1;
+      this.realVectorView.Size = new System.Drawing.Size(479, 212);
+      this.realVectorView.TabIndex = 0;
       this.realVectorView.ViewType = null;
       // 
@@ -121 +130 @@
       this.tabControl1.SelectedIndex = 0;
       this.tabControl1.Size = new System.Drawing.Size(505, 336);
-      this.tabControl1.TabIndex = 2;
+      this.tabControl1.TabIndex = 0;
       // 
       // textualTabPage
@@ -146 +155 @@
       this.graphicalTabPage.UseVisualStyleBackColor = true;
       // 
+      // pictureBox
+      // 
+      this.pictureBox.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.pictureBox.BackColor = System.Drawing.Color.White;
+      this.pictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+      this.pictureBox.Location = new System.Drawing.Point(6, 6);
+      this.pictureBox.Name = "pictureBox";
+      this.pictureBox.Size = new System.Drawing.Size(485, 298);
+      this.pictureBox.TabIndex = 1;
+      this.pictureBox.TabStop = false;
+      // 
       // label1
       // 
@@ -155 +177 @@
       this.label1.TabIndex = 0;
       this.label1.Text = "The graphical view is only available for 2 dimensions";
-      // 
-      // pictureBox
-      // 
-      this.pictureBox.BackColor = System.Drawing.Color.White;
-      this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.pictureBox.Location = new System.Drawing.Point(0, 0);
-      this.pictureBox.Name = "pictureBox";
-      this.pictureBox.Size = new System.Drawing.Size(491, 304);
-      this.pictureBox.TabIndex = 1;
-      this.pictureBox.TabStop = false;
       // 
       // SingleObjectiveTestFunctionSolutionView
@@ -190 +202 @@
     private System.Windows.Forms.SplitContainer splitContainer1;
     private System.Windows.Forms.GroupBox groupBox4;
-    protected HeuristicLab.MainForm.WindowsForms.ViewHost qualityView;
+    private HeuristicLab.MainForm.WindowsForms.ViewHost qualityView;
     private System.Windows.Forms.GroupBox groupBox3;
-    protected HeuristicLab.MainForm.WindowsForms.ViewHost realVectorView;
+    private HeuristicLab.MainForm.WindowsForms.ViewHost realVectorView;
     private System.Windows.Forms.TabControl tabControl1;
     private System.Windows.Forms.TabPage textualTabPage;