Changeset 14538 for branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4

Timestamp:

01/03/17 23:04:56 (7 years ago)

Author:

jzenisek

Message:

#2719 enhanced the optimizer's functionality

Location:

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4

Files:

• DatastreamAnalysisOptimizerView.Designer.cs (modified) (11 diffs)
• DatastreamAnalysisOptimizerView.cs (modified) (4 diffs)
• HeuristicLab.DatastreamAnalysis.Views.csproj (modified) (1 diff)
• Plugin.cs (modified) (1 diff)
• Properties/AssemblyInfo.cs (modified) (1 diff)

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/DatastreamAnalysisOptimizerView.Designer.cs

@@ -43 +43 @@
       // startButton
       // 
-      this.startButton.Location = new System.Drawing.Point(6, 636);
+      this.startButton.Location = new System.Drawing.Point(9, 978);
+      this.startButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+      this.startButton.Size = new System.Drawing.Size(36, 37);
       this.toolTip.SetToolTip(this.startButton, "Start/Resume Optimizer");
       // 
       // executionTimeTextBox
       // 
-      this.executionTimeTextBox.Location = new System.Drawing.Point(936, 640);
+      this.executionTimeTextBox.Location = new System.Drawing.Point(1404, 985);
+      this.executionTimeTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+      this.executionTimeTextBox.Size = new System.Drawing.Size(204, 26);
       // 
       // executionTimeLabel
       // 
-      this.executionTimeLabel.Location = new System.Drawing.Point(847, 643);
+      this.executionTimeLabel.Location = new System.Drawing.Point(1270, 989);
+      this.executionTimeLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       // 
       // pauseButton
       // 
-      this.pauseButton.Location = new System.Drawing.Point(36, 636);
+      this.pauseButton.Location = new System.Drawing.Point(54, 978);
+      this.pauseButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+      this.pauseButton.Size = new System.Drawing.Size(36, 37);
       this.toolTip.SetToolTip(this.pauseButton, "Pause Optimizer");
       // 
       // stopButton
       // 
-      this.stopButton.Location = new System.Drawing.Point(66, 636);
+      this.stopButton.Location = new System.Drawing.Point(99, 978);
+      this.stopButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+      this.stopButton.Size = new System.Drawing.Size(36, 37);
       this.toolTip.SetToolTip(this.stopButton, "Stop Optimizer");
       // 
       // resetButton
       // 
-      this.resetButton.Location = new System.Drawing.Point(96, 636);
+      this.resetButton.Location = new System.Drawing.Point(144, 978);
+      this.resetButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+      this.resetButton.Size = new System.Drawing.Size(36, 37);
       this.toolTip.SetToolTip(this.resetButton, "Reset Optimizer");
       // 
@@ -73 +84 @@
       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
-      this.nameTextBox.Size = new System.Drawing.Size(1008, 20);
+      this.nameTextBox.Location = new System.Drawing.Point(87, 0);
+      this.nameTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+      this.nameTextBox.Size = new System.Drawing.Size(1510, 26);
+      // 
+      // nameLabel
+      // 
+      this.nameLabel.Location = new System.Drawing.Point(4, 5);
+      this.nameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       // 
       // infoLabel
       // 
-      this.infoLabel.Location = new System.Drawing.Point(995, 3);
+      this.infoLabel.Location = new System.Drawing.Point(1492, 5);
+      this.infoLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+      this.infoLabel.Size = new System.Drawing.Size(24, 25);
       // 
       // tabControl
       // 
       this.tabControl.AllowDrop = true;
-      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left)
+      this.tabControl.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.tabControl.Controls.Add(this.ensemblesTab);
@@ -89 +109 @@
       this.tabControl.Controls.Add(this.resultsTab);
       this.tabControl.Controls.Add(this.runsTab);
-      this.tabControl.Location = new System.Drawing.Point(3, 26);
+      this.tabControl.Location = new System.Drawing.Point(4, 40);
+      this.tabControl.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
       this.tabControl.Name = "tabControl";
       this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(1070, 604);
+      this.tabControl.Size = new System.Drawing.Size(1605, 929);
       this.tabControl.TabIndex = 0;
       // 
