Free cookie consent management tool by TermsFeed Policy Generator

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

#1776:

Location:
branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views
Files:
12 edited
16 copied

Legend:

Unmodified
Added
Removed

  • 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;
Note: See TracChangeset for help on using the changeset viewer.