Free cookie consent management tool by TermsFeed Policy Generator

Changeset 8811


Ignore:
Timestamp:
10/16/12 09:44:07 (12 years ago)
Author:
sforsten
Message:

#1776:

Location:
branches/ClassificationEnsembleVoting
Files:
37 edited
25 copied

Legend:

Unmodified
Added
Removed

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionAccuracyToCoveredSamples.cs

    r8510 r8811  
    2828using HeuristicLab.Data;
    2929using HeuristicLab.MainForm;
    30 using HeuristicLab.Problems.DataAnalysis.Interfaces;
    3130
    3231namespace HeuristicLab.Problems.DataAnalysis.Views {

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionConfidenceAccuracyDependence.cs

    r8297 r8811  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.MainForm;
    29 using HeuristicLab.Problems.DataAnalysis.Interfaces;
    3029
    3130namespace HeuristicLab.Problems.DataAnalysis.Views {

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionEstimatedClassValuesView.Designer.cs

    r8508 r8811  
    4646      this.SamplesComboBox = new System.Windows.Forms.ComboBox();
    4747      this.CorrectClassifiedConfidenceLabel = new System.Windows.Forms.Label();
    48       this.CorrectClassifiedConfidence = new System.Windows.Forms.Label();
    4948      this.WrongClassifiedConfidenceLabel = new System.Windows.Forms.Label();
    50       this.WrongClassifiedConfidence = new System.Windows.Forms.Label();
     49      this.CorrectClassifiedConfidence = new System.Windows.Forms.TextBox();
     50      this.WrongClassifiedConfidence = new System.Windows.Forms.TextBox();
    5151      this.SuspendLayout();
    5252      //
    … …  
    6868      this.SamplesComboBox.Location = new System.Drawing.Point(4, 4);
    6969      this.SamplesComboBox.Name = "SamplesComboBox";
    70       this.SamplesComboBox.Size = new System.Drawing.Size(309, 21);
     70      this.SamplesComboBox.Size = new System.Drawing.Size(230, 21);
    7171      this.SamplesComboBox.TabIndex = 2;
    7272      this.SamplesComboBox.SelectedIndexChanged += new System.EventHandler(this.SamplesComboBox_SelectedIndexChanged);
    … …  
    7676      this.CorrectClassifiedConfidenceLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    7777      this.CorrectClassifiedConfidenceLabel.AutoSize = true;
    78       this.CorrectClassifiedConfidenceLabel.Location = new System.Drawing.Point(319, 7);
     78      this.CorrectClassifiedConfidenceLabel.Location = new System.Drawing.Point(240, 7);
    7979      this.CorrectClassifiedConfidenceLabel.Name = "CorrectClassifiedConfidenceLabel";
    8080      this.CorrectClassifiedConfidenceLabel.Size = new System.Drawing.Size(103, 13);
    … …  
    8282      this.CorrectClassifiedConfidenceLabel.Text = "Conf. Correct Class.:";
    8383      //
    84       // CorrectClassifiedConfidence
    85       //
    86       this.CorrectClassifiedConfidence.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    87       this.CorrectClassifiedConfidence.AutoSize = true;
    88       this.CorrectClassifiedConfidence.Location = new System.Drawing.Point(428, 7);
    89       this.CorrectClassifiedConfidence.Name = "CorrectClassifiedConfidence";
    90       this.CorrectClassifiedConfidence.Size = new System.Drawing.Size(22, 13);
    91       this.CorrectClassifiedConfidence.TabIndex = 4;
    92       this.CorrectClassifiedConfidence.Text = "0.0";
    93       //
    9484      // WrongClassifiedConfidenceLabel
    9585      //
    9686      this.WrongClassifiedConfidenceLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    9787      this.WrongClassifiedConfidenceLabel.AutoSize = true;
    98       this.WrongClassifiedConfidenceLabel.Location = new System.Drawing.Point(481, 7);
     88      this.WrongClassifiedConfidenceLabel.Location = new System.Drawing.Point(455, 7);
    9989      this.WrongClassifiedConfidenceLabel.Name = "WrongClassifiedConfidenceLabel";
    10090      this.WrongClassifiedConfidenceLabel.Size = new System.Drawing.Size(101, 13);
    … …  
    10292      this.WrongClassifiedConfidenceLabel.Text = "Conf. Wrong Class.:";
    10393      //
     94      // CorrectClassifiedConfidence
     95      //
     96      this.CorrectClassifiedConfidence.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
     97      this.CorrectClassifiedConfidence.Location = new System.Drawing.Point(349, 5);
     98      this.CorrectClassifiedConfidence.Name = "CorrectClassifiedConfidence";
     99      this.CorrectClassifiedConfidence.ReadOnly = true;
     100      this.CorrectClassifiedConfidence.Size = new System.Drawing.Size(100, 20);
     101      this.CorrectClassifiedConfidence.TabIndex = 7;
     102      this.CorrectClassifiedConfidence.Text = "0.0";
     103      //
    104104      // WrongClassifiedConfidence
    105105      //
    106106      this.WrongClassifiedConfidence.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    107       this.WrongClassifiedConfidence.AutoSize = true;
    108       this.WrongClassifiedConfidence.Location = new System.Drawing.Point(588, 7);
     107      this.WrongClassifiedConfidence.Location = new System.Drawing.Point(562, 4);
    109108      this.WrongClassifiedConfidence.Name = "WrongClassifiedConfidence";
    110       this.WrongClassifiedConfidence.Size = new System.Drawing.Size(22, 13);
    111       this.WrongClassifiedConfidence.TabIndex = 6;
     109      this.WrongClassifiedConfidence.ReadOnly = true;
     110      this.WrongClassifiedConfidence.Size = new System.Drawing.Size(94, 20);
     111      this.WrongClassifiedConfidence.TabIndex = 8;
    112112      this.WrongClassifiedConfidence.Text = "0.0";
    113113      //
    114114      // ClassificationEnsembleSolutionEstimatedClassValuesView
    115115      //
    116       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    117116      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    118117      this.Controls.Add(this.WrongClassifiedConfidence);
     118      this.Controls.Add(this.CorrectClassifiedConfidence);
    119119      this.Controls.Add(this.WrongClassifiedConfidenceLabel);
    120       this.Controls.Add(this.CorrectClassifiedConfidence);
    121120      this.Controls.Add(this.CorrectClassifiedConfidenceLabel);
    122121      this.Controls.Add(this.SamplesComboBox);
    … …  
    126125      this.Controls.SetChildIndex(this.SamplesComboBox, 0);
    127126      this.Controls.SetChildIndex(this.CorrectClassifiedConfidenceLabel, 0);
     127      this.Controls.SetChildIndex(this.WrongClassifiedConfidenceLabel, 0);
    128128      this.Controls.SetChildIndex(this.CorrectClassifiedConfidence, 0);
    129       this.Controls.SetChildIndex(this.WrongClassifiedConfidenceLabel, 0);
    130129      this.Controls.SetChildIndex(this.WrongClassifiedConfidence, 0);
    131130      this.ResumeLayout(false);
    … …  
    138137    private System.Windows.Forms.ComboBox SamplesComboBox;
    139138    private System.Windows.Forms.Label CorrectClassifiedConfidenceLabel;
    140     private System.Windows.Forms.Label CorrectClassifiedConfidence;
    141139    private System.Windows.Forms.Label WrongClassifiedConfidenceLabel;
    142     private System.Windows.Forms.Label WrongClassifiedConfidence;
     140    private System.Windows.Forms.TextBox CorrectClassifiedConfidence;
     141    private System.Windows.Forms.TextBox WrongClassifiedConfidence;
    143142
    144143  }

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionEstimatedClassValuesView.cs

    r8508 r8811  
    1919 */
    2020#endregion
     21
    2122using System;
    2223using System.Collections.Generic;
    … …  
    2829using HeuristicLab.MainForm;
    2930using HeuristicLab.MainForm.WindowsForms;
    30 using HeuristicLab.Problems.DataAnalysis.Interfaces;
    3131
    3232namespace HeuristicLab.Problems.DataAnalysis.Views {
    … …  
    9696
    9797      IEnumerable<IClassificationSolution> solutions = Content.ClassificationSolutions.CheckedItems;
    98       int classValuesCount = Content.ProblemData.ClassValues.Count;
     98      int classValuesCount = Content.ProblemData.Classes;
    9999      int solutionsCount = solutions.Count();
    100100      string[,] values = new string[indizes.Length, 5 + classValuesCount + solutionsCount];
    … …  
    143143          var groups =
    144144            estimatedValuesVector[i].GroupBy(x => x).Select(g => new { Key = g.Key, Count = g.Count() }).ToList();
    145           for (int classIndex = 0; classIndex < Content.ProblemData.ClassValues.Count; classIndex++) {
    146             var group = groups.Where(g => g.Key == Content.ProblemData.ClassValues[classIndex]).SingleOrDefault();
     145
     146          for (int classIndex = 0; classIndex < Content.ProblemData.Classes; classIndex++) {
     147            var group = groups.Where(g => g.Key == Content.ProblemData.ClassValues.ElementAt(classIndex)).SingleOrDefault();
    147148            if (group == null) values[i, 5 + classIndex] = 0.ToString();
    148149            else values[i, 5 + classIndex] = group.Count.ToString();

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationRocCurvesView.cs

    r8508 r8811  
    114114        maxThreshold += thresholdIncrement;
    115115
    116         List<double> classValues = Content.ProblemData.ClassValues.OrderBy(x => x).ToList();
     116        List<double> classValues = Content.Model.ClassValues.ToList();
    117117
    118118        foreach (double classValue in classValues) {

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionThresholdView.cs

    r8508 r8811  
    238238      double[] thresholds = Content.Model.Thresholds.ToArray();
    239239      thresholds[classIndex] = e.NewLocationY;
     240      Array.Sort(thresholds);
    240241      Content.Model.SetThresholdsAndClassValues(thresholds, Content.Model.ClassValues);
    241242    }

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r8508 r8811  
    185185      <DependentUpon>ClassificationEnsembleSolutionModelView.cs</DependentUpon>
    186186    </Compile>
     187    <Compile Include="Classification\ClassificationFeatureCorrelationView.cs">
     188      <SubType>UserControl</SubType>
     189    </Compile>
     190    <Compile Include="Classification\ClassificationFeatureCorrelationView.Designer.cs">
     191      <DependentUpon>ClassificationFeatureCorrelationView.cs</DependentUpon>
     192    </Compile>
     193    <Compile Include="Classification\ClassificationTimeframeFeatureCorrelationView.cs">
     194      <SubType>UserControl</SubType>
     195    </Compile>
     196    <Compile Include="Classification\ClassificationTimeframeFeatureCorrelationView.Designer.cs">
     197      <DependentUpon>ClassificationTimeframeFeatureCorrelationView.cs</DependentUpon>
     198    </Compile>
     199    <Compile Include="Classification\DiscriminantFunctionClassificationModelView.cs">
     200      <SubType>UserControl</SubType>
     201    </Compile>
     202    <Compile Include="Classification\DiscriminantFunctionClassificationModelView.Designer.cs">
     203      <DependentUpon>DiscriminantFunctionClassificationModelView.cs</DependentUpon>
     204    </Compile>
    187205    <Compile Include="Clustering\ClusteringSolutionVisualizationView.cs">
    188206      <SubType>UserControl</SubType>
    … …  
    191209      <DependentUpon>ClusteringSolutionVisualizationView.cs</DependentUpon>
    192210    </Compile>
     211    <Compile Include="FeatureCorrelation\AbstractFeatureCorrelationView.cs">
     212      <SubType>UserControl</SubType>
     213    </Compile>
     214    <Compile Include="FeatureCorrelation\AbstractFeatureCorrelationView.Designer.cs">
     215      <DependentUpon>AbstractFeatureCorrelationView.cs</DependentUpon>
     216    </Compile>
    193217    <Compile Include="Classification\ClassificationEnsembleSolutionConfidenceAccuracyDependence.cs">
    194218      <SubType>UserControl</SubType>
    … …  
    209233      <DependentUpon>DataAnalysisSolutionEvaluationView.cs</DependentUpon>
    210234    </Compile>
     235    <Compile Include="FeatureCorrelation\FeatureCorrelationCalculator.cs" />
     236    <Compile Include="FeatureCorrelation\FeatureCorrelationEnums.cs" />
     237    <Compile Include="FeatureCorrelation\VariableVisibilityDialog.cs">
     238      <SubType>Form</SubType>
     239    </Compile>
     240    <Compile Include="FeatureCorrelation\VariableVisibilityDialog.Designer.cs">
     241      <DependentUpon>VariableVisibilityDialog.cs</DependentUpon>
     242    </Compile>
     243    <Compile Include="FeatureCorrelation\FeatureCorrelationView.cs">
     244      <SubType>UserControl</SubType>
     245    </Compile>
     246    <Compile Include="FeatureCorrelation\FeatureCorrelationView.Designer.cs">
     247      <DependentUpon>FeatureCorrelationView.cs</DependentUpon>
     248    </Compile>
     249    <Compile Include="FeatureCorrelation\FeatureCorrelationCache.cs" />
     250    <Compile Include="FeatureCorrelation\FeatureCorrelationTimeframeCache.cs" />
    211251    <Compile Include="Plugin.cs" />
     252    <Compile Include="ProblemDataView.cs">
     253      <SubType>UserControl</SubType>
     254    </Compile>
     255    <Compile Include="ProblemDataView.Designer.cs">
     256      <DependentUpon>ProblemDataView.cs</DependentUpon>
     257    </Compile>
     258    <Compile Include="Regression\RegressionFeatureCorrelationView.cs">
     259      <SubType>UserControl</SubType>
     260    </Compile>
     261    <Compile Include="Regression\RegressionFeatureCorrelationView.Designer.cs">
     262      <DependentUpon>RegressionFeatureCorrelationView.cs</DependentUpon>
     263    </Compile>
     264    <Compile Include="Regression\RegressionTimeframeFeatureCorrelationView.cs">
     265      <SubType>UserControl</SubType>
     266    </Compile>
     267    <Compile Include="Regression\RegressionTimeframeFeatureCorrelationView.Designer.cs">
     268      <DependentUpon>RegressionTimeframeFeatureCorrelationView.cs</DependentUpon>
     269    </Compile>
    212270    <Compile Include="Regression\RegressionEnsembleSolutionModelView.cs">
    213271      <SubType>UserControl</SubType>
    … …  
    337395    <Compile Include="Solution Views\RegressionSolutionView.Designer.cs">
    338396      <DependentUpon>RegressionSolutionView.cs</DependentUpon>
     397    </Compile>
     398    <Compile Include="FeatureCorrelation\TimeframeFeatureCorrelationView.cs">
     399      <SubType>UserControl</SubType>
     400    </Compile>
     401    <Compile Include="FeatureCorrelation\TimeframeFeatureCorrelationView.Designer.cs">
     402      <DependentUpon>TimeframeFeatureCorrelationView.cs</DependentUpon>
     403    </Compile>
     404    <Compile Include="Solution Views\TimeSeriesPrognosisSolutionView.cs">
     405      <SubType>UserControl</SubType>
     406    </Compile>
     407    <Compile Include="Solution Views\TimeSeriesPrognosisSolutionView.Designer.cs">
     408      <DependentUpon>TimeSeriesPrognosisSolutionView.cs</DependentUpon>
     409    </Compile>
     410    <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisResultsView.cs">
     411      <SubType>UserControl</SubType>
     412    </Compile>
     413    <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisResultsView.Designer.cs">
     414      <DependentUpon>TimeSeriesPrognosisResultsView.cs</DependentUpon>
     415    </Compile>
     416    <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisSolutionErrorCharacteristicsCurveView.cs">
     417      <SubType>UserControl</SubType>
     418    </Compile>
     419    <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisSolutionErrorCharacteristicsCurveView.Designer.cs">
     420      <DependentUpon>TimeSeriesPrognosisSolutionErrorCharacteristicsCurveView.cs</DependentUpon>
    339421    </Compile>
    340422    <None Include="HeuristicLab.snk" />
    … …  
    368450  </ItemGroup>
    369451  <ItemGroup>
    370     <Folder Include="obj\" />
     452    <EmbeddedResource Include="FeatureCorrelation\AbstractFeatureCorrelationView.resx">
     453      <DependentUpon>AbstractFeatureCorrelationView.cs</DependentUpon>
     454    </EmbeddedResource>
    371455  </ItemGroup>
    372456  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    … …  
    379463  -->
    380464  <PropertyGroup>
    381     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     465    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    382466set ProjectDir=$(ProjectDir)
    383467set SolutionDir=$(SolutionDir)
    … …  
    386470call PreBuildEvent.cmd
    387471</PreBuildEvent>
     472    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     473export ProjectDir=$(ProjectDir)
     474export SolutionDir=$(SolutionDir)
     475
     476$SolutionDir/PreBuildEvent.sh
     477</PreBuildEvent>
    388478  </PropertyGroup>
    389479</Project>

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Plugin.cs.frame

    r8508 r8811  
    4747  }
    4848}
     49

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/ClassificationEnsembleSolutionView.cs

    r8297 r8811  
    2626using HeuristicLab.MainForm;
    2727using HeuristicLab.PluginInfrastructure;
    28 using HeuristicLab.Problems.DataAnalysis.Interfaces;
    2928
    3029namespace HeuristicLab.Problems.DataAnalysis.Views {

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/DataAnalysisSolutionView.cs

    r8508 r8811  
    147147    }
    148148
     149    protected override void RebuildImageList() {
     150      itemsListView.SmallImageList.Images.Clear();
     151      foreach (ListViewItem listViewItem in itemsListView.Items) {
     152        IResult result = listViewItem.Tag as IResult;
     153        Type viewType = listViewItem.Tag as Type;
     154        if (result != null) itemsListView.SmallImageList.Images.Add(result.ItemImage);
     155        else if (viewType != null && typeof(IDataAnalysisSolutionEvaluationView).IsAssignableFrom(viewType))
     156          itemsListView.SmallImageList.Images.Add(((IDataAnalysisSolutionEvaluationView)Activator.CreateInstance(viewType)).ViewImage);
     157        else itemsListView.SmallImageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.Nothing);
     158
     159        listViewItem.ImageIndex = itemsListView.SmallImageList.Images.Count - 1;
     160      }
     161    }
     162
    149163    #region drag and drop
    150164    protected override void itemsListView_DragEnter(object sender, DragEventArgs e) {

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/NamedDataAnalysisSolutionView.cs

    r7259 r8811  
    5353        contentType = Content.GetType();
    5454        panel.Controls.Clear();
    55         var viewType = MainFormManager.GetViewTypes(Content.GetType(), true).Where(t => typeof(DataAnalysisSolutionView).IsAssignableFrom(t)).FirstOrDefault();
     55        var viewType = MainFormManager.GetViewTypes(Content.GetType(), true).FirstOrDefault(t => typeof(DataAnalysisSolutionView).IsAssignableFrom(t));
    5656        if (viewType != null) {
    57           view = (DataAnalysisSolutionView)Activator.CreateInstance(viewType);
     57          view = (DataAnalysisSolutionView)MainFormManager.CreateView(viewType);
     58          view.Locked = Locked;
     59          view.ReadOnly = ReadOnly;
    5860          view.Dock = DockStyle.Fill;
    5961          view.Content = Content;

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs

    r8508 r8811  
    193193      if (values == null) throw new ArgumentException("The varialbe " + variableName + " is not a double variable.");
    194194
    195       foreach (int index in rows)
    196         yield return values[index];
     195      return rows.Select(index => values[index]);
    197196    }
    198197

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r8508 r8811  
    9393  </PropertyGroup>
    9494  <ItemGroup>
     95    <Reference Include="ALGLIB-3.6.0, Version=3.6.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     96      <HintPath>>..\..\..\..\trunk\sources\bin\ALGLIB-3.6.0.dll</HintPath>
     97      <Private>False</Private>
     98    </Reference>
     99    <Reference Include="HeuristicLab.ALGLIB-3.6.0, Version=3.6.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     100      <HintPath>>..\..\..\..\trunk\sources\bin\HeuristicLab.ALGLIB-3.6.0.dll</HintPath>
     101      <Private>False</Private>
     102    </Reference>
    95103    <Reference Include="HeuristicLab.Collections-3.3">
    96104      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    … …  
    147155  </ItemGroup>
    148156  <ItemGroup>
     157    <Compile Include="DatasetExtensions.cs" />
    149158    <Compile Include="DoubleLimit.cs" />
    150159    <Compile Include="Implementation\Classification\ClassificationEnsembleModel.cs">
    … …  
    175184    </Compile>
    176185    <Compile Include="Implementation\Regression\RegressionEnsembleSolution.cs" />
     186    <Compile Include="Implementation\TimeSeriesPrognosis\Models\ConstantTimeSeriesPrognosisModel.cs" />
     187    <Compile Include="Implementation\TimeSeriesPrognosis\Models\TimeSeriesPrognosisAutoRegressiveModel.cs" />
     188    <Compile Include="Implementation\TimeSeriesPrognosis\TimeSeriesPrognosisProblem.cs" />
     189    <Compile Include="Implementation\TimeSeriesPrognosis\TimeSeriesPrognosisProblemData.cs" />
     190    <Compile Include="Implementation\TimeSeriesPrognosis\TimeSeriesPrognosisResults.cs" />
     191    <Compile Include="Implementation\TimeSeriesPrognosis\TimeSeriesPrognosisSolution.cs" />
     192    <Compile Include="Implementation\TimeSeriesPrognosis\TimeSeriesPrognosisSolutionBase.cs" />
    177193    <Compile Include="Interfaces\Classification\IClassificationEnsembleModel.cs">
    178194      <SubType>Code</SubType>
    … …  
    188204    <Compile Include="Interfaces\Regression\IRegressionEnsembleSolution.cs" />
    189205    <Compile Include="Implementation\Regression\RegressionSolutionBase.cs" />
     206    <Compile Include="Interfaces\TimeSeriesPrognosis\IOnlineTimeSeriesCalculator.cs" />
     207    <Compile Include="Interfaces\TimeSeriesPrognosis\ITimeSeriesPrognosisModel.cs" />
     208    <Compile Include="Interfaces\TimeSeriesPrognosis\ITimeSeriesPrognosisProblem.cs" />
     209    <Compile Include="Interfaces\TimeSeriesPrognosis\ITimeSeriesPrognosisProblemData.cs" />
     210    <Compile Include="Interfaces\TimeSeriesPrognosis\ITimeSeriesPrognosisSolution.cs" />
     211    <Compile Include="OnlineCalculators\AutoCorrelationCalculator.cs" />
     212    <Compile Include="OnlineCalculators\OnlineBoundedMeanSquaredErrorCalculator.cs" />
    190213    <Compile Include="OnlineCalculators\HoeffdingsDependenceCalculator.cs" />
     214    <Compile Include="OnlineCalculators\OnlineDirectionalSymmetryCalculator.cs" />
    191215    <Compile Include="OnlineCalculators\OnlineMaxAbsoluteErrorCalculator.cs" />
    192216    <Compile Include="OnlineCalculators\OnlineMeanErrorCalculator.cs" />
    … …  
    227251    <Compile Include="OnlineCalculators\OnlinePearsonsRSquaredCalculator.cs" />
    228252    <Compile Include="Implementation\Regression\RegressionSolution.cs" />
     253    <Compile Include="OnlineCalculators\OnlineTheilsUStatisticCalculator.cs" />
     254    <Compile Include="OnlineCalculators\OnlineWeightedDirectionalSymmetryCalculator.cs" />
     255    <Compile Include="OnlineCalculators\SpearmansRankCorrelationCoefficientCalculator.cs" />
    229256    <Compile Include="Plugin.cs" />
    230257    <Compile Include="Implementation\Classification\ThresholdCalculators\AccuracyMaximizationThresholdCalculator.cs" />
    … …  
    256283  </ItemGroup>
    257284  <ItemGroup />
     285  <ItemGroup />
    258286  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    259287  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    … …  
    265293  -->
    266294  <PropertyGroup>
    267     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     295    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    268296set ProjectDir=$(ProjectDir)
    269297set SolutionDir=$(SolutionDir)
    … …  
    272300call PreBuildEvent.cmd
    273301</PreBuildEvent>
     302    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     303export ProjectDir=$(ProjectDir)
     304export SolutionDir=$(SolutionDir)
     305
     306$SolutionDir/PreBuildEvent.sh
     307</PreBuildEvent>
    274308  </PropertyGroup>
    275309</Project>

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleSolution.cs

    r8534 r8811  
    2828using HeuristicLab.Data;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.Problems.DataAnalysis.Interfaces;
    3130
    3231namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    3736  [Item("Classification Ensemble Solution", "A classification solution that contains an ensemble of multiple classification models")]
    3837  [Creatable("Data Analysis - Ensembles")]
    39   public sealed class ClassificationEnsembleSolution : ClassificationSolution, IClassificationEnsembleSolution {
     38  public sealed class ClassificationEnsembleSolution : ClassificationSolutionBase, IClassificationEnsembleSolution {
     39    private readonly Dictionary<int, double> trainingEvaluationCache = new Dictionary<int, double>();
     40    private readonly Dictionary<int, double> testEvaluationCache = new Dictionary<int, double>();
     41    private readonly Dictionary<int, double> evaluationCache = new Dictionary<int, double>();
     42
    4043    public new IClassificationEnsembleModel Model {
    4144      get { return (IClassificationEnsembleModel)base.Model; }
    … …  
    162165    }
    163166
    164     protected override void RecalculateResults() {
    165       weightCalculator.CalculateNormalizedWeights(classificationSolutions.CheckedItems);
    166       CalculateResults();
    167     }
    168167
    169168    #region Evaluation
     169    public override IEnumerable<double> EstimatedClassValues {
     170      get { return GetEstimatedClassValues(Enumerable.Range(0, ProblemData.Dataset.Rows)); }
     171    }
     172
    170173    public override IEnumerable<double> EstimatedTrainingClassValues {
    171174      get {
    … …  
    258261    }
    259262
     263    protected override void RecalculateResults() {
     264      weightCalculator.CalculateNormalizedWeights(classificationSolutions.CheckedItems);
     265      base.RecalculateResults();
     266    }
     267
    260268    private void AddClassificationSolution(IClassificationSolution solution) {
    261269      if (Model.Models.Contains(solution.Model)) throw new ArgumentException();

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

    r8534 r8811  
    223223    }
    224224
    225     private List<double> classValues;
    226     public List<double> ClassValues {
     225    private List<double> classValuesCache;
     226    private List<double> ClassValuesCache {
    227227      get {
    228         if (classValues == null) {
    229           classValues = Dataset.GetDoubleValues(TargetVariableParameter.Value.Value).Distinct().ToList();
    230           classValues.Sort();
     228        if (classValuesCache == null) {
     229          classValuesCache = Dataset.GetDoubleValues(TargetVariableParameter.Value.Value).Distinct().OrderBy(x => x).ToList();
    231230        }
    232         return classValues;
     231        return classValuesCache;
    233232      }
    234233    }
    235     IEnumerable<double> IClassificationProblemData.ClassValues {
    236       get { return ClassValues; }
    237     }
    238 
     234    public IEnumerable<double> ClassValues {
     235      get { return ClassValuesCache; }
     236    }
    239237    public int Classes {
    240       get { return ClassValues.Count; }
    241     }
    242 
    243     private List<string> classNames;
    244     public List<string> ClassNames {
     238      get { return ClassValuesCache.Count; }
     239    }
     240
     241    private List<string> classNamesCache;
     242    private List<string> ClassNamesCache {
    245243      get {
    246         if (classNames == null) {
    247           classNames = new List<string>();
     244        if (classNamesCache == null) {
     245          classNamesCache = new List<string>();
    248246          for (int i = 0; i < ClassNamesParameter.Value.Rows; i++)
    249             classNames.Add(ClassNamesParameter.Value[i, 0]);
     247            classNamesCache.Add(ClassNamesParameter.Value[i, 0]);
    250248        }
    251         return classNames;
     249        return classNamesCache;
    252250      }
    253251    }
    254     IEnumerable<string> IClassificationProblemData.ClassNames {
    255       get { return ClassNames; }
    256     }
    257 
    258     private Dictionary<Tuple<double, double>, double> classificationPenaltiesCache = new Dictionary<Tuple<double, double>, double>();
     252    public IEnumerable<string> ClassNames {
     253      get { return ClassNamesCache; }
     254    }
    259255    #endregion
    260256
    … …  
    284280      TestPartition.Start = classificationProblemData.TestPartition.Start;
    285281      TestPartition.End = classificationProblemData.TestPartition.End;
     282
     283      for (int i = 0; i < classificationProblemData.ClassNames.Count(); i++)
     284        ClassNamesParameter.Value[i, 0] = classificationProblemData.ClassNames.ElementAt(i);
     285
     286      for (int i = 0; i < Classes; i++) {
     287        for (int j = 0; j < Classes; j++) {
     288          ClassificationPenaltiesParameter.Value[i, j] = classificationProblemData.GetClassificationPenalty(ClassValuesCache[i], ClassValuesCache[j]);
     289        }
     290      }
    286291    }
    287292
    … …  
    295300      Parameters.Add(new FixedValueParameter<DoubleMatrix>(ClassificationPenaltiesParameterName, ""));
    296301
     302      RegisterParameterEvents();
    297303      ResetTargetVariableDependentMembers();
    298       RegisterParameterEvents();
    299304    }
    300305
    … …  
    319324      DeregisterParameterEvents();
    320325
    321       classNames = null;
    322326      ((IStringConvertibleMatrix)ClassNamesParameter.Value).Columns = 1;
    323       ((IStringConvertibleMatrix)ClassNamesParameter.Value).Rows = ClassValues.Count;
     327      ((IStringConvertibleMatrix)ClassNamesParameter.Value).Rows = ClassValuesCache.Count;
    324328      for (int i = 0; i < Classes; i++)
    325         ClassNamesParameter.Value[i, 0] = "Class " + ClassValues[i];
     329        ClassNamesParameter.Value[i, 0] = "Class " + ClassValuesCache[i];
    326330      ClassNamesParameter.Value.ColumnNames = new List<string>() { "ClassNames" };
    327331      ClassNamesParameter.Value.RowNames = ClassValues.Select(s => "ClassValue: " + s);
    328332
    329       classificationPenaltiesCache.Clear();
    330       ((ValueParameter<DoubleMatrix>)ClassificationPenaltiesParameter).ReactOnValueToStringChangedAndValueItemImageChanged = false;
    331333      ((IStringConvertibleMatrix)ClassificationPenaltiesParameter.Value).Rows = Classes;
    332334      ((IStringConvertibleMatrix)ClassificationPenaltiesParameter.Value).Columns = Classes;
    … …  
    339341        }
    340342      }
    341       ((ValueParameter<DoubleMatrix>)ClassificationPenaltiesParameter).ReactOnValueToStringChangedAndValueItemImageChanged = true;
    342343      RegisterParameterEvents();
    343344    }
    344345
    345346    public string GetClassName(double classValue) {
    346       if (!ClassValues.Contains(classValue)) throw new ArgumentException();
    347       int index = ClassValues.IndexOf(classValue);
    348       return ClassNames[index];
     347      if (!ClassValuesCache.Contains(classValue)) throw new ArgumentException();
     348      int index = ClassValuesCache.IndexOf(classValue);
     349      return ClassNamesCache[index];
    349350    }
    350351    public double GetClassValue(string className) {
    351       if (!ClassNames.Contains(className)) throw new ArgumentException();
    352       int index = ClassNames.IndexOf(className);
    353       return ClassValues[index];
     352      if (!ClassNamesCache.Contains(className)) throw new ArgumentException();
     353      int index = ClassNamesCache.IndexOf(className);
     354      return ClassValuesCache[index];
    354355    }
    355356    public void SetClassName(double classValue, string className) {
    356       if (!classValues.Contains(classValue)) throw new ArgumentException();
    357       int index = ClassValues.IndexOf(classValue);
    358       ClassNames[index] = className;
     357      if (!ClassValuesCache.Contains(classValue)) throw new ArgumentException();
     358      int index = ClassValuesCache.IndexOf(classValue);
    359359      ClassNamesParameter.Value[index, 0] = className;
     360      // updating of class names cache is not necessary here as the parameter value fires a changed event which updates the cache
    360361    }
    361362
    … …  
    364365    }
    365366    public double GetClassificationPenalty(double correctClassValue, double estimatedClassValue) {
    366       var key = Tuple.Create(correctClassValue, estimatedClassValue);
    367       if (!classificationPenaltiesCache.ContainsKey(key)) {
    368         int correctClassIndex = ClassValues.IndexOf(correctClassValue);
    369         int estimatedClassIndex = ClassValues.IndexOf(estimatedClassValue);
    370         classificationPenaltiesCache[key] = ClassificationPenaltiesParameter.Value[correctClassIndex, estimatedClassIndex];
    371       }
    372       return classificationPenaltiesCache[key];
     367      int correctClassIndex = ClassValuesCache.IndexOf(correctClassValue);
     368      int estimatedClassIndex = ClassValuesCache.IndexOf(estimatedClassValue);
     369      return ClassificationPenaltiesParameter.Value[correctClassIndex, estimatedClassIndex];
    373370    }
    374371    public void SetClassificationPenalty(string correctClassName, string estimatedClassName, double penalty) {
    … …  
    376373    }
    377374    public void SetClassificationPenalty(double correctClassValue, double estimatedClassValue, double penalty) {
    378       var key = Tuple.Create(correctClassValue, estimatedClassValue);
    379       int correctClassIndex = ClassValues.IndexOf(correctClassValue);
    380       int estimatedClassIndex = ClassValues.IndexOf(estimatedClassValue);
     375      int correctClassIndex = ClassValuesCache.IndexOf(correctClassValue);
     376      int estimatedClassIndex = ClassValuesCache.IndexOf(estimatedClassValue);
    381377
    382378      ClassificationPenaltiesParameter.Value[correctClassIndex, estimatedClassIndex] = penalty;
    … …  
    387383      TargetVariableParameter.ValueChanged += new EventHandler(TargetVariableParameter_ValueChanged);
    388384      ClassNamesParameter.Value.Reset += new EventHandler(Parameter_ValueChanged);
    389       ClassNamesParameter.Value.ItemChanged += new EventHandler<EventArgs<int, int>>(MatrixParameter_ItemChanged);
     385      ClassNamesParameter.Value.ItemChanged += new EventHandler<EventArgs<int, int>>(Parameter_ValueChanged);
     386      ClassificationPenaltiesParameter.Value.ItemChanged += new EventHandler<EventArgs<int, int>>(Parameter_ValueChanged);
    390387      ClassificationPenaltiesParameter.Value.Reset += new EventHandler(Parameter_ValueChanged);
    391       ClassificationPenaltiesParameter.Value.ItemChanged += new EventHandler<EventArgs<int, int>>(MatrixParameter_ItemChanged);
    392388    }
    393389    private void DeregisterParameterEvents() {
    394390      TargetVariableParameter.ValueChanged -= new EventHandler(TargetVariableParameter_ValueChanged);
    395391      ClassNamesParameter.Value.Reset -= new EventHandler(Parameter_ValueChanged);
    396       ClassNamesParameter.Value.ItemChanged -= new EventHandler<EventArgs<int, int>>(MatrixParameter_ItemChanged);
     392      ClassNamesParameter.Value.ItemChanged -= new EventHandler<EventArgs<int, int>>(Parameter_ValueChanged);
     393      ClassificationPenaltiesParameter.Value.ItemChanged -= new EventHandler<EventArgs<int, int>>(Parameter_ValueChanged);
    397394      ClassificationPenaltiesParameter.Value.Reset -= new EventHandler(Parameter_ValueChanged);
    398       ClassificationPenaltiesParameter.Value.ItemChanged -= new EventHandler<EventArgs<int, int>>(MatrixParameter_ItemChanged);
    399395    }
    400396
    401397    private void TargetVariableParameter_ValueChanged(object sender, EventArgs e) {
    402       classValues = null;
     398      classValuesCache = null;
     399      classNamesCache = null;
    403400      ResetTargetVariableDependentMembers();
    404401      OnChanged();
    405402    }
    406403    private void Parameter_ValueChanged(object sender, EventArgs e) {
    407       OnChanged();
    408     }
    409     private void MatrixParameter_ItemChanged(object sender, EventArgs<int, int> e) {
     404      classNamesCache = null;
     405      ClassificationPenaltiesParameter.Value.RowNames = ClassNames.Select(name => "Actual " + name);
     406      ClassificationPenaltiesParameter.Value.ColumnNames = ClassNames.Select(name => "Estimated " + name);
    410407      OnChanged();
    411408    }

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolution.cs

    r8508 r8811  
    4545      : base(model, problemData) {
    4646      evaluationCache = new Dictionary<int, double>(problemData.Dataset.Rows);
     47      CalculateClassificationResults();
    4748    }
    4849

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolutionBase.cs

    r8508 r8811  
    8585    }
    8686
    87     protected void CalculateResults() {
     87    protected void CalculateClassificationResults() {
    8888      double[] estimatedTrainingClassValues = EstimatedTrainingClassValues.ToArray(); // cache values
    8989      double[] originalTrainingClassValues = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndices).ToArray();
    … …  
    114114
    115115    public abstract IEnumerable<double> GetEstimatedClassValues(IEnumerable<int> rows);
     116
     117    protected override void RecalculateResults() {
     118      CalculateClassificationResults();
     119    }
    116120  }
    117121}

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationModel.cs

    r7259 r8811  
    3333  [StorableClass]
    3434  [Item("DiscriminantFunctionClassificationModel", "Represents a classification model that uses a discriminant function and classification thresholds.")]
    35   public abstract class DiscriminantFunctionClassificationModel : NamedItem, IDiscriminantFunctionClassificationModel {
     35  public class DiscriminantFunctionClassificationModel : NamedItem, IDiscriminantFunctionClassificationModel {
    3636    [Storable]
    3737    private IRegressionModel model;
     38    public IRegressionModel Model {
     39      get { return model; }
     40      private set { model = value; }
     41    }
    3842
    3943    [Storable]
    … …  
    5155    }
    5256
     57    private IDiscriminantFunctionThresholdCalculator thresholdCalculator;
     58    [Storable]
     59    public IDiscriminantFunctionThresholdCalculator ThresholdCalculator {
     60      get { return thresholdCalculator; }
     61      private set { thresholdCalculator = value; }
     62    }
     63
    5364
    5465    [StorableConstructor]
    … …  
    6172    }
    6273
    63     public DiscriminantFunctionClassificationModel(IRegressionModel model)
     74    public DiscriminantFunctionClassificationModel(IRegressionModel model, IDiscriminantFunctionThresholdCalculator thresholdCalculator)
    6475      : base() {
    6576      this.name = ItemName;
    6677      this.description = ItemDescription;
    6778      this.model = model;
    68       this.classValues = new double[] { 0.0 };
    69       this.thresholds = new double[] { double.NegativeInfinity };
     79      this.classValues = new double[0];
     80      this.thresholds = new double[0];
     81      this.thresholdCalculator = thresholdCalculator;
     82    }
     83
     84    [StorableHook(HookType.AfterDeserialization)]
     85    private void AfterDeserialization() {
     86      if (ThresholdCalculator == null) ThresholdCalculator = new AccuracyMaximizationThresholdCalculator();
     87    }
     88
     89    public override IDeepCloneable Clone(Cloner cloner) {
     90      return new DiscriminantFunctionClassificationModel(this, cloner);
    7091    }
    7192
    … …  
    80101    }
    81102
     103    public virtual void RecalculateModelParameters(IClassificationProblemData problemData, IEnumerable<int> rows) {
     104      double[] classValues;
     105      double[] thresholds;
     106      var targetClassValues = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, rows);
     107      var estimatedTrainingValues = GetEstimatedValues(problemData.Dataset, rows);
     108      thresholdCalculator.Calculate(problemData, estimatedTrainingValues, targetClassValues, out classValues, out thresholds);
     109      SetThresholdsAndClassValues(thresholds, classValues);
     110    }
     111
     112
    82113    public IEnumerable<double> GetEstimatedValues(Dataset dataset, IEnumerable<int> rows) {
    83114      return model.GetEstimatedValues(dataset, rows);
    … …  
    85116
    86117    public IEnumerable<double> GetEstimatedClassValues(Dataset dataset, IEnumerable<int> rows) {
     118      if (!Thresholds.Any() && !ClassValues.Any()) throw new ArgumentException("No thresholds and class values were set for the current classification model.");
    87119      foreach (var x in GetEstimatedValues(dataset, rows)) {
    88120        int classIndex = 0;
    … …  
    103135    #endregion
    104136
    105     public abstract IDiscriminantFunctionClassificationSolution CreateDiscriminantFunctionClassificationSolution(IClassificationProblemData problemData);
    106     public abstract IClassificationSolution CreateClassificationSolution(IClassificationProblemData problemData);
     137    public virtual IDiscriminantFunctionClassificationSolution CreateDiscriminantFunctionClassificationSolution(IClassificationProblemData problemData) {
     138      return new DiscriminantFunctionClassificationSolution(this, problemData);
     139    }
     140
     141    public virtual IClassificationSolution CreateClassificationSolution(IClassificationProblemData problemData) {
     142      return CreateDiscriminantFunctionClassificationSolution(problemData);
     143    }
    107144  }
    108145}

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationSolution.cs

    r8534 r8811  
    3232  [StorableClass]
    3333  [Item("DiscriminantFunctionClassificationSolution", "Represents a classification solution that uses a discriminant function and classification thresholds.")]
    34   public abstract class DiscriminantFunctionClassificationSolution : DiscriminantFunctionClassificationSolutionBase {
     34  public class DiscriminantFunctionClassificationSolution : DiscriminantFunctionClassificationSolutionBase {
    3535    protected readonly Dictionary<int, double> valueEvaluationCache;
    3636    protected readonly Dictionary<int, double> classValueEvaluationCache;
    … …  
    4747      classValueEvaluationCache = new Dictionary<int, double>(original.classValueEvaluationCache);
    4848    }
    49     protected DiscriminantFunctionClassificationSolution(IDiscriminantFunctionClassificationModel model, IClassificationProblemData problemData)
     49    public DiscriminantFunctionClassificationSolution(IDiscriminantFunctionClassificationModel model, IClassificationProblemData problemData)
    5050      : base(model, problemData) {
    5151      valueEvaluationCache = new Dictionary<int, double>();
    5252      classValueEvaluationCache = new Dictionary<int, double>();
     53      CalculateRegressionResults();
     54      CalculateClassificationResults();
     55    }
     56
     57    public override IDeepCloneable Clone(Cloner cloner) {
     58      return new DiscriminantFunctionClassificationSolution(this, cloner);
    5359    }
    5460

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationSolutionBase.cs

    r8534 r8811  
    8585      Add(new Result(TrainingRSquaredResultName, "Squared Pearson's correlation coefficient of the model output and the actual values on the training partition", new DoubleValue()));
    8686      Add(new Result(TestRSquaredResultName, "Squared Pearson's correlation coefficient of the model output and the actual values on the test partition", new DoubleValue()));
    87 
    8887      RegisterEventHandler();
    8988    }
    … …  
    9291    private void AfterDeserialization() {
    9392      RegisterEventHandler();
    94     }
    95 
    96     protected override void OnModelChanged() {
    97       DeregisterEventHandler();
    98       RegisterEventHandler();
    99       base.OnModelChanged();
    10093    }
    10194
    … …  
    137130
    138131    protected virtual void OnModelThresholdsChanged(EventArgs e) {
    139       CalculateResults();
    140       CalculateRegressionResults();
     132      OnModelChanged();
    141133    }
    142134
    … …  
    146138
    147139    public abstract IEnumerable<double> GetEstimatedValues(IEnumerable<int> rows);
     140
     141    protected override void RecalculateResults() {
     142      base.RecalculateResults();
     143      CalculateRegressionResults();
     144    }
    148145  }
    149146}

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ThresholdCalculators/AccuracyMaximizationThresholdCalculator.cs

    r8508 r8811  
    5353
    5454    public static void CalculateThresholds(IClassificationProblemData problemData, IEnumerable<double> estimatedValues, IEnumerable<double> targetClassValues, out double[] classValues, out double[] thresholds) {
    55       int slices = 100;
    56       double minThresholdInc = 10e-5; // necessary to prevent infinite loop when maxEstimated - minEstimated is effectively zero (constant model)
     55      const int slices = 100;
     56      const double minThresholdInc = 10e-5; // necessary to prevent infinite loop when maxEstimated - minEstimated is effectively zero (constant model)
    5757      List<double> estimatedValuesList = estimatedValues.ToList();
    5858      double maxEstimatedValue = estimatedValuesList.Max();
    … …  
    6161      var estimatedAndTargetValuePairs =
    6262        estimatedValuesList.Zip(targetClassValues, (x, y) => new { EstimatedValue = x, TargetClassValue = y })
    63         .OrderBy(x => x.EstimatedValue)
    64         .ToList();
     63        .OrderBy(x => x.EstimatedValue).ToList();
    6564
    66       classValues = problemData.ClassValues.OrderBy(x => x).ToArray();
     65      classValues = estimatedAndTargetValuePairs.GroupBy(x => x.TargetClassValue)
     66        .Select(x => new { Median = x.Select(y => y.EstimatedValue).Median(), Class = x.Key })
     67        .OrderBy(x => x.Median).Select(x => x.Class).ToArray();
     68
    6769      int nClasses = classValues.Length;
    6870      thresholds = new double[nClasses];
    6971      thresholds[0] = double.NegativeInfinity;
    70       // thresholds[thresholds.Length - 1] = double.PositiveInfinity;
    7172
    7273      // incrementally calculate accuracy of all possible thresholds
    … …  
    8586            //all positives
    8687            if (pair.TargetClassValue.IsAlmost(classValues[i - 1])) {
    87               if (pair.EstimatedValue > lowerThreshold && pair.EstimatedValue < actualThreshold)
     88              if (pair.EstimatedValue > lowerThreshold && pair.EstimatedValue <= actualThreshold)
    8889                //true positive
    89                 classificationScore += problemData.GetClassificationPenalty(classValues[i - 1], classValues[i - 1]);
     90                classificationScore += problemData.GetClassificationPenalty(pair.TargetClassValue, pair.TargetClassValue);
    9091              else
    9192                //false negative
    92                 classificationScore += problemData.GetClassificationPenalty(classValues[i], classValues[i - 1]);
     93                classificationScore += problemData.GetClassificationPenalty(pair.TargetClassValue, classValues[i]);
    9394            }
    9495              //all negatives
    9596            else {
    96               if (pair.EstimatedValue > lowerThreshold && pair.EstimatedValue < actualThreshold)
    97                 //false positive
    98                 classificationScore += problemData.GetClassificationPenalty(classValues[i - 1], classValues[i]);
    99               else
    100                 //true negative, consider only upper class
    101                 classificationScore += problemData.GetClassificationPenalty(classValues[i], classValues[i]);
     97              //false positive
     98              if (pair.EstimatedValue > lowerThreshold && pair.EstimatedValue <= actualThreshold)
     99                classificationScore += problemData.GetClassificationPenalty(pair.TargetClassValue, classValues[i - 1]);
     100              else if (pair.EstimatedValue <= lowerThreshold)
     101                classificationScore += problemData.GetClassificationPenalty(pair.TargetClassValue, classValues[i - 2]);
     102              else if (pair.EstimatedValue > actualThreshold) {
     103                if (pair.TargetClassValue < classValues[i - 1]) //negative in wrong class, consider upper class
     104                  classificationScore += problemData.GetClassificationPenalty(pair.TargetClassValue, classValues[i]);
     105                else //true negative, must be optimized by the other thresholds
     106                  classificationScore += problemData.GetClassificationPenalty(pair.TargetClassValue, pair.TargetClassValue);
     107              }
    102108            }
    103109          }

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ThresholdCalculators/NormalDistributionCutPointsThresholdCalculator.cs

    r7259 r8811  
    5353
    5454    public static void CalculateThresholds(IClassificationProblemData problemData, IEnumerable<double> estimatedValues, IEnumerable<double> targetClassValues, out double[] classValues, out double[] thresholds) {
    55       double maxEstimatedValue = estimatedValues.Max();
    56       double minEstimatedValue = estimatedValues.Min();
    5755      var estimatedTargetValues = Enumerable.Zip(estimatedValues, targetClassValues, (e, t) => new { EstimatedValue = e, TargetValue = t }).ToList();
     56      double estimatedValuesRange = estimatedValues.Range();
    5857
    5958      Dictionary<double, double> classMean = new Dictionary<double, double>();
    … …  
    8281          // calculate all thresholds
    8382          CalculateCutPoints(classMean[class0], classStdDev[class0], classMean[class1], classStdDev[class1], out x1, out x2);
    84           if (!thresholdList.Any(x => x.IsAlmost(x1))) thresholdList.Add(x1);
    85           if (!thresholdList.Any(x => x.IsAlmost(x2))) thresholdList.Add(x2);
     83
     84          // if the two cut points are too close (for instance because the stdDev=0)
     85          // then move them by 0.1% of the range of estimated values
     86          if (x1.IsAlmost(x2)) {
     87            x1 -= 0.001 * estimatedValuesRange;
     88            x2 += 0.001 * estimatedValuesRange;
     89          }
     90          if (!double.IsInfinity(x1) && !thresholdList.Any(x => x.IsAlmost(x1))) thresholdList.Add(x1);
     91          if (!double.IsInfinity(x2) && !thresholdList.Any(x => x.IsAlmost(x2))) thresholdList.Add(x2);
    8692        }
    8793      }
    8894      thresholdList.Sort();
    89       thresholdList.Insert(0, double.NegativeInfinity);
     95
     96      // add small value and large value for the calculation of most influential class in each thresholded section
     97      thresholdList.Insert(0, estimatedValues.Min() - 1);
     98      thresholdList.Add(estimatedValues.Max() + 1);
    9099
    91100      // determine class values for each partition separated by a threshold by calculating the density of all class distributions
    92101      // all points in the partition are classified as the class with the maximal density in the parition
    93102      List<double> classValuesList = new List<double>();
    94       for (int i = 0; i < thresholdList.Count; i++) {
    95         double m;
    96         if (double.IsNegativeInfinity(thresholdList[i])) {
    97           m = thresholdList[i + 1] - 1.0; // smaller than the smalles non-infinity threshold
    98         } else if (i == thresholdList.Count - 1) {
    99           // last threshold
    100           m = thresholdList[i] + 1.0; // larger than the last threshold
    101         } else {
    102           m = thresholdList[i] + (thresholdList[i + 1] - thresholdList[i]) / 2.0; // middle of partition
     103      if (thresholdList.Count == 2) {
     104        // this happens if there are no thresholds (distributions for all classes are exactly the same)
     105        // -> all samples should be classified as the first class
     106        classValuesList.Add(originalClasses[0]);
     107      } else {
     108        // at least one reasonable threshold ...
     109        // find the most likely class for the points between thresholds m
     110        for (int i = 0; i < thresholdList.Count - 1; i++) {
     111
     112          // determine class with maximal density mass between the thresholds
     113          double maxDensity = LogNormalDensityMass(thresholdList[i], thresholdList[i + 1], classMean[originalClasses[0]], classStdDev[originalClasses[0]]);
     114          double maxDensityClassValue = originalClasses[0];
     115          foreach (var classValue in originalClasses.Skip(1)) {
     116            double density = LogNormalDensityMass(thresholdList[i], thresholdList[i + 1], classMean[classValue], classStdDev[classValue]);
     117            if (density > maxDensity) {
     118              maxDensity = density;
     119              maxDensityClassValue = classValue;
     120            }
     121          }
     122          classValuesList.Add(maxDensityClassValue);
    103123        }
    104 
    105         // determine class with maximal probability density in m
    106         double maxDensity = double.MinValue;
    107         double maxDensityClassValue = -1;
    108         foreach (var classValue in originalClasses) {
    109           double density = NormalDensity(m, classMean[classValue], classStdDev[classValue]);
    110           if (density > maxDensity) {
    111             maxDensity = density;
    112             maxDensityClassValue = classValue;
    113           }
    114         }
    115         classValuesList.Add(maxDensityClassValue);
    116124      }
    117125
    … …  
    125133      //    /   / /\s  \ \     
    126134      //  -/---/-/ -\---\-\----
     135
    127136      List<double> filteredThresholds = new List<double>();
    128137      List<double> filteredClassValues = new List<double>();
    129       filteredThresholds.Add(thresholdList[0]);
     138      filteredThresholds.Add(double.NegativeInfinity); // the smallest possible threshold for the first class
    130139      filteredClassValues.Add(classValuesList[0]);
     140      // do not include the last threshold which was just needed for the previous step
    131141      for (int i = 0; i < classValuesList.Count - 1; i++) {
    132         if (classValuesList[i] != classValuesList[i + 1]) {
     142        if (!classValuesList[i].IsAlmost(classValuesList[i + 1])) {
    133143          filteredThresholds.Add(thresholdList[i + 1]);
    134144          filteredClassValues.Add(classValuesList[i + 1]);
    … …  
    139149    }
    140150
    141     private static double NormalDensity(double x, double mu, double sigma) {
     151    private static double LogNormalDensityMass(double lower, double upper, double mu, double sigma) {
    142152      if (sigma.IsAlmost(0.0)) {
    143         if (x.IsAlmost(mu)) return 1.0; else return 0.0;
    144       } else {
    145         return (1.0 / Math.Sqrt(2.0 * Math.PI * sigma * sigma)) * Math.Exp(-((x - mu) * (x - mu)) / (2.0 * sigma * sigma));
     153        if (lower < mu && mu < upper) return double.PositiveInfinity; // log(1)
     154        else return double.NegativeInfinity; // log(0)
    146155      }
     156
     157      Func<double, double> f = (x) =>
     158        x * -0.5 * Math.Log(2.0 * Math.PI * sigma * sigma) - Math.Pow(x - mu, 3) / (3 * 2.0 * sigma * sigma);
     159
     160      if (double.IsNegativeInfinity(lower)) return f(upper);
     161      else return f(upper) - f(lower);
    147162    }
    148163
    149164    private static void CalculateCutPoints(double m1, double s1, double m2, double s2, out double x1, out double x2) {
    150       double a = (s1 * s1 - s2 * s2);
    151       x1 = -(-m2 * s1 * s1 + m1 * s2 * s2 + Math.Sqrt(s1 * s1 * s2 * s2 * ((m1 - m2) * (m1 - m2) + 2.0 * (-s1 * s1 + s2 * s2) * Math.Log(s2 / s1)))) / a;
    152       x2 = (m2 * s1 * s1 - m1 * s2 * s2 + Math.Sqrt(s1 * s1 * s2 * s2 * ((m1 - m2) * (m1 - m2) + 2.0 * (-s1 * s1 + s2 * s2) * Math.Log(s2 / s1)))) / a;
     165      if (s1.IsAlmost(s2)) {
     166        if (m1.IsAlmost(m2)) {
     167          x1 = double.NegativeInfinity;
     168          x2 = double.NegativeInfinity;
     169        } else {
     170          x1 = (m1 + m2) / 2;
     171          x2 = double.NegativeInfinity;
     172        }
     173      } else if (s1.IsAlmost(0.0)) {
     174        x1 = m1;
     175        x2 = m1;
     176      } else if (s2.IsAlmost(0.0)) {
     177        x1 = m2;
     178        x2 = m2;
     179      } else {
     180        if (s2 < s1) {
     181          // make sure s2 is the larger std.dev.
     182          CalculateCutPoints(m2, s2, m1, s1, out x1, out x2);
     183        } else {
     184          double a = (s1 + s2) * (s1 - s2);
     185          double g = Math.Sqrt(s1 * s1 * s2 * s2 * ((m1 - m2) * (m1 - m2) + 2.0 * (s1 * s1 + s2 * s2) * Math.Log(s2 / s1)));
     186          double m1s2 = m1 * s2 * s2;
     187          double m2s1 = m2 * s1 * s1;
     188          x1 = -(-m2s1 + m1s2 + g) / a;
     189          x2 = (m2s1 - m1s2 + g) / a;
     190        }
     191      }
    153192    }
    154193  }

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/WeightCalculators/ClassificationWeightCalculator.cs

    r8297 r8811  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.Problems.DataAnalysis.Interfaces;
    2928
    3029namespace HeuristicLab.Problems.DataAnalysis {

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/WeightCalculators/DiscriminantClassificationWeightCalculator.cs

    r8297 r8811  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Problems.DataAnalysis.Interfaces;
    2726
    2827namespace HeuristicLab.Problems.DataAnalysis {

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblem.cs

    r7866 r8811  
    6666    }
    6767
     68    protected DataAnalysisProblem(T problemData)
     69      : this() {
     70      ProblemData = problemData;
     71    }
     72
    6873    [StorableHook(HookType.AfterDeserialization)]
    6974    private void AfterDeserialization() {

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs

    r8508 r8811  
    107107    [StorableConstructor]
    108108    protected DataAnalysisProblemData(bool deserializing) : base(deserializing) { }
     109
    109110    [StorableHook(HookType.AfterDeserialization)]
    110111    private void AfterDeserialization() {

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConstantRegressionModel.cs

    r8534 r8811  
    3030  public class ConstantRegressionModel : NamedItem, IRegressionModel {
    3131    [Storable]
    32     private double constant;
     32    protected double constant;
    3333    public double Constant {
    3434      get { return constant; }

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleSolution.cs

    r8508 r8811  
    3636  [Item("Regression Ensemble Solution", "A regression solution that contains an ensemble of multiple regression models")]
    3737  [Creatable("Data Analysis - Ensembles")]
    38   public sealed class RegressionEnsembleSolution : RegressionSolution, IRegressionEnsembleSolution {
     38  public sealed class RegressionEnsembleSolution : RegressionSolutionBase, IRegressionEnsembleSolution {
    3939    private readonly Dictionary<int, double> trainingEvaluationCache = new Dictionary<int, double>();
    4040    private readonly Dictionary<int, double> testEvaluationCache = new Dictionary<int, double>();
     41    private readonly Dictionary<int, double> evaluationCache = new Dictionary<int, double>();
    4142
    4243    public new IRegressionEnsembleModel Model {
    … …  
    155156    }
    156157
    157     protected override void RecalculateResults() {
    158       CalculateResults();
    159     }
    160 
    161158    #region Evaluation
     159    public override IEnumerable<double> EstimatedValues {
     160      get { return GetEstimatedValues(Enumerable.Range(0, ProblemData.Dataset.Rows)); }
     161    }
     162
    162163    public override IEnumerable<double> EstimatedTrainingValues {
    163164      get {

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.cs

    r7866 r8811  
    3636    public override IDeepCloneable Clone(Cloner cloner) { return new RegressionProblem(this, cloner); }
    3737
    38     public RegressionProblem()
    39       : base() {
    40       ProblemData = new RegressionProblemData();
    41     }
     38    public RegressionProblem() : base(new RegressionProblemData()) { }
     39
    4240  }
    4341}

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolution.cs

    r8508 r8811  
    4545      : base(model, problemData) {
    4646      evaluationCache = new Dictionary<int, double>(problemData.Dataset.Rows);
     47      CalculateRegressionResults();
    4748    }
    4849
    49     protected override void RecalculateResults() {
    50       CalculateResults();
    51     }
    5250
    5351    public override IEnumerable<double> EstimatedValues {

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolutionBase.cs

    r8508 r8811  
    2929  [StorableClass]
    3030  public abstract class RegressionSolutionBase : DataAnalysisSolution, IRegressionSolution {
    31     private const string TrainingMeanSquaredErrorResultName = "Mean squared error (training)";
    32     private const string TestMeanSquaredErrorResultName = "Mean squared error (test)";
    33     private const string TrainingMeanAbsoluteErrorResultName = "Mean absolute error (training)";
    34     private const string TestMeanAbsoluteErrorResultName = "Mean absolute error (test)";
    35     private const string TrainingSquaredCorrelationResultName = "Pearson's R² (training)";
    36     private const string TestSquaredCorrelationResultName = "Pearson's R² (test)";
    37     private const string TrainingRelativeErrorResultName = "Average relative error (training)";
    38     private const string TestRelativeErrorResultName = "Average relative error (test)";
    39     private const string TrainingNormalizedMeanSquaredErrorResultName = "Normalized mean squared error (training)";
    40     private const string TestNormalizedMeanSquaredErrorResultName = "Normalized mean squared error (test)";
    41     private const string TrainingMeanErrorResultName = "Mean error (training)";
    42     private const string TestMeanErrorResultName = "Mean error (test)";
     31    protected const string TrainingMeanSquaredErrorResultName = "Mean squared error (training)";
     32    protected const string TestMeanSquaredErrorResultName = "Mean squared error (test)";
     33    protected const string TrainingMeanAbsoluteErrorResultName = "Mean absolute error (training)";
     34    protected const string TestMeanAbsoluteErrorResultName = "Mean absolute error (test)";
     35    protected const string TrainingSquaredCorrelationResultName = "Pearson's R² (training)";
     36    protected const string TestSquaredCorrelationResultName = "Pearson's R² (test)";
     37    protected const string TrainingRelativeErrorResultName = "Average relative error (training)";
     38    protected const string TestRelativeErrorResultName = "Average relative error (test)";
     39    protected const string TrainingNormalizedMeanSquaredErrorResultName = "Normalized mean squared error (training)";
     40    protected const string TestNormalizedMeanSquaredErrorResultName = "Normalized mean squared error (test)";
     41    protected const string TrainingMeanErrorResultName = "Mean error (training)";
     42    protected const string TestMeanErrorResultName = "Mean error (test)";
     43
     44    protected const string TrainingMeanSquaredErrorResultDescription = "Mean of squared errors of the model on the training partition";
     45    protected const string TestMeanSquaredErrorResultDescription = "Mean of squared errors of the model on the test partition";
     46    protected const string TrainingMeanAbsoluteErrorResultDescription = "Mean of absolute errors of the model on the training partition";
     47    protected const string TestMeanAbsoluteErrorResultDescription = "Mean of absolute errors of the model on the test partition";
     48    protected const string TrainingSquaredCorrelationResultDescription = "Squared Pearson's correlation coefficient of the model output and the actual values on the training partition";
     49    protected const string TestSquaredCorrelationResultDescription = "Squared Pearson's correlation coefficient of the model output and the actual values on the test partition";
     50    protected const string TrainingRelativeErrorResultDescription = "Average of the relative errors of the model output and the actual values on the training partition";
     51    protected const string TestRelativeErrorResultDescription = "Average of the relative errors of the model output and the actual values on the test partition";
     52    protected const string TrainingNormalizedMeanSquaredErrorResultDescription = "Normalized mean of squared errors of the model on the training partition";
     53    protected const string TestNormalizedMeanSquaredErrorResultDescription = "Normalized mean of squared errors of the model on the test partition";
     54    protected const string TrainingMeanErrorResultDescription = "Mean of errors of the model on the training partition";
     55    protected const string TestMeanErrorResultDescription = "Mean of errors of the model on the test partition";
    4356
    4457    public new IRegressionModel Model {
    … …  
    115128    protected RegressionSolutionBase(IRegressionModel model, IRegressionProblemData problemData)
    116129      : base(model, problemData) {
    117       Add(new Result(TrainingMeanSquaredErrorResultName, "Mean of squared errors of the model on the training partition", new DoubleValue()));
    118       Add(new Result(TestMeanSquaredErrorResultName, "Mean of squared errors of the model on the test partition", new DoubleValue()));
    119       Add(new Result(TrainingMeanAbsoluteErrorResultName, "Mean of absolute errors of the model on the training partition", new DoubleValue()));
    120       Add(new Result(TestMeanAbsoluteErrorResultName, "Mean of absolute errors of the model on the test partition", new DoubleValue()));
    121       Add(new Result(TrainingSquaredCorrelationResultName, "Squared Pearson's correlation coefficient of the model output and the actual values on the training partition", new DoubleValue()));
    122       Add(new Result(TestSquaredCorrelationResultName, "Squared Pearson's correlation coefficient of the model output and the actual values on the test partition", new DoubleValue()));
    123       Add(new Result(TrainingRelativeErrorResultName, "Average of the relative errors of the model output and the actual values on the training partition", new PercentValue()));
    124       Add(new Result(TestRelativeErrorResultName, "Average of the relative errors of the model output and the actual values on the test partition", new PercentValue()));
    125       Add(new Result(TrainingNormalizedMeanSquaredErrorResultName, "Normalized mean of squared errors of the model on the training partition", new DoubleValue()));
    126       Add(new Result(TestNormalizedMeanSquaredErrorResultName, "Normalized mean of squared errors of the model on the test partition", new DoubleValue()));
    127       Add(new Result(TrainingMeanErrorResultName, "Mean of errors of the model on the training partition", new DoubleValue()));
    128       Add(new Result(TestMeanErrorResultName, "Mean of errors of the model on the test partition", new DoubleValue()));
     130      Add(new Result(TrainingMeanSquaredErrorResultName, TrainingMeanSquaredErrorResultDescription, new DoubleValue()));
     131      Add(new Result(TestMeanSquaredErrorResultName, TestMeanSquaredErrorResultDescription, new DoubleValue()));
     132      Add(new Result(TrainingMeanAbsoluteErrorResultName, TrainingMeanAbsoluteErrorResultDescription, new DoubleValue()));
     133      Add(new Result(TestMeanAbsoluteErrorResultName, TestMeanAbsoluteErrorResultDescription, new DoubleValue()));
     134      Add(new Result(TrainingSquaredCorrelationResultName, TrainingSquaredCorrelationResultDescription, new DoubleValue()));
     135      Add(new Result(TestSquaredCorrelationResultName, TestSquaredCorrelationResultDescription, new DoubleValue()));
     136      Add(new Result(TrainingRelativeErrorResultName, TrainingRelativeErrorResultDescription, new PercentValue()));
     137      Add(new Result(TestRelativeErrorResultName, TestRelativeErrorResultDescription, new PercentValue()));
     138      Add(new Result(TrainingNormalizedMeanSquaredErrorResultName, TrainingNormalizedMeanSquaredErrorResultDescription, new DoubleValue()));
     139      Add(new Result(TestNormalizedMeanSquaredErrorResultName, TestNormalizedMeanSquaredErrorResultDescription, new DoubleValue()));
     140      Add(new Result(TrainingMeanErrorResultName, TrainingMeanErrorResultDescription, new DoubleValue()));
     141      Add(new Result(TestMeanErrorResultName, TestMeanErrorResultDescription, new DoubleValue()));
    129142    }
    130143
    … …  
    164177    }
    165178
    166     protected void CalculateResults() {
     179    protected override void RecalculateResults() {
     180      CalculateRegressionResults();
     181    }
     182
     183    protected void CalculateRegressionResults() {
    167184      IEnumerable<double> estimatedTrainingValues = EstimatedTrainingValues; // cache values
    168185      IEnumerable<double> originalTrainingValues = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndices);

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationEnsembleSolutionWeightCalculator.cs

    r8297 r8811  
    2323using HeuristicLab.Core;
    2424
    25 namespace HeuristicLab.Problems.DataAnalysis.Interfaces {
     25namespace HeuristicLab.Problems.DataAnalysis {
    2626  public delegate bool CheckPoint(IClassificationProblemData problemData, int point);
    2727

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IDiscriminantFunctionClassificationModel.cs

    r7259 r8811  
    2626    IEnumerable<double> Thresholds { get; }
    2727    IEnumerable<double> ClassValues { get; }
     28    IDiscriminantFunctionThresholdCalculator ThresholdCalculator { get; }
     29    void RecalculateModelParameters(IClassificationProblemData problemData, IEnumerable<int> rows);
    2830    // class values and thresholds can only be assigned simultanously
    2931    void SetThresholdsAndClassValues(IEnumerable<double> thresholds, IEnumerable<double> classValues);

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/HoeffdingsDependenceCalculator.cs

    r8508 r8811  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using HeuristicLab.Common;
    2625
    2726namespace HeuristicLab.Problems.DataAnalysis {

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis/3.4/Plugin.cs.frame

    r8508 r8811  
    2828  [Plugin("HeuristicLab.Problems.DataAnalysis","Provides base classes for data analysis tasks.", "3.4.3.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis-3.4.dll", PluginFileType.Assembly)]
     30  [PluginDependency("HeuristicLab.ALGLIB","3.6")]
    3031  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3132  [PluginDependency("HeuristicLab.Common", "3.3")]
Note: See TracChangeset for help on using the changeset viewer.