@@ -99 +120 @@
       this.ensemblesTab.AllowDrop = true;
       this.ensemblesTab.Controls.Add(this.ensemblesViewHost);
-      this.ensemblesTab.Location = new System.Drawing.Point(4, 22);
+      this.ensemblesTab.Location = new System.Drawing.Point(4, 29);
+      this.ensemblesTab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
       this.ensemblesTab.Name = "ensemblesTab";
-      this.ensemblesTab.Padding = new System.Windows.Forms.Padding(3);
-      this.ensemblesTab.Size = new System.Drawing.Size(527, 259);
+      this.ensemblesTab.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+      this.ensemblesTab.Size = new System.Drawing.Size(1597, 896);
       this.ensemblesTab.TabIndex = 0;
       this.ensemblesTab.Text = "Ensembles";
@@ -118 +140 @@
       this.ensemblesViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
       this.ensemblesViewHost.Enabled = false;
-      this.ensemblesViewHost.Location = new System.Drawing.Point(3, 3);
+      this.ensemblesViewHost.Location = new System.Drawing.Point(4, 5);
+      this.ensemblesViewHost.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
       this.ensemblesViewHost.Name = "ensemblesViewHost";
       this.ensemblesViewHost.ReadOnly = false;
-      this.ensemblesViewHost.Size = new System.Drawing.Size(521, 253);
+      this.ensemblesViewHost.Size = new System.Drawing.Size(1589, 886);
       this.ensemblesViewHost.TabIndex = 0;
       this.ensemblesViewHost.ViewsLabelVisible = true;
@@ -130 +153 @@
       this.datastreamTab.AllowDrop = true;
       this.datastreamTab.Controls.Add(this.datastreamViewHost);
-      this.datastreamTab.Location = new System.Drawing.Point(4, 22);
+      this.datastreamTab.Location = new System.Drawing.Point(4, 29);
+      this.datastreamTab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
       this.datastreamTab.Name = "datastreamTab";
-      this.datastreamTab.Padding = new System.Windows.Forms.Padding(3);
-      this.datastreamTab.Size = new System.Drawing.Size(950, 554);
+      this.datastreamTab.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+      this.datastreamTab.Size = new System.Drawing.Size(1597, 896);
       this.datastreamTab.TabIndex = 1;
       this.datastreamTab.Text = "Datastream";
@@ -147 +171 @@
       this.datastreamViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
       this.datastreamViewHost.Enabled = false;
-      this.datastreamViewHost.Location = new System.Drawing.Point(3, 3);
+      this.datastreamViewHost.Location = new System.Drawing.Point(4, 5);
+      this.datastreamViewHost.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
       this.datastreamViewHost.Name = "datastreamViewHost";
       this.datastreamViewHost.ReadOnly = false;
-      this.datastreamViewHost.Size = new System.Drawing.Size(944, 548);
+      this.datastreamViewHost.Size = new System.Drawing.Size(1589, 886);
       this.datastreamViewHost.TabIndex = 0;
       this.datastreamViewHost.ViewsLabelVisible = true;
@@ -158 +183 @@
       // 
       this.resultsTab.Controls.Add(this.resultsView);
-      this.resultsTab.Location = new System.Drawing.Point(4, 22);
+      this.resultsTab.Location = new System.Drawing.Point(4, 29);
+      this.resultsTab.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+      this.resultsTab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
       this.resultsTab.Name = "resultsTab";
-      this.resultsTab.Size = new System.Drawing.Size(950, 554);
+      this.resultsTab.Size = new System.Drawing.Size(1597, 896);
       this.resultsTab.TabIndex = 3;
       this.resultsTab.Text = "Results";
       this.resultsTab.UseVisualStyleBackColor = true;
       // 
-      // resultsViewHost
+      // resultsView
       // 
       this.resultsView.Caption = "View";
@@ -171 +198 @@
       this.resultsView.Dock = System.Windows.Forms.DockStyle.Fill;
       this.resultsView.Enabled = false;
-      this.resultsView.Location = new System.Drawing.Point(0, 0);
-      this.resultsView.Name = "resultsViewHost";
-      this.resultsView.ReadOnly = false;
-      this.resultsView.Size = new System.Drawing.Size(950, 554);
+      this.resultsView.Location = new System.Drawing.Point(4, 5);
+      this.resultsView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+      this.resultsView.Name = "resultsView";
+      this.resultsView.ReadOnly = true;
+      this.resultsView.ShowDetails = true;
+      this.resultsView.Size = new System.Drawing.Size(1597, 896);
       this.resultsView.TabIndex = 0;
