Changeset 15973 for branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views
- Timestamp:
- 06/28/18 11:13:37 (6 years ago)
- Location:
- branches/2522_RefactorPluginInfrastructure
- Files:
-
- 2 deleted
- 27 edited
- 10 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/2522_RefactorPluginInfrastructure
- Property svn:ignore
-
old new 24 24 protoc.exe 25 25 obj 26 .vs
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views
- Property svn:mergeinfo changed
-
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CovarianceProdView.Designer.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CovarianceProdView.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CovarianceSumView.Designer.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CovarianceSumView.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CrossValidationView.Designer.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 79 79 this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); 80 80 this.splitContainer = new System.Windows.Forms.SplitContainer(); 81 this.shuffleSamplesCheckBox = new System.Windows.Forms.CheckBox(); 81 82 ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); 82 83 ((System.ComponentModel.ISupportInitialize)(this.foldsNumericUpDown)).BeginInit(); … … 171 172 // foldsNumericUpDown 172 173 // 173 this.foldsNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 174 175 this.foldsNumericUpDown.Location = new System.Drawing.Point(55, 2 6);174 this.foldsNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 175 | System.Windows.Forms.AnchorStyles.Right))); 176 this.foldsNumericUpDown.Location = new System.Drawing.Point(55, 27); 176 177 this.foldsNumericUpDown.Maximum = new decimal(new int[] { 177 178 50, … … 207 208 // workersNumericUpDown 208 209 // 209 this.workersNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 210 211 this.workersNumericUpDown.Location = new System.Drawing.Point(55, 0);210 this.workersNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 211 | System.Windows.Forms.AnchorStyles.Right))); 212 this.workersNumericUpDown.Location = new System.Drawing.Point(55, 1); 212 213 this.workersNumericUpDown.Maximum = new decimal(new int[] { 213 214 50, … … 261 262 // samplesEndStringConvertibleValueView 262 263 // 263 this.samplesEndStringConvertibleValueView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 264 264 this.samplesEndStringConvertibleValueView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 265 | System.Windows.Forms.AnchorStyles.Right))); 265 266 this.samplesEndStringConvertibleValueView.Caption = "StringConvertibleValue View"; 266 267 this.samplesEndStringConvertibleValueView.Content = null; … … 274 275 // samplesStartStringConvertibleValueView 275 276 // 276 this.samplesStartStringConvertibleValueView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 277 277 this.samplesStartStringConvertibleValueView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 278 | System.Windows.Forms.AnchorStyles.Right))); 278 279 this.samplesStartStringConvertibleValueView.Caption = "StringConvertibleValue View"; 279 280 this.samplesStartStringConvertibleValueView.Content = null; … … 288 289 // 289 290 this.tabControl.AllowDrop = true; 290 this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 291 | System.Windows.Forms.AnchorStyles.Left)292 291 this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 292 | System.Windows.Forms.AnchorStyles.Left) 293 | System.Windows.Forms.AnchorStyles.Right))); 293 294 this.tabControl.Controls.Add(this.algorithmTabPage); 294 295 this.tabControl.Controls.Add(this.resultsTabPage); 295 296 this.tabControl.Controls.Add(this.runsTabPage); 296 this.tabControl.Location = new System.Drawing.Point(0, 87);297 this.tabControl.Location = new System.Drawing.Point(0, 115); 297 298 this.tabControl.Name = "tabControl"; 298 299 this.tabControl.SelectedIndex = 0; 299 this.tabControl.Size = new System.Drawing.Size(616, 421);300 this.tabControl.Size = new System.Drawing.Size(616, 393); 300 301 this.tabControl.TabIndex = 4; 301 302 // … … 310 311 this.algorithmTabPage.Name = "algorithmTabPage"; 311 312 this.algorithmTabPage.Padding = new System.Windows.Forms.Padding(3); 312 this.algorithmTabPage.Size = new System.Drawing.Size(608, 3 95);313 this.algorithmTabPage.Size = new System.Drawing.Size(608, 367); 313 314 this.algorithmTabPage.TabIndex = 0; 314 315 this.algorithmTabPage.Text = "Algorithm"; … … 320 321 // algorithmNamedItemView 321 322 // 322 this.algorithmNamedItemView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 323 323 this.algorithmNamedItemView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 324 | System.Windows.Forms.AnchorStyles.Right))); 324 325 this.algorithmNamedItemView.Caption = "NamedItem View"; 325 326 this.algorithmNamedItemView.Content = null; … … 333 334 // 334 335 this.algorithmTabControl.AllowDrop = true; 335 this.algorithmTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 336 | System.Windows.Forms.AnchorStyles.Left)337 336 this.algorithmTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 337 | System.Windows.Forms.AnchorStyles.Left) 338 | System.Windows.Forms.AnchorStyles.Right))); 338 339 this.algorithmTabControl.Controls.Add(this.algorithmProblemTabPage); 339 340 this.algorithmTabControl.Controls.Add(this.algorithmParametersTabPage); … … 341 342 this.algorithmTabControl.Name = "algorithmTabControl"; 342 343 this.algorithmTabControl.SelectedIndex = 0; 343 this.algorithmTabControl.Size = new System.Drawing.Size(594, 324);344 this.algorithmTabControl.Size = new System.Drawing.Size(594, 296); 344 345 this.algorithmTabControl.TabIndex = 3; 345 346 // … … 353 354 this.algorithmProblemTabPage.Name = "algorithmProblemTabPage"; 354 355 this.algorithmProblemTabPage.Padding = new System.Windows.Forms.Padding(3); 355 this.algorithmProblemTabPage.Size = new System.Drawing.Size(586, 2 98);356 this.algorithmProblemTabPage.Size = new System.Drawing.Size(586, 270); 356 357 this.algorithmProblemTabPage.TabIndex = 0; 357 358 this.algorithmProblemTabPage.Text = "Problem"; … … 374 375 // algorithmProblemViewHost 375 376 // 376 this.algorithmProblemViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 377 | System.Windows.Forms.AnchorStyles.Left)378 377 this.algorithmProblemViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 378 | System.Windows.Forms.AnchorStyles.Left) 379 | System.Windows.Forms.AnchorStyles.Right))); 379 380 this.algorithmProblemViewHost.Caption = "View"; 380 381 this.algorithmProblemViewHost.Content = null; … … 383 384 this.algorithmProblemViewHost.Name = "algorithmProblemViewHost"; 384 385 this.algorithmProblemViewHost.ReadOnly = false; 385 this.algorithmProblemViewHost.Size = new System.Drawing.Size(574, 2 56);386 this.algorithmProblemViewHost.Size = new System.Drawing.Size(574, 228); 386 387 this.algorithmProblemViewHost.TabIndex = 2; 387 388 this.algorithmProblemViewHost.ViewsLabelVisible = true; … … 405 406 this.algorithmParametersTabPage.Name = "algorithmParametersTabPage"; 406 407 this.algorithmParametersTabPage.Padding = new System.Windows.Forms.Padding(3); 407 this.algorithmParametersTabPage.Size = new System.Drawing.Size(586, 2 98);408 this.algorithmParametersTabPage.Size = new System.Drawing.Size(586, 270); 408 409 this.algorithmParametersTabPage.TabIndex = 1; 409 410 this.algorithmParametersTabPage.Text = "Parameters"; … … 412 413 // algorithmParameterCollectionView 413 414 // 415 this.algorithmParameterCollectionView.AllowEditingOfHiddenParameters = true; 414 416 this.algorithmParameterCollectionView.Caption = "ParameterCollection View"; 415 417 this.algorithmParameterCollectionView.Content = null; … … 418 420 this.algorithmParameterCollectionView.Name = "algorithmParameterCollectionView"; 419 421 this.algorithmParameterCollectionView.ReadOnly = false; 420 this.algorithmParameterCollectionView.Size = new System.Drawing.Size(580, 292); 422 this.algorithmParameterCollectionView.ShowDetails = true; 423 this.algorithmParameterCollectionView.Size = new System.Drawing.Size(580, 264); 421 424 this.algorithmParameterCollectionView.TabIndex = 0; 422 425 // … … 449 452 this.resultsTabPage.Name = "resultsTabPage"; 450 453 this.resultsTabPage.Padding = new System.Windows.Forms.Padding(3); 451 this.resultsTabPage.Size = new System.Drawing.Size(608, 3 95);454 this.resultsTabPage.Size = new System.Drawing.Size(608, 367); 452 455 this.resultsTabPage.TabIndex = 1; 453 456 this.resultsTabPage.Text = "Results"; … … 462 465 this.resultCollectionView.Name = "resultCollectionView"; 463 466 this.resultCollectionView.ReadOnly = true; 464 this.resultCollectionView.Size = new System.Drawing.Size(602, 389); 467 this.resultCollectionView.ShowDetails = true; 468 this.resultCollectionView.Size = new System.Drawing.Size(602, 361); 465 469 this.resultCollectionView.TabIndex = 0; 466 470 // … … 472 476 this.runsTabPage.Name = "runsTabPage"; 473 477 this.runsTabPage.Padding = new System.Windows.Forms.Padding(3); 474 this.runsTabPage.Size = new System.Drawing.Size(608, 3 95);478 this.runsTabPage.Size = new System.Drawing.Size(608, 367); 475 479 this.runsTabPage.TabIndex = 2; 476 480 this.runsTabPage.Text = "Runs"; … … 501 505 this.runCollectionView.Name = "runCollectionView"; 502 506 this.runCollectionView.ReadOnly = false; 503 this.runCollectionView.Size = new System.Drawing.Size(602, 3 89);507 this.runCollectionView.Size = new System.Drawing.Size(602, 361); 504 508 this.runCollectionView.TabIndex = 0; 505 509 // … … 513 517 // splitContainer 514 518 // 515 this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 516 519 this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 520 | System.Windows.Forms.AnchorStyles.Right))); 517 521 this.splitContainer.Location = new System.Drawing.Point(0, 26); 518 522 this.splitContainer.Name = "splitContainer"; … … 520 524 // splitContainer.Panel1 521 525 // 526 this.splitContainer.Panel1.Controls.Add(this.shuffleSamplesCheckBox); 522 527 this.splitContainer.Panel1.Controls.Add(this.samplesEndStringConvertibleValueView); 523 528 this.splitContainer.Panel1.Controls.Add(this.samplesStartStringConvertibleValueView); … … 531 536 this.splitContainer.Panel2.Controls.Add(this.workersLabel); 532 537 this.splitContainer.Panel2.Controls.Add(this.workersNumericUpDown); 533 this.splitContainer.Size = new System.Drawing.Size(616, 55);538 this.splitContainer.Size = new System.Drawing.Size(616, 73); 534 539 this.splitContainer.SplitterDistance = 306; 535 540 this.splitContainer.TabIndex = 3; 536 541 // 542 // shuffleSamplesCheckBox 543 // 544 this.shuffleSamplesCheckBox.AutoSize = true; 545 this.shuffleSamplesCheckBox.Location = new System.Drawing.Point(6, 52); 546 this.shuffleSamplesCheckBox.Name = "shuffleSamplesCheckBox"; 547 this.shuffleSamplesCheckBox.Size = new System.Drawing.Size(102, 17); 548 this.shuffleSamplesCheckBox.TabIndex = 5; 549 this.shuffleSamplesCheckBox.Text = "Shuffle Samples"; 550 this.shuffleSamplesCheckBox.UseVisualStyleBackColor = true; 551 this.shuffleSamplesCheckBox.CheckedChanged += new System.EventHandler(this.shuffleSamplesCheckBox_CheckedChanged); 552 // 537 553 // CrossValidationView 538 554 // 539 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);540 555 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; 541 556 this.Controls.Add(this.tabControl); … … 617 632 private System.Windows.Forms.SplitContainer splitContainer; 618 633 private Optimization.Views.ResultCollectionView resultCollectionView; 634 private System.Windows.Forms.CheckBox shuffleSamplesCheckBox; 619 635 } 620 636 } -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CrossValidationView.cs
r13338 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 61 61 runCollectionView.Content = null; 62 62 storeAlgorithmInEachRunCheckBox.Checked = true; 63 shuffleSamplesCheckBox.Checked = false; 63 64 } else { 64 65 Locked = ReadOnly = Content.ExecutionState == ExecutionState.Started; … … 74 75 executionTimeTextBox.Text = Content.ExecutionTime.ToString(); 75 76 storeAlgorithmInEachRunCheckBox.Checked = Content.StoreAlgorithmInEachRun; 77 shuffleSamplesCheckBox.Checked = Content.ShuffleSamples.Value; 76 78 } 77 79 } … … 137 139 stopButton.Enabled = (Content.ExecutionState == ExecutionState.Started) || (Content.ExecutionState == ExecutionState.Paused); 138 140 resetButton.Enabled = Content.ExecutionState != ExecutionState.Started; 141 // prevent changing the shuffle if the algorithm is not finished 142 shuffleSamplesCheckBox.Enabled = Content.ExecutionState == ExecutionState.Prepared; 139 143 } 140 144 } … … 197 201 198 202 #region GUI events 203 private void shuffleSamplesCheckBox_CheckedChanged(object sender, EventArgs e) { 204 Content.ShuffleSamples.Value = shuffleSamplesCheckBox.Checked; 205 } 199 206 private void foldsNumericUpDown_Validated(object sender, EventArgs e) { 200 207 if (foldsNumericUpDown.Text == string.Empty) … … 215 222 } 216 223 217 private void startButton_Click(object sender, EventArgs e) {218 Content.Start();224 private async void startButton_Click(object sender, EventArgs e) { 225 await Content.StartAsync(); 219 226 } 220 227 private void pauseButton_Click(object sender, EventArgs e) { … … 249 256 algorithmTabControl.Enabled = false; 250 257 251 ContentManager.LoadAsync(openFileDialog.FileName, delegate (IStorableContent content, Exception error) {258 ContentManager.LoadAsync(openFileDialog.FileName, delegate (IStorableContent content, Exception error) { 252 259 try { 253 260 if (error != null) throw error; … … 260 267 MainFormManager.MainForm.ShowError(ex.Message, ex); 261 268 } finally { 262 Invoke(new Action(delegate () {269 Invoke(new Action(delegate () { 263 270 algorithmTabControl.Enabled = true; 264 271 })); … … 286 293 algorithmProblemViewHost.Enabled = false; 287 294 288 ContentManager.LoadAsync(openFileDialog.FileName, delegate (IStorableContent content, Exception error) {295 ContentManager.LoadAsync(openFileDialog.FileName, delegate (IStorableContent content, Exception error) { 289 296 try { 290 297 if (error != null) throw error; … … 298 305 Invoke(new Action(() => MainFormManager.MainForm.ShowError(ex.Message, ex))); 299 306 } finally { 300 Invoke(new Action(delegate () {307 Invoke(new Action(delegate () { 301 308 algorithmProblemViewHost.Enabled = true; 302 309 newProblemButton.Enabled = openProblemButton.Enabled = true; … … 352 359 } 353 360 #endregion 354 355 361 } 356 362 } -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessModelView.Designer.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessModelView.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GradientBoostedTreesModelView.Designer.cs
r15674 r15973 45 45 /// </summary> 46 46 private void InitializeComponent() { 47 this.groupBoxVisualisation = new System.Windows.Forms.GroupBox(); 47 48 this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost(); 48 this.listBox = new System.Windows.Forms.ListBox(); 49 this.listView = new System.Windows.Forms.ListView(); 50 this.columnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); 51 this.groupBoxVisualisation.SuspendLayout(); 49 52 this.SuspendLayout(); 53 // 54 // groupBoxVisualisation 55 // 56 this.groupBoxVisualisation.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 57 | System.Windows.Forms.AnchorStyles.Left) 58 | System.Windows.Forms.AnchorStyles.Right))); 59 this.groupBoxVisualisation.Controls.Add(this.viewHost); 60 this.groupBoxVisualisation.Location = new System.Drawing.Point(169, 3); 61 this.groupBoxVisualisation.Name = "groupBoxVisualisation"; 62 this.groupBoxVisualisation.Size = new System.Drawing.Size(177, 277); 63 this.groupBoxVisualisation.TabIndex = 2; 64 this.groupBoxVisualisation.TabStop = false; 65 this.groupBoxVisualisation.Text = "Representation"; 50 66 // 51 67 // viewHost 52 68 // 53 this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)54 | System.Windows.Forms.AnchorStyles.Left)55 | System.Windows.Forms.AnchorStyles.Right)));56 69 this.viewHost.Caption = "View"; 57 70 this.viewHost.Content = null; 71 this.viewHost.Dock = System.Windows.Forms.DockStyle.Fill; 58 72 this.viewHost.Enabled = false; 59 this.viewHost.Location = new System.Drawing.Point( 126, 3);73 this.viewHost.Location = new System.Drawing.Point(3, 16); 60 74 this.viewHost.Name = "viewHost"; 61 75 this.viewHost.ReadOnly = false; 62 this.viewHost.Size = new System.Drawing.Size( 220, 277);76 this.viewHost.Size = new System.Drawing.Size(171, 258); 63 77 this.viewHost.TabIndex = 0; 64 78 this.viewHost.ViewsLabelVisible = true; 65 79 this.viewHost.ViewType = null; 66 80 // 67 // list Box81 // listView 68 82 // 69 this.list Box.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)83 this.listView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 70 84 | System.Windows.Forms.AnchorStyles.Left))); 71 this.listBox.Location = new System.Drawing.Point(3, 3); 72 this.listBox.Name = "listBox"; 73 this.listBox.Size = new System.Drawing.Size(117, 277); 74 this.listBox.TabIndex = 1; 75 this.listBox.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged); 76 this.listBox.DoubleClick += new System.EventHandler(this.listBox_DoubleClick); 85 this.listView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { 86 this.columnHeader}); 87 this.listView.FullRowSelect = true; 88 this.listView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; 89 this.listView.LabelWrap = false; 90 this.listView.Location = new System.Drawing.Point(3, 9); 91 this.listView.MultiSelect = false; 92 this.listView.Name = "listView"; 93 this.listView.ShowGroups = false; 94 this.listView.Size = new System.Drawing.Size(160, 271); 95 this.listView.TabIndex = 1; 96 this.listView.UseCompatibleStateImageBehavior = false; 97 this.listView.View = System.Windows.Forms.View.Details; 98 this.listView.SelectedIndexChanged += new System.EventHandler(this.listView_SelectedIndexChanged); 99 this.listView.DoubleClick += new System.EventHandler(this.listView_DoubleClick); 100 // 101 // columnHeader 102 // 103 this.columnHeader.Width = 130; 77 104 // 78 105 // GradientBoostedTreesModelView … … 80 107 this.AllowDrop = true; 81 108 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; 82 this.Controls.Add(this. viewHost);83 this.Controls.Add(this.list Box);109 this.Controls.Add(this.groupBoxVisualisation); 110 this.Controls.Add(this.listView); 84 111 this.Name = "GradientBoostedTreesModelView"; 85 112 this.Size = new System.Drawing.Size(349, 289); 113 this.groupBoxVisualisation.ResumeLayout(false); 86 114 this.ResumeLayout(false); 87 115 … … 91 119 92 120 private MainForm.WindowsForms.ViewHost viewHost; 93 private System.Windows.Forms.ListBox listBox; 94 95 96 97 121 private System.Windows.Forms.ListView listView; 122 private System.Windows.Forms.GroupBox groupBoxVisualisation; 123 private System.Windows.Forms.ColumnHeader columnHeader; 98 124 } 99 125 } -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GradientBoostedTreesModelView.cs
r15674 r15973 20 20 #endregion 21 21 22 using System; 23 using System.Diagnostics; 24 using System.Linq; 25 using System.Windows.Forms; 22 26 using HeuristicLab.Common; 23 27 using HeuristicLab.Core.Views; 24 28 using HeuristicLab.MainForm; 25 29 using HeuristicLab.MainForm.WindowsForms; 26 using HeuristicLab.Problems.DataAnalysis; 30 using HeuristicLab.Problems.DataAnalysis; 27 31 28 32 namespace HeuristicLab.Algorithms.DataAnalysis.Views { … … 30 34 [Content(typeof(IGradientBoostedTreesModel), true)] 31 35 public partial class GradientBoostedTreesModelView : ItemView { 32 36 #region Getter/Setter 33 37 public new IGradientBoostedTreesModel Content { 34 38 get { return (IGradientBoostedTreesModel)base.Content; } 35 39 set { base.Content = value; } 36 40 } 41 #endregion 37 42 38 protected override void SetEnabledStateOfControls() { 39 base.SetEnabledStateOfControls(); 40 listBox.Enabled = Content != null; 41 viewHost.Enabled = Content != null; 42 } 43 43 #region Ctor 44 44 public GradientBoostedTreesModelView() 45 45 : base() { 46 46 InitializeComponent(); 47 } 48 #endregion 49 50 #region Events 51 protected override void SetEnabledStateOfControls() { 52 base.SetEnabledStateOfControls(); 53 listView.Enabled = Content != null; 54 viewHost.Enabled = Content != null; 47 55 } 48 56 … … 51 59 if (Content == null) { 52 60 viewHost.Content = null; 53 list Box.Items.Clear();61 listView.Items.Clear(); 54 62 } else { 55 63 viewHost.Content = null; 56 listBox.Items.Clear(); 57 foreach (var e in Content.Models) { 58 listBox.Items.Add(e); 59 } 64 listView.BeginUpdate(); 65 listView.Items.Clear(); 66 int i = 1; 67 listView.Items.AddRange( 68 new ListViewItem(Content.Models.First().ToString()) { Tag = Content.Models.First() }.ToEnumerable() 69 .Union(Content.Models.Skip(1).Select(v => new ListViewItem("Model " + i++) { Tag = v })) 70 .ToArray() 71 ); 72 listView.EndUpdate(); 60 73 } 61 74 } 62 75 63 private void listBox_SelectedIndexChanged(object sender, System.EventArgs e) { 64 var model = listBox.SelectedItem;65 if ( model == null) viewHost.Content = null;66 else {67 viewHost.Content = ConvertModel( model);76 77 private void listView_SelectedIndexChanged(object sender, EventArgs e) { 78 if (listView.SelectedItems.Count == 1) { 79 var item = listView.SelectedItems[0]; 80 viewHost.Content = ConvertModel(item); 68 81 } 69 82 } 70 83 71 private void listBox_DoubleClick(object sender, System.EventArgs e) { 72 var selectedItem = listBox.SelectedItem; 73 if (selectedItem == null) return; 74 MainFormManager.MainForm.ShowContent(ConvertModel(selectedItem)); 75 } 76 77 private IContent ConvertModel(object model) { 78 var treeModel = model as RegressionTreeModel; 79 if (treeModel != null) 80 return treeModel.CreateSymbolicRegressionModel(); 81 else { 82 var regModel = model as IRegressionModel; 83 return regModel; 84 private void listView_DoubleClick(object sender, EventArgs e) { 85 if (listView.SelectedItems.Count == 1) { 86 var item = listView.SelectedItems[0]; 87 var content = ConvertModel(item); 88 if (content != null) { MainFormManager.MainForm.ShowContent(content); } 84 89 } 85 90 } 91 #endregion 92 93 #region Helper Methods 94 private IContent ConvertModel(ListViewItem item) { 95 if (item.Tag is RegressionTreeModel) { 96 return (item.Tag as RegressionTreeModel).CreateSymbolicRegressionModel(); 97 } else if (item.Tag is IRegressionModel) { 98 return item.Tag as IRegressionModel; 99 } else { 100 return null; 101 } 102 } 103 #endregion 86 104 } 87 105 } -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj
r13160 r15973 125 125 </ItemGroup> 126 126 <ItemGroup> 127 <Compile Include="GradientBoostedTreesModelEvaluationView.cs"> 128 <SubType>UserControl</SubType> 129 </Compile> 130 <Compile Include="GradientBoostedTreesModelEvaluationView.Designer.cs"> 131 <DependentUpon>GradientBoostedTreesModelEvaluationView.cs</DependentUpon> 132 </Compile> 133 <Compile Include="GradientBoostedTreesModelView.cs"> 134 <SubType>UserControl</SubType> 135 </Compile> 136 <Compile Include="GradientBoostedTreesModelView.Designer.cs"> 137 <DependentUpon>GradientBoostedTreesModelView.cs</DependentUpon> 138 </Compile> 139 <Compile Include="OneFactorClassificationModelView.cs"> 140 <SubType>UserControl</SubType> 141 </Compile> 142 <Compile Include="OneFactorClassificationModelView.Designer.cs"> 143 <DependentUpon>OneFactorClassificationModelView.cs</DependentUpon> 144 </Compile> 145 <Compile Include="RandomForestModelView.cs"> 146 <SubType>UserControl</SubType> 147 </Compile> 148 <Compile Include="RandomForestModelView.Designer.cs"> 149 <DependentUpon>RandomForestModelView.cs</DependentUpon> 150 </Compile> 151 <Compile Include="RandomForestModelEvaluationView.cs"> 152 <SubType>UserControl</SubType> 153 </Compile> 154 <Compile Include="RandomForestModelEvaluationView.Designer.cs"> 155 <DependentUpon>RandomForestModelEvaluationView.cs</DependentUpon> 156 </Compile> 127 157 <Compile Include="MeanProdView.cs"> 128 158 <SubType>UserControl</SubType> … … 174 204 </Compile> 175 205 <Compile Include="Plugin.cs" /> 176 <Compile Include="GaussianProcessRegressionSolutionLineChartView.cs">177 <SubType>UserControl</SubType>178 </Compile>179 <Compile Include="GaussianProcessRegressionSolutionLineChartView.Designer.cs">180 <DependentUpon>GaussianProcessRegressionSolutionLineChartView.cs</DependentUpon>181 </Compile>182 206 <Compile Include="SupportVectorMachineModelSupportVectorsView.cs"> 183 207 <SubType>UserControl</SubType> … … 251 275 <Private>False</Private> 252 276 </ProjectReference> 277 <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj"> 278 <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project> 279 <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name> 280 </ProjectReference> 253 281 <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj"> 254 282 <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project> … … 275 303 <Name>HeuristicLab.PluginInfrastructure-3.3</Name> 276 304 <Private>False</Private> 305 </ProjectReference> 306 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj"> 307 <Project>{05BAE4E1-A9FA-4644-AA77-42558720159E}</Project> 308 <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4</Name> 309 </ProjectReference> 310 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj"> 311 <Project>{5AC82412-911B-4FA2-A013-EDC5E3F3FCC2}</Project> 312 <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4</Name> 313 </ProjectReference> 314 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Views\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj"> 315 <Project>{7a2531ce-3f7c-4f13-bcca-ed6dc27a7086}</Project> 316 <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4</Name> 317 </ProjectReference> 318 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj"> 319 <Project>{3d28463f-ec96-4d82-afee-38be91a0ca00}</Project> 320 <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name> 277 321 </ProjectReference> 278 322 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj"> -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/KMeansClusteringModelView.Designer.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/KMeansClusteringModelView.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 19 19 */ 20 20 #endregion 21 using System;22 21 using System.Linq; 23 using System.IO;24 using System.Windows.Forms;25 22 using HeuristicLab.MainForm; 26 23 using HeuristicLab.MainForm.WindowsForms; -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/MeanProdView.Designer.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/MeanProdView.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/MeanSumView.Designer.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/MeanSumView.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/NcaDimensionReductionView.Designer.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/NcaDimensionReductionView.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/OneRClassificationModelView.Designer.cs
r13100 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/OneRClassificationModelView.cs
r13100 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/Plugin.cs.frame
r13321 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 /// Plugin class for HeuristicLab.Algorithms.DataAnalysis.Views plugin. 27 27 /// </summary> 28 [Plugin("HeuristicLab.Algorithms.DataAnalysis.Views", "Provides views for data analysis algorithms implemented in external libraries (linear regression, linear discriminant analysis, k-means clustering, support vector classification and regression)", "3.4. 9.$WCREV$")]28 [Plugin("HeuristicLab.Algorithms.DataAnalysis.Views", "Provides views for data analysis algorithms implemented in external libraries (linear regression, linear discriminant analysis, k-means clustering, support vector classification and regression)", "3.4.11.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Algorithms.DataAnalysis.Views-3.4.dll", PluginFileType.Assembly)] 30 30 [PluginDependency("HeuristicLab.Algorithms.DataAnalysis", "3.4")] … … 37 37 [PluginDependency("HeuristicLab.Data", "3.3")] 38 38 [PluginDependency("HeuristicLab.Data.Views", "3.3")] 39 [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")] 39 40 [PluginDependency("HeuristicLab.LibSVM", "3.12")] 40 41 [PluginDependency("HeuristicLab.MainForm", "3.3")] … … 44 45 [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")] 45 46 [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views", "3.4")] 46 [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")] 47 [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")] 48 [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression", "3.4")] 49 [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic.Classification", "3.4")] 47 50 public class HeuristicLabAlgorithmsDataAnalysisViewsPlugin : PluginBase { 48 51 } -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/Properties/AssemblyInfo.cs.frame
r13321 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 31 31 [assembly: AssemblyCompany("")] 32 32 [assembly: AssemblyProduct("HeuristicLab")] 33 [assembly: AssemblyCopyright("(c) 2002-201 5HEAL")]33 [assembly: AssemblyCopyright("(c) 2002-2018 HEAL")] 34 34 [assembly: AssemblyTrademark("")] 35 35 [assembly: AssemblyCulture("")] … … 53 53 // by using the '*' as shown below: 54 54 [assembly: AssemblyVersion("3.4.0.0")] 55 [assembly: AssemblyFileVersion("3.4. 9.$WCREV$")]55 [assembly: AssemblyFileVersion("3.4.11.$WCREV$")] -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelSupportVectorsView.Designer.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelSupportVectorsView.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelView.Designer.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2522_RefactorPluginInfrastructure/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelView.cs
r12012 r15973 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab.
Note: See TracChangeset
for help on using the changeset viewer.