Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/23/17 11:17:18 (7 years ago)
Author:
abeham
Message:

#2258: merged r14001:15280 from trunk into branch

Location:
branches/Async
Files:
4 deleted
27 edited
10 copied

Legend:

Unmodified
Added
Removed

  • branches/Async

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CovarianceProdView.Designer.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CovarianceProdView.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CovarianceSumView.Designer.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CovarianceSumView.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CrossValidationView.Designer.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    7979      this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
    8080      this.splitContainer = new System.Windows.Forms.SplitContainer();
     81      this.shuffleSamplesCheckBox = new System.Windows.Forms.CheckBox();
    8182      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    8283      ((System.ComponentModel.ISupportInitialize)(this.foldsNumericUpDown)).BeginInit();
    … …  
    172173      //
    173174      this.foldsNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    174                   | System.Windows.Forms.AnchorStyles.Right)));
     175            | System.Windows.Forms.AnchorStyles.Right)));
    175176      this.foldsNumericUpDown.Location = new System.Drawing.Point(55, 26);
    176177      this.foldsNumericUpDown.Maximum = new decimal(new int[] {
    … …  
    185186            0});
    186187      this.foldsNumericUpDown.Name = "foldsNumericUpDown";
    187       this.foldsNumericUpDown.Size = new System.Drawing.Size(248, 20);
     188      this.foldsNumericUpDown.Size = new System.Drawing.Size(154, 20);
    188189      this.foldsNumericUpDown.TabIndex = 3;
    189190      this.foldsNumericUpDown.ThousandsSeparator = true;
    … …  
    208209      //
    209210      this.workersNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    210                   | System.Windows.Forms.AnchorStyles.Right)));
     211            | System.Windows.Forms.AnchorStyles.Right)));
    211212      this.workersNumericUpDown.Location = new System.Drawing.Point(55, 0);
    212213      this.workersNumericUpDown.Maximum = new decimal(new int[] {
    … …  
    262263      //
    263264      this.samplesEndStringConvertibleValueView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    264                   | System.Windows.Forms.AnchorStyles.Right)));
     265            | System.Windows.Forms.AnchorStyles.Right)));
    265266      this.samplesEndStringConvertibleValueView.Caption = "StringConvertibleValue View";
    266267      this.samplesEndStringConvertibleValueView.Content = null;
    … …  
    275276      //
    276277      this.samplesStartStringConvertibleValueView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    277                   | System.Windows.Forms.AnchorStyles.Right)));
     278            | System.Windows.Forms.AnchorStyles.Right)));
    278279      this.samplesStartStringConvertibleValueView.Caption = "StringConvertibleValue View";
    279280      this.samplesStartStringConvertibleValueView.Content = null;
    … …  
    289290      this.tabControl.AllowDrop = true;
    290291      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    291                   | System.Windows.Forms.AnchorStyles.Left)
    292                   | System.Windows.Forms.AnchorStyles.Right)));
     292            | System.Windows.Forms.AnchorStyles.Left)
     293            | System.Windows.Forms.AnchorStyles.Right)));
    293294      this.tabControl.Controls.Add(this.algorithmTabPage);
    294295      this.tabControl.Controls.Add(this.resultsTabPage);
    295296      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);
    297298      this.tabControl.Name = "tabControl";
    298299      this.tabControl.SelectedIndex = 0;
    299       this.tabControl.Size = new System.Drawing.Size(616, 421);
     300      this.tabControl.Size = new System.Drawing.Size(616, 393);
    300301      this.tabControl.TabIndex = 4;
    301302      //
    … …  
    310311      this.algorithmTabPage.Name = "algorithmTabPage";
    311312      this.algorithmTabPage.Padding = new System.Windows.Forms.Padding(3);
    312       this.algorithmTabPage.Size = new System.Drawing.Size(608, 395);
     313      this.algorithmTabPage.Size = new System.Drawing.Size(608, 367);
    313314      this.algorithmTabPage.TabIndex = 0;
    314315      this.algorithmTabPage.Text = "Algorithm";
    … …  
    321322      //
    322323      this.algorithmNamedItemView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    323                   | System.Windows.Forms.AnchorStyles.Right)));
     324            | System.Windows.Forms.AnchorStyles.Right)));
    324325      this.algorithmNamedItemView.Caption = "NamedItem View";
    325326      this.algorithmNamedItemView.Content = null;
    … …  
    334335      this.algorithmTabControl.AllowDrop = true;
    335336      this.algorithmTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    336                   | System.Windows.Forms.AnchorStyles.Left)
    337                   | System.Windows.Forms.AnchorStyles.Right)));
     337            | System.Windows.Forms.AnchorStyles.Left)
     338            | System.Windows.Forms.AnchorStyles.Right)));
    338339      this.algorithmTabControl.Controls.Add(this.algorithmProblemTabPage);
    339340      this.algorithmTabControl.Controls.Add(this.algorithmParametersTabPage);
    … …  
    341342      this.algorithmTabControl.Name = "algorithmTabControl";
    342343      this.algorithmTabControl.SelectedIndex = 0;
    343       this.algorithmTabControl.Size = new System.Drawing.Size(594, 324);
     344      this.algorithmTabControl.Size = new System.Drawing.Size(594, 296);
    344345      this.algorithmTabControl.TabIndex = 3;
    345346      //
    … …  
    353354      this.algorithmProblemTabPage.Name = "algorithmProblemTabPage";
    354355      this.algorithmProblemTabPage.Padding = new System.Windows.Forms.Padding(3);
    355       this.algorithmProblemTabPage.Size = new System.Drawing.Size(586, 298);
     356      this.algorithmProblemTabPage.Size = new System.Drawing.Size(586, 270);
    356357      this.algorithmProblemTabPage.TabIndex = 0;
    357358      this.algorithmProblemTabPage.Text = "Problem";
    … …  
    375376      //
    376377      this.algorithmProblemViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    377                   | System.Windows.Forms.AnchorStyles.Left)
    378                   | System.Windows.Forms.AnchorStyles.Right)));
     378            | System.Windows.Forms.AnchorStyles.Left)
     379            | System.Windows.Forms.AnchorStyles.Right)));
    379380      this.algorithmProblemViewHost.Caption = "View";
    380381      this.algorithmProblemViewHost.Content = null;
    … …  
    383384      this.algorithmProblemViewHost.Name = "algorithmProblemViewHost";
    384385      this.algorithmProblemViewHost.ReadOnly = false;
    385       this.algorithmProblemViewHost.Size = new System.Drawing.Size(574, 256);
     386      this.algorithmProblemViewHost.Size = new System.Drawing.Size(574, 228);
    386387      this.algorithmProblemViewHost.TabIndex = 2;
    387388      this.algorithmProblemViewHost.ViewsLabelVisible = true;
    … …  
    405406      this.algorithmParametersTabPage.Name = "algorithmParametersTabPage";
    406407      this.algorithmParametersTabPage.Padding = new System.Windows.Forms.Padding(3);
    407       this.algorithmParametersTabPage.Size = new System.Drawing.Size(586, 298);
     408      this.algorithmParametersTabPage.Size = new System.Drawing.Size(586, 270);
    408409      this.algorithmParametersTabPage.TabIndex = 1;
    409410      this.algorithmParametersTabPage.Text = "Parameters";
    … …  
    412413      // algorithmParameterCollectionView
    413414      //
     415      this.algorithmParameterCollectionView.AllowEditingOfHiddenParameters = true;
    414416      this.algorithmParameterCollectionView.Caption = "ParameterCollection View";
    415417      this.algorithmParameterCollectionView.Content = null;
    … …  
    418420      this.algorithmParameterCollectionView.Name = "algorithmParameterCollectionView";
    419421      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);
    421424      this.algorithmParameterCollectionView.TabIndex = 0;
    422425      //
    … …  
    449452      this.resultsTabPage.Name = "resultsTabPage";
    450453      this.resultsTabPage.Padding = new System.Windows.Forms.Padding(3);
    451       this.resultsTabPage.Size = new System.Drawing.Size(608, 395);
     454      this.resultsTabPage.Size = new System.Drawing.Size(608, 367);
    452455      this.resultsTabPage.TabIndex = 1;
    453456      this.resultsTabPage.Text = "Results";
    … …  
    462465      this.resultCollectionView.Name = "resultCollectionView";
    463466      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);
    465469      this.resultCollectionView.TabIndex = 0;
    466470      //
    … …  
    472476      this.runsTabPage.Name = "runsTabPage";
    473477      this.runsTabPage.Padding = new System.Windows.Forms.Padding(3);
    474       this.runsTabPage.Size = new System.Drawing.Size(608, 395);
     478      this.runsTabPage.Size = new System.Drawing.Size(608, 367);
    475479      this.runsTabPage.TabIndex = 2;
    476480      this.runsTabPage.Text = "Runs";
    … …  
    501505      this.runCollectionView.Name = "runCollectionView";
    502506      this.runCollectionView.ReadOnly = false;
    503       this.runCollectionView.Size = new System.Drawing.Size(602, 389);
     507      this.runCollectionView.Size = new System.Drawing.Size(602, 361);
    504508      this.runCollectionView.TabIndex = 0;
    505509      //
    … …  
    514518      //
    515519      this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    516                   | System.Windows.Forms.AnchorStyles.Right)));
     520            | System.Windows.Forms.AnchorStyles.Right)));
    517521      this.splitContainer.Location = new System.Drawing.Point(0, 26);
    518522      this.splitContainer.Name = "splitContainer";
    … …  
    520524      // splitContainer.Panel1
    521525      //
     526      this.splitContainer.Panel1.Controls.Add(this.shuffleSamplesCheckBox);
    522527      this.splitContainer.Panel1.Controls.Add(this.samplesEndStringConvertibleValueView);
    523528      this.splitContainer.Panel1.Controls.Add(this.samplesStartStringConvertibleValueView);
    … …  
    531536      this.splitContainer.Panel2.Controls.Add(this.workersLabel);
    532537      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);
    534539      this.splitContainer.SplitterDistance = 306;
    535540      this.splitContainer.TabIndex = 3;
    536541      //
     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      //
    537553      // CrossValidationView
    538554      //
    539       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    540555      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    541556      this.Controls.Add(this.tabControl);
    … …  
    617632    private System.Windows.Forms.SplitContainer splitContainer;
    618633    private Optimization.Views.ResultCollectionView resultCollectionView;
     634    private System.Windows.Forms.CheckBox shuffleSamplesCheckBox;
    619635  }
    620636}

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CrossValidationView.cs

    r13349 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    6161        runCollectionView.Content = null;
    6262        storeAlgorithmInEachRunCheckBox.Checked = true;
     63        shuffleSamplesCheckBox.Checked = false;
    6364      } else {
    6465        Locked = ReadOnly = Content.ExecutionState == ExecutionState.Started;
    … …  
    7475        executionTimeTextBox.Text = Content.ExecutionTime.ToString();
    7576        storeAlgorithmInEachRunCheckBox.Checked = Content.StoreAlgorithmInEachRun;
     77        shuffleSamplesCheckBox.Checked = Content.ShuffleSamples.Value;
    7678      }
    7779    }
    … …  
    137139          stopButton.Enabled = (Content.ExecutionState == ExecutionState.Started) || (Content.ExecutionState == ExecutionState.Paused);
    138140          resetButton.Enabled = Content.ExecutionState != ExecutionState.Started;
     141          // prevent changing the shuffle if the algorithm is not finished
     142          shuffleSamplesCheckBox.Enabled = Content.ExecutionState == ExecutionState.Prepared;
    139143        }
    140144      }
    … …  
    197201
    198202    #region GUI events
     203    private void shuffleSamplesCheckBox_CheckedChanged(object sender, EventArgs e) {
     204      Content.ShuffleSamples.Value = shuffleSamplesCheckBox.Checked;
     205    }
    199206    private void foldsNumericUpDown_Validated(object sender, EventArgs e) {
    200207      if (foldsNumericUpDown.Text == string.Empty)
    … …  
    238245        try {
    239246          Content.Algorithm = (IAlgorithm)algorithmTypeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
    240         }
    241         catch (Exception ex) {
     247        } catch (Exception ex) {
    242248          ErrorHandling.ShowErrorDialog(this, ex);
    243249        }
    … …  
    250256        algorithmTabControl.Enabled = false;
    251257
    252         ContentManager.LoadAsync(openFileDialog.FileName, delegate(IStorableContent content, Exception error) {
     258        ContentManager.LoadAsync(openFileDialog.FileName, delegate (IStorableContent content, Exception error) {
    253259          try {
    254260            if (error != null) throw error;
    … …  
    258264            else
    259265              Content.Algorithm = algorithm;
    260           }
    261           catch (Exception ex) {
     266          } catch (Exception ex) {
    262267            ErrorHandling.ShowErrorDialog(this, ex);
    263           }
    264           finally {
    265             Invoke(new Action(delegate() {
     268          } finally {
     269            Invoke(new Action(delegate () {
    266270              algorithmTabControl.Enabled = true;
    267271            }));
    … …  
    289293        algorithmProblemViewHost.Enabled = false;
    290294
    291         ContentManager.LoadAsync(openFileDialog.FileName, delegate(IStorableContent content, Exception error) {
     295        ContentManager.LoadAsync(openFileDialog.FileName, delegate (IStorableContent content, Exception error) {
    292296          try {
    293297            if (error != null) throw error;
    … …  
    298302            else
    299303              Content.Problem = problem;
    300           }
    301           catch (Exception ex) {
     304          } catch (Exception ex) {
    302305            Invoke(new Action(() => ErrorHandling.ShowErrorDialog(this, ex)));
    303           }
    304           finally {
    305             Invoke(new Action(delegate() {
     306          } finally {
     307            Invoke(new Action(delegate () {
    306308              algorithmProblemViewHost.Enabled = true;
    307309              newProblemButton.Enabled = openProblemButton.Enabled = true;
    … …  
    357359    }
    358360    #endregion
    359 
    360361  }
    361362}

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessModelView.Designer.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessModelView.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj

    r15280 r15281  
    125125  </ItemGroup>
    126126  <ItemGroup>
    127     <Compile Include="GaussianProcessRegressionSolutionEstimatedValuesView.cs">
    128       <SubType>UserControl</SubType>
    129     </Compile>
    130     <Compile Include="GaussianProcessRegressionSolutionEstimatedValuesView.Designer.cs">
    131       <DependentUpon>GaussianProcessRegressionSolutionEstimatedValuesView.cs</DependentUpon>
     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>
    132156    </Compile>
    133157    <Compile Include="MeanProdView.cs">
    … …  
    180204    </Compile>
    181205    <Compile Include="Plugin.cs" />
    182     <Compile Include="GaussianProcessRegressionSolutionLineChartView.cs">
    183       <SubType>UserControl</SubType>
    184     </Compile>
    185     <Compile Include="GaussianProcessRegressionSolutionLineChartView.Designer.cs">
    186       <DependentUpon>GaussianProcessRegressionSolutionLineChartView.cs</DependentUpon>
    187     </Compile>
    188206    <Compile Include="SupportVectorMachineModelSupportVectorsView.cs">
    189207      <SubType>UserControl</SubType>
    … …  
    257275      <Private>False</Private>
    258276    </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>
    259281    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    260282      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    … …  
    281303      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    282304      <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>
    283321    </ProjectReference>
    284322    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/KMeansClusteringModelView.Designer.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/KMeansClusteringModelView.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    1919 */
    2020#endregion
    21 using System;
    2221using System.Linq;
    23 using System.IO;
    24 using System.Windows.Forms;
    2522using HeuristicLab.MainForm;
    2623using HeuristicLab.MainForm.WindowsForms;

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/MeanProdView.Designer.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/MeanProdView.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/MeanSumView.Designer.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/MeanSumView.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/NcaDimensionReductionView.Designer.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/NcaDimensionReductionView.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/OneRClassificationModelView.Designer.cs

    r13100 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/OneRClassificationModelView.cs

    r13100 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/Plugin.cs.frame

    r13321 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626  /// Plugin class for HeuristicLab.Algorithms.DataAnalysis.Views plugin.
    2727  /// </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.10.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Algorithms.DataAnalysis.Views-3.4.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Algorithms.DataAnalysis", "3.4")]
    … …  
    3737  [PluginDependency("HeuristicLab.Data", "3.3")]
    3838  [PluginDependency("HeuristicLab.Data.Views", "3.3")]
     39  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
    3940  [PluginDependency("HeuristicLab.LibSVM", "3.12")]
    4041  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    … …  
    4445  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
    4546  [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")]
    4750  public class HeuristicLabAlgorithmsDataAnalysisViewsPlugin : PluginBase {
    4851  }

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/Properties/AssemblyInfo.cs.frame

    r13321 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3131[assembly: AssemblyCompany("")]
    3232[assembly: AssemblyProduct("HeuristicLab")]
    33 [assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
     33[assembly: AssemblyCopyright("(c) 2002-2016 HEAL")]
    3434[assembly: AssemblyTrademark("")]
    3535[assembly: AssemblyCulture("")]
    … …  
    5353// by using the '*' as shown below:
    5454[assembly: AssemblyVersion("3.4.0.0")]
    55 [assembly: AssemblyFileVersion("3.4.9.$WCREV$")]
     55[assembly: AssemblyFileVersion("3.4.10.$WCREV$")]

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelSupportVectorsView.Designer.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelSupportVectorsView.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelView.Designer.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/Async/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelView.cs

    r12012 r15281  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
Note: See TracChangeset for help on using the changeset viewer.