-      //
+      // 
       // runsTab
-      //
-      //this.runsTabPage.Controls.Add(this.storeAlgorithmInEachRunCheckBox);
+      // 
       this.runsTab.Controls.Add(this.runsView);
-      this.runsTab.Location = new System.Drawing.Point(4, 22);
-      this.runsTab.Name = "runsTabPage";
-      this.runsTab.Padding = new System.Windows.Forms.Padding(3);
-      this.runsTab.Size = new System.Drawing.Size(950, 554);
+      this.runsTab.Location = new System.Drawing.Point(4, 29);
+      this.runsTab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+      this.runsTab.Name = "runsTab";
+      this.runsTab.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+      this.runsTab.Size = new System.Drawing.Size(1597, 896);
       this.runsTab.TabIndex = 3;
       this.runsTab.Text = "Runs";
       this.runsTab.UseVisualStyleBackColor = true;
-      //
+      // 
       // runsView
-      //
-      this.runsView.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.runsView.Caption = "RunCollection View";
       this.runsView.Content = null;
-      this.runsView.Location = new System.Drawing.Point(0, 0);
+      this.runsView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.runsView.Enabled = false;
+      this.runsView.Location = new System.Drawing.Point(4, 5);
+      this.runsView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
       this.runsView.Name = "runsView";
       this.runsView.ReadOnly = false;
-      this.runsView.Size = new System.Drawing.Size(950, 554);
+      this.runsView.Size = new System.Drawing.Size(1589, 886);
       this.runsView.TabIndex = 0;
       // 
@@ -205 +234 @@
       // 
       this.AllowDrop = true;
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.Controls.Add(this.tabControl);
+      this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
       this.Name = "DatastreamAnalysisOptimizerView";
-      this.Size = new System.Drawing.Size(1076, 663);
+      this.Size = new System.Drawing.Size(1614, 1020);
       this.Controls.SetChildIndex(this.tabControl, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);
@@ -225 +255 @@
       this.datastreamTab.ResumeLayout(false);
       this.resultsTab.ResumeLayout(false);
+      this.runsTab.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/DatastreamAnalysisOptimizerView.cs

@@ -75 +75 @@
         runsView.Content = null;
       } else {
+        ensemblesViewHost.ViewType = null;
         ensemblesViewHost.Content = Content.Ensembles;
+        datastreamViewHost.ViewType = null;
         datastreamViewHost.Content = Content.Datastream;
         resultsView.Content = Content.Results.AsReadOnly();
@@ -84 +86 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
+
       resultsView.Enabled = Content != null;
       runsView.Enabled = Content != null;
@@ -118 +121 @@
     }
 
-    #region
+    #region content events
     protected override void Content_Prepared(object sender, EventArgs e) {
       if (InvokeRequired)
@@ -132 +135 @@
         Invoke(new EventHandler(Content_EnsemblesChanged), sender, e);
       else {
+        ensemblesViewHost.ViewType = null;
         ensemblesViewHost.Content = Content.Ensembles;
       }

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/HeuristicLab.DatastreamAnalysis.Views.csproj

@@ -121 +121 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="DatastreamAnalysisOptimizerView.resx">
+      <DependentUpon>DatastreamAnalysisOptimizerView.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="RegressionEnsembleModelView.resx">
       <DependentUpon>RegressionEnsembleModelView.cs</DependentUpon>

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/Plugin.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.DatastreamAnalysis.Views {
-  [Plugin("HeuristicLab.DatastreamAnalysis.Views", "3.4.14.14491")]
+  [Plugin("HeuristicLab.DatastreamAnalysis.Views", "3.4.14.14536")]
   [PluginFile("HeuristicLab.DatastreamAnalysis.Views-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/Properties/AssemblyInfo.cs

@@ -54 +54 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.4.0.0")]
-[assembly: AssemblyFileVersion("3.4.14.14491")]
+[assembly: AssemblyFileVersion("3.4.14.14536")]