Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/21/18 14:20:24 (6 years ago)
Author:
mkommend
Message:

#2904: Merged r16422 and r16423 into stable.

Location:
stable
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.DataAnalysis.Views

  • stable/HeuristicLab.Problems.DataAnalysis.Views/3.4

    • Property svn:mergeinfo set to (toggle deleted branches)
      /trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4mergedeligible
      /branches/2904_CalculateImpacts/HeuristicLab.Problems.DataAnalysis.Views/3.416029-16421
      /branches/Async/HeuristicLab.Problems.DataAnalysis.Views/3.413329-15286
      /branches/Benchmarking/sources/HeuristicLab.Problems.DataAnalysis.Views/3.46917-7005
      /branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis.Views/3.49116-13099
      /branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis.Views/3.44656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.45471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.DataAnalysis.Views/3.45815-6180
      /branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.44458-4459,​4462,​4464
      /branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Views/3.410085-11101
      /branches/DatasetFeatureCorrelation/HeuristicLab.Problems.DataAnalysis.Views/3.48036-8538
      /branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views/3.46284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Views/3.45060
      /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Views/3.411570-12508
      /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.DataAnalysis.Views/3.411130-12721
      /branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.413780-14091
      /branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.47098-8789
      /branches/NET40/sources/HeuristicLab.Problems.DataAnalysis.Views/3.45138-5162
      /branches/ParallelEngine/HeuristicLab.Problems.DataAnalysis.Views/3.45175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views/3.47568-7810
      /branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis.Views/3.46350-6627
      /branches/Restructure trunk solution/HeuristicLab.Problems.DataAnalysis.Views/3.46828
      /branches/SimplifierViewsProgress/HeuristicLab.Problems.DataAnalysis.Views/3.415318-15370
      /branches/SuccessProgressAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.45370-5682
      /branches/Trunk/HeuristicLab.Problems.DataAnalysis.Views/3.46829-6865
      /branches/VNS/HeuristicLab.Problems.DataAnalysis.Views/3.45594-5752
      /branches/histogram/HeuristicLab.Problems.DataAnalysis.Views/3.45959-6341
      /branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views/3.414232-14825
      /trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.49568,​9845,​9859-9860,​9865-9868,​9893-9896,​9900-9901,​9905,​9907,​9973-9975,​9994,​10173-10176,​10500,​10526,​10540-10541,​10543,​10545,​10941,​11031,​11093,​11114,​11116,​11156,​11214,​11367,​11623,​11631,​11634,​12137,​12151-12152,​12365,​12493,​12509-12511,​12524,​12577-12578,​12614,​12642,​12670,​12679,​12722,​12770,​12772,​12790-12792,​12796,​12798,​12801,​12811-12812,​12817,​12836-12837,​12907,​12971,​13002-13004,​13087,​13100-13104,​13154,​13167-13169,​13186,​13268,​13406,​13428-13430,​13434,​13439,​13450,​13474,​13501,​13503,​13511,​13513,​13534-13535,​13540,​13550,​13552,​13592-13593,​13645,​13648,​13650-13652,​13654,​13657-13659,​13661-13662,​13666,​13669,​13682-13684,​13690-13693,​13704-13705,​13708-13709,​13711,​13715,​13724,​13746,​13764-13766,​13807,​13938,​13942,​13958,​13985-13987,​13992-13993,​14000-14001,​14007-14008,​14014-14016,​14095-14096,​14098-14099,​14107,​14118-14119,​14131,​14135,​14142,​14152,​14155-14160,​14226,​14228-14230,​14234-14236,​14244-14247,​14250,​14255-14258,​14260,​14267,​14271-14272,​14282,​14284-14292,​14296-14298,​14300,​14307,​14314-14316,​14319,​14322,​14332,​14343-14350,​14358,​14367-14368,​14378,​14381-14382,​14384,​14388,​14390-14391,​14393-14394,​14396,​14400,​14405,​14407-14408,​14418,​14422-14423,​14425,​14434,​14463-14464,​14468-14469,​14479,​14483,​14486,​14507,​14517,​14523,​14527,​14529,​14531-14533,​14553,​14623,​14630,​14770,​14772,​14781,​14789-14791,​14805,​14826-14827,​14829-14832,​14839-14840,​14843,​14845-14847,​14851-14854,​14857,​14864-14865,​14871,​14889-14890,​14899,​14904,​14918,​14937-14938,​14940,​14943-14946,​14948-14951,​15002,​15013,​15015-15016,​15023-15024,​15026,​15046,​15052-15054,​15058,​15077,​15085,​15088,​15094,​15103-15106,​15111-15113,​15122-15124,​15129,​15139,​15160,​15163,​15165,​15184-15185,​15187,​15194,​15211,​15213,​15222,​15287,​15371-15372,​15390,​15395,​15400,​15402,​15427,​15486
  • stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionVariableImpactsView.Designer.cs

    r16432 r16438  
    1919 */
    2020#endregion
     21
     22
    2123namespace HeuristicLab.Problems.DataAnalysis.Views {
    2224  partial class ClassificationSolutionVariableImpactsView {
     
    4446    /// </summary>
    4547    private void InitializeComponent() {
    46       this.variableImactsArrayView = new HeuristicLab.Data.Views.StringConvertibleArrayView();
    47       this.dataPartitionComboBox = new System.Windows.Forms.ComboBox();
    48       this.dataPartitionLabel = new System.Windows.Forms.Label();
    49       this.numericVarReplacementLabel = new System.Windows.Forms.Label();
    50       this.replacementComboBox = new System.Windows.Forms.ComboBox();
    51       this.factorVarReplacementLabel = new System.Windows.Forms.Label();
    52       this.factorVarReplComboBox = new System.Windows.Forms.ComboBox();
    5348      this.ascendingCheckBox = new System.Windows.Forms.CheckBox();
    5449      this.sortByLabel = new System.Windows.Forms.Label();
    5550      this.sortByComboBox = new System.Windows.Forms.ComboBox();
    56       this.backgroundWorker = new System.ComponentModel.BackgroundWorker();
     51      this.factorVarReplComboBox = new System.Windows.Forms.ComboBox();
     52      this.factorVarReplacementLabel = new System.Windows.Forms.Label();
     53      this.replacementComboBox = new System.Windows.Forms.ComboBox();
     54      this.numericVarReplacementLabel = new System.Windows.Forms.Label();
     55      this.dataPartitionLabel = new System.Windows.Forms.Label();
     56      this.dataPartitionComboBox = new System.Windows.Forms.ComboBox();
     57      this.variableImpactsArrayView = new HeuristicLab.Data.Views.StringConvertibleArrayView();
    5758      this.SuspendLayout();
    5859      //
    59       // variableImactsArrayView
    60       //
    61       this.variableImactsArrayView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    62             | System.Windows.Forms.AnchorStyles.Left)
    63             | System.Windows.Forms.AnchorStyles.Right)));
    64       this.variableImactsArrayView.Caption = "StringConvertibleArray View";
    65       this.variableImactsArrayView.Content = null;
    66       this.variableImactsArrayView.Location = new System.Drawing.Point(3, 84);
    67       this.variableImactsArrayView.Name = "variableImactsArrayView";
    68       this.variableImactsArrayView.ReadOnly = true;
    69       this.variableImactsArrayView.Size = new System.Drawing.Size(662, 278);
    70       this.variableImactsArrayView.TabIndex = 2;
    71       //
    72       // dataPartitionComboBox
    73       //
    74       this.dataPartitionComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    75       this.dataPartitionComboBox.FormattingEnabled = true;
    76       this.dataPartitionComboBox.Items.AddRange(new object[] {
    77             HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.DataPartitionEnum.Training,
    78             HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.DataPartitionEnum.Test,
    79             HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.DataPartitionEnum.All});
    80       this.dataPartitionComboBox.Location = new System.Drawing.Point(197, 3);
    81       this.dataPartitionComboBox.Name = "dataPartitionComboBox";
    82       this.dataPartitionComboBox.Size = new System.Drawing.Size(121, 21);
    83       this.dataPartitionComboBox.TabIndex = 1;
    84       this.dataPartitionComboBox.SelectedIndexChanged += new System.EventHandler(this.dataPartitionComboBox_SelectedIndexChanged);
    85       //
    86       // dataPartitionLabel
    87       //
    88       this.dataPartitionLabel.AutoSize = true;
    89       this.dataPartitionLabel.Location = new System.Drawing.Point(3, 6);
    90       this.dataPartitionLabel.Name = "dataPartitionLabel";
    91       this.dataPartitionLabel.Size = new System.Drawing.Size(73, 13);
    92       this.dataPartitionLabel.TabIndex = 0;
    93       this.dataPartitionLabel.Text = "Data partition:";
    94       //
    95       // numericVarReplacementLabel
    96       //
    97       this.numericVarReplacementLabel.AutoSize = true;
    98       this.numericVarReplacementLabel.Location = new System.Drawing.Point(3, 33);
    99       this.numericVarReplacementLabel.Name = "numericVarReplacementLabel";
    100       this.numericVarReplacementLabel.Size = new System.Drawing.Size(173, 13);
    101       this.numericVarReplacementLabel.TabIndex = 2;
    102       this.numericVarReplacementLabel.Text = "Replacement for numeric variables:";
     60      // ascendingCheckBox
     61      //
     62      this.ascendingCheckBox.AutoSize = true;
     63      this.ascendingCheckBox.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
     64      this.ascendingCheckBox.Location = new System.Drawing.Point(452, 32);
     65      this.ascendingCheckBox.Name = "ascendingCheckBox";
     66      this.ascendingCheckBox.Size = new System.Drawing.Size(76, 17);
     67      this.ascendingCheckBox.TabIndex = 7;
     68      this.ascendingCheckBox.Text = "Ascending";
     69      this.ascendingCheckBox.UseVisualStyleBackColor = true;
     70      this.ascendingCheckBox.CheckedChanged += new System.EventHandler(this.ascendingCheckBox_CheckedChanged);
     71      //
     72      // sortByLabel
     73      //
     74      this.sortByLabel.AutoSize = true;
     75      this.sortByLabel.Location = new System.Drawing.Point(324, 6);
     76      this.sortByLabel.Name = "sortByLabel";
     77      this.sortByLabel.Size = new System.Drawing.Size(77, 13);
     78      this.sortByLabel.TabIndex = 4;
     79      this.sortByLabel.Text = "Sorting criteria:";
     80      //
     81      // sortByComboBox
     82      //
     83      this.sortByComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     84      this.sortByComboBox.FormattingEnabled = true;
     85      this.sortByComboBox.Items.AddRange(new object[] {
     86            HeuristicLab.Problems.DataAnalysis.Views.ClassificationSolutionVariableImpactsView.SortingCriteria.ImpactValue,
     87            HeuristicLab.Problems.DataAnalysis.Views.ClassificationSolutionVariableImpactsView.SortingCriteria.Occurrence,
     88            HeuristicLab.Problems.DataAnalysis.Views.ClassificationSolutionVariableImpactsView.SortingCriteria.VariableName});
     89      this.sortByComboBox.Location = new System.Drawing.Point(407, 3);
     90      this.sortByComboBox.Name = "sortByComboBox";
     91      this.sortByComboBox.Size = new System.Drawing.Size(121, 21);
     92      this.sortByComboBox.TabIndex = 5;
     93      this.sortByComboBox.SelectedIndexChanged += new System.EventHandler(this.sortByComboBox_SelectedIndexChanged);
     94      //
     95      // factorVarReplComboBox
     96      //
     97      this.factorVarReplComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     98      this.factorVarReplComboBox.FormattingEnabled = true;
     99      this.factorVarReplComboBox.Items.AddRange(new object[] {
     100            HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.FactorReplacementMethodEnum.Best,
     101            HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.FactorReplacementMethodEnum.Mode,
     102            HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.FactorReplacementMethodEnum.Shuffle});
     103      this.factorVarReplComboBox.Location = new System.Drawing.Point(197, 57);
     104      this.factorVarReplComboBox.Name = "factorVarReplComboBox";
     105      this.factorVarReplComboBox.Size = new System.Drawing.Size(121, 21);
     106      this.factorVarReplComboBox.TabIndex = 1;
     107      this.factorVarReplComboBox.SelectedIndexChanged += new System.EventHandler(this.replacementComboBox_SelectedIndexChanged);
     108      //
     109      // factorVarReplacementLabel
     110      //
     111      this.factorVarReplacementLabel.AutoSize = true;
     112      this.factorVarReplacementLabel.Location = new System.Drawing.Point(3, 60);
     113      this.factorVarReplacementLabel.Name = "factorVarReplacementLabel";
     114      this.factorVarReplacementLabel.Size = new System.Drawing.Size(188, 13);
     115      this.factorVarReplacementLabel.TabIndex = 0;
     116      this.factorVarReplacementLabel.Text = "Replacement for categorical variables:";
    103117      //
    104118      // replacementComboBox
     
    117131      this.replacementComboBox.SelectedIndexChanged += new System.EventHandler(this.replacementComboBox_SelectedIndexChanged);
    118132      //
    119       // factorVarReplacementLabel
    120       //
    121       this.factorVarReplacementLabel.AutoSize = true;
    122       this.factorVarReplacementLabel.Location = new System.Drawing.Point(3, 60);
    123       this.factorVarReplacementLabel.Name = "factorVarReplacementLabel";
    124       this.factorVarReplacementLabel.Size = new System.Drawing.Size(188, 13);
    125       this.factorVarReplacementLabel.TabIndex = 0;
    126       this.factorVarReplacementLabel.Text = "Replacement for categorical variables:";
    127       //
    128       // factorVarReplComboBox
    129       //
    130       this.factorVarReplComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    131       this.factorVarReplComboBox.FormattingEnabled = true;
    132       this.factorVarReplComboBox.Items.AddRange(new object[] {
    133             HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.FactorReplacementMethodEnum.Best,
    134             HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.FactorReplacementMethodEnum.Mode,
    135             HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.FactorReplacementMethodEnum.Shuffle});
    136       this.factorVarReplComboBox.Location = new System.Drawing.Point(197, 57);
    137       this.factorVarReplComboBox.Name = "factorVarReplComboBox";
    138       this.factorVarReplComboBox.Size = new System.Drawing.Size(121, 21);
    139       this.factorVarReplComboBox.TabIndex = 1;
    140       this.factorVarReplComboBox.SelectedIndexChanged += new System.EventHandler(this.replacementComboBox_SelectedIndexChanged);
    141       //
    142       // ascendingCheckBox
    143       //
    144       this.ascendingCheckBox.AutoSize = true;
    145       this.ascendingCheckBox.Location = new System.Drawing.Point(534, 6);
    146       this.ascendingCheckBox.Name = "ascendingCheckBox";
    147       this.ascendingCheckBox.Size = new System.Drawing.Size(76, 17);
    148       this.ascendingCheckBox.TabIndex = 10;
    149       this.ascendingCheckBox.Text = "Ascending";
    150       this.ascendingCheckBox.UseVisualStyleBackColor = true;
    151       this.ascendingCheckBox.CheckedChanged += new System.EventHandler(this.ascendingCheckBox_CheckedChanged);
    152       //
    153       // sortByLabel
    154       //
    155       this.sortByLabel.AutoSize = true;
    156       this.sortByLabel.Location = new System.Drawing.Point(324, 6);
    157       this.sortByLabel.Name = "sortByLabel";
    158       this.sortByLabel.Size = new System.Drawing.Size(77, 13);
    159       this.sortByLabel.TabIndex = 8;
    160       this.sortByLabel.Text = "Sorting criteria:";
    161       //
    162       // sortByComboBox
    163       //
    164       this.sortByComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    165       this.sortByComboBox.FormattingEnabled = true;
    166       this.sortByComboBox.Location = new System.Drawing.Point(407, 3);
    167       this.sortByComboBox.Name = "sortByComboBox";
    168       this.sortByComboBox.Size = new System.Drawing.Size(121, 21);
    169       this.sortByComboBox.TabIndex = 9;
    170       this.sortByComboBox.SelectedIndexChanged += new System.EventHandler(this.sortByComboBox_SelectedIndexChanged);
     133      // numericVarReplacementLabel
     134      //
     135      this.numericVarReplacementLabel.AutoSize = true;
     136      this.numericVarReplacementLabel.Location = new System.Drawing.Point(3, 33);
     137      this.numericVarReplacementLabel.Name = "numericVarReplacementLabel";
     138      this.numericVarReplacementLabel.Size = new System.Drawing.Size(173, 13);
     139      this.numericVarReplacementLabel.TabIndex = 2;
     140      this.numericVarReplacementLabel.Text = "Replacement for numeric variables:";
     141      //
     142      // dataPartitionLabel
     143      //
     144      this.dataPartitionLabel.AutoSize = true;
     145      this.dataPartitionLabel.Location = new System.Drawing.Point(3, 6);
     146      this.dataPartitionLabel.Name = "dataPartitionLabel";
     147      this.dataPartitionLabel.Size = new System.Drawing.Size(73, 13);
     148      this.dataPartitionLabel.TabIndex = 0;
     149      this.dataPartitionLabel.Text = "Data partition:";
     150      //
     151      // dataPartitionComboBox
     152      //
     153      this.dataPartitionComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     154      this.dataPartitionComboBox.FormattingEnabled = true;
     155      this.dataPartitionComboBox.Items.AddRange(new object[] {
     156            HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.DataPartitionEnum.Training,
     157            HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.DataPartitionEnum.Test,
     158            HeuristicLab.Problems.DataAnalysis.ClassificationSolutionVariableImpactsCalculator.DataPartitionEnum.All});
     159      this.dataPartitionComboBox.Location = new System.Drawing.Point(197, 3);
     160      this.dataPartitionComboBox.Name = "dataPartitionComboBox";
     161      this.dataPartitionComboBox.Size = new System.Drawing.Size(121, 21);
     162      this.dataPartitionComboBox.TabIndex = 1;
     163      this.dataPartitionComboBox.SelectedIndexChanged += new System.EventHandler(this.dataPartitionComboBox_SelectedIndexChanged);
     164      //
     165      // variableImpactsArrayView
     166      //
     167      this.variableImpactsArrayView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     168            | System.Windows.Forms.AnchorStyles.Left)
     169            | System.Windows.Forms.AnchorStyles.Right)));
     170      this.variableImpactsArrayView.Caption = "StringConvertibleArray View";
     171      this.variableImpactsArrayView.Content = null;
     172      this.variableImpactsArrayView.Location = new System.Drawing.Point(3, 84);
     173      this.variableImpactsArrayView.Name = "variableImpactsArrayView";
     174      this.variableImpactsArrayView.ReadOnly = true;
     175      this.variableImpactsArrayView.Size = new System.Drawing.Size(706, 278);
     176      this.variableImpactsArrayView.TabIndex = 2;
    171177      //
    172178      // ClassificationSolutionVariableImpactsView
     
    183189      this.Controls.Add(this.dataPartitionLabel);
    184190      this.Controls.Add(this.dataPartitionComboBox);
    185       this.Controls.Add(this.variableImactsArrayView);
     191      this.Controls.Add(this.variableImpactsArrayView);
    186192      this.Name = "ClassificationSolutionVariableImpactsView";
    187       this.Size = new System.Drawing.Size(668, 365);
     193      this.Size = new System.Drawing.Size(712, 365);
    188194      this.VisibleChanged += new System.EventHandler(this.ClassificationSolutionVariableImpactsView_VisibleChanged);
    189195      this.ResumeLayout(false);
     
    194200    #endregion
    195201
    196     private Data.Views.StringConvertibleArrayView variableImactsArrayView;
     202    private Data.Views.StringConvertibleArrayView variableImpactsArrayView;
    197203    private System.Windows.Forms.ComboBox dataPartitionComboBox;
    198204    private System.Windows.Forms.Label dataPartitionLabel;
     
    201207    private System.Windows.Forms.Label factorVarReplacementLabel;
    202208    private System.Windows.Forms.ComboBox factorVarReplComboBox;
    203     private System.Windows.Forms.CheckBox ascendingCheckBox;
    204209    private System.Windows.Forms.Label sortByLabel;
    205210    private System.Windows.Forms.ComboBox sortByComboBox;
    206     private System.ComponentModel.BackgroundWorker backgroundWorker;
     211    private System.Windows.Forms.CheckBox ascendingCheckBox;
    207212  }
    208213}
  • stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionVariableImpactsView.cs

    r16432 r16438  
    3333  [Content(typeof(IClassificationSolution))]
    3434  public partial class ClassificationSolutionVariableImpactsView : DataAnalysisSolutionEvaluationView {
    35     #region Nested Types
    3635    private enum SortingCriteria {
    3736      ImpactValue,
     
    3938      VariableName
    4039    }
    41     #endregion
    42 
    43     #region Fields
    44     private Dictionary<string, double> rawVariableImpacts = new Dictionary<string, double>();
    45     private Thread thread;
    46     #endregion
    47 
    48     #region Getter/Setter
     40    private CancellationTokenSource cancellationToken = new CancellationTokenSource();
     41    private List<Tuple<string, double>> rawVariableImpacts = new List<Tuple<string, double>>();
     42
    4943    public new IClassificationSolution Content {
    5044      get { return (IClassificationSolution)base.Content; }
     
    5347      }
    5448    }
    55     #endregion
    56 
    57     #region Ctor
     49
    5850    public ClassificationSolutionVariableImpactsView()
    5951      : base() {
    6052      InitializeComponent();
    6153
    62       this.sortByComboBox.Items.AddRange(Enum.GetValues(typeof(SortingCriteria)).Cast<object>().ToArray());
    63       this.sortByComboBox.SelectedItem = SortingCriteria.ImpactValue;
    64 
    6554      //Set the default values
    6655      this.dataPartitionComboBox.SelectedIndex = 0;
    67       this.replacementComboBox.SelectedIndex = 0;
     56      this.replacementComboBox.SelectedIndex = 3;
    6857      this.factorVarReplComboBox.SelectedIndex = 0;
    69     }
    70     #endregion
    71 
    72     #region Events
     58      this.sortByComboBox.SelectedItem = SortingCriteria.ImpactValue;
     59    }
     60
    7361    protected override void RegisterContentEvents() {
    7462      base.RegisterContentEvents();
     
    7664      Content.ProblemDataChanged += new EventHandler(Content_ProblemDataChanged);
    7765    }
    78 
    7966    protected override void DeregisterContentEvents() {
    8067      base.DeregisterContentEvents();
     
    8673      OnContentChanged();
    8774    }
    88 
    8975    protected virtual void Content_ModelChanged(object sender, EventArgs e) {
    9076      OnContentChanged();
    9177    }
    92 
    9378    protected override void OnContentChanged() {
    9479      base.OnContentChanged();
     80      rawVariableImpacts.Clear();
     81
    9582      if (Content == null) {
    96         variableImactsArrayView.Content = null;
     83        variableImpactsArrayView.Content = null;
    9784      } else {
    9885        UpdateVariableImpact();
    9986      }
    10087    }
    101 
    10288    private void ClassificationSolutionVariableImpactsView_VisibleChanged(object sender, EventArgs e) {
    103       if (thread == null) { return; }
    104 
    105       if (thread.IsAlive) { thread.Abort(); }
    106       thread = null;
    107     }
    108 
     89      cancellationToken.Cancel();
     90    }
    10991
    11092    private void dataPartitionComboBox_SelectedIndexChanged(object sender, EventArgs e) {
     93      rawVariableImpacts.Clear();
    11194      UpdateVariableImpact();
    11295    }
    113 
    11496    private void replacementComboBox_SelectedIndexChanged(object sender, EventArgs e) {
     97      rawVariableImpacts.Clear();
    11598      UpdateVariableImpact();
    11699    }
    117 
    118100    private void sortByComboBox_SelectedIndexChanged(object sender, EventArgs e) {
    119101      //Update the default ordering (asc,desc), but remove the eventHandler beforehand (otherwise the data would be ordered twice)
    120102      ascendingCheckBox.CheckedChanged -= ascendingCheckBox_CheckedChanged;
    121       switch ((SortingCriteria)sortByComboBox.SelectedItem) {
    122         case SortingCriteria.ImpactValue:
    123           ascendingCheckBox.Checked = false;
    124           break;
    125         case SortingCriteria.Occurrence:
    126           ascendingCheckBox.Checked = true;
    127           break;
    128         case SortingCriteria.VariableName:
    129           ascendingCheckBox.Checked = true;
    130           break;
    131         default:
    132           throw new NotImplementedException("Ordering for selected SortingCriteria not implemented");
    133       }
     103      ascendingCheckBox.Checked = (SortingCriteria)sortByComboBox.SelectedItem != SortingCriteria.ImpactValue;
    134104      ascendingCheckBox.CheckedChanged += ascendingCheckBox_CheckedChanged;
    135105
    136       UpdateDataOrdering();
    137     }
    138 
     106      UpdateOrdering();
     107    }
    139108    private void ascendingCheckBox_CheckedChanged(object sender, EventArgs e) {
    140       UpdateDataOrdering();
    141     }
    142 
    143     #endregion
    144 
    145     #region Helper Methods   
    146     private void UpdateVariableImpact() {
     109      UpdateOrdering();
     110    }
     111
     112    private async void UpdateVariableImpact() {
     113      IProgress progress;
     114
    147115      //Check if the selection is valid
    148116      if (Content == null) { return; }
     
    157125      var dataPartition = (ClassificationSolutionVariableImpactsCalculator.DataPartitionEnum)dataPartitionComboBox.SelectedItem;
    158126
    159       variableImactsArrayView.Caption = Content.Name + " Variable Impacts";
    160 
    161       mainForm.AddOperationProgressToView(this, "Calculating variable impacts for " + Content.Name);
    162 
    163       Task.Factory.StartNew(() => {
    164         thread = Thread.CurrentThread;
    165         //Remember the original ordering of the variables
    166         var impacts = ClassificationSolutionVariableImpactsCalculator.CalculateImpacts(Content, dataPartition, replMethod, factorReplMethod);
     127      variableImpactsArrayView.Caption = Content.Name + " Variable Impacts";
     128      progress = mainForm.AddOperationProgressToView(this, "Calculating variable impacts for " + Content.Name);
     129      progress.ProgressValue = 0;
     130
     131      cancellationToken = new CancellationTokenSource();
     132
     133      try {
    167134        var problemData = Content.ProblemData;
    168135        var inputvariables = new HashSet<string>(problemData.AllowedInputVariables.Union(Content.Model.VariablesUsedForPrediction));
    169         var originalVariableOrdering = problemData.Dataset.VariableNames.Where(v => inputvariables.Contains(v)).Where(problemData.Dataset.VariableHasType<double>).ToList();
    170 
    171         rawVariableImpacts.Clear();
    172         originalVariableOrdering.ForEach(v => rawVariableImpacts.Add(v, impacts.First(vv => vv.Item1 == v).Item2));
    173       }).ContinueWith((o) => {
    174         UpdateDataOrdering();
    175         mainForm.RemoveOperationProgressFromView(this);
    176         thread = null;
    177       }, TaskScheduler.FromCurrentSynchronizationContext());
     136        //Remember the original ordering of the variables
     137        var originalVariableOrdering = problemData.Dataset.VariableNames
     138          .Where(v => inputvariables.Contains(v))
     139          .Where(v => problemData.Dataset.VariableHasType<double>(v) || problemData.Dataset.VariableHasType<string>(v))
     140          .ToList();
     141
     142        List<Tuple<string, double>> impacts = null;
     143        await Task.Run(() => { impacts = CalculateVariableImpacts(originalVariableOrdering, Content.Model, problemData, Content.EstimatedClassValues, dataPartition, replMethod, factorReplMethod, cancellationToken.Token, progress); });
     144        if (impacts == null) { return; }
     145
     146        rawVariableImpacts.AddRange(impacts);
     147        UpdateOrdering();
     148      }
     149      finally {
     150        ((MainForm.WindowsForms.MainForm)MainFormManager.MainForm).RemoveOperationProgressFromView(this);
     151      }
     152    }
     153    private List<Tuple<string, double>> CalculateVariableImpacts(List<string> originalVariableOrdering,
     154      IClassificationModel model,
     155      IClassificationProblemData problemData,
     156      IEnumerable<double> estimatedClassValues,
     157      ClassificationSolutionVariableImpactsCalculator.DataPartitionEnum dataPartition,
     158      ClassificationSolutionVariableImpactsCalculator.ReplacementMethodEnum replMethod,
     159      ClassificationSolutionVariableImpactsCalculator.FactorReplacementMethodEnum factorReplMethod,
     160      CancellationToken token,
     161      IProgress progress) {
     162      List<Tuple<string, double>> impacts = new List<Tuple<string, double>>();
     163      int count = originalVariableOrdering.Count;
     164      int i = 0;
     165      var modifiableDataset = ((Dataset)(problemData.Dataset).Clone()).ToModifiable();
     166      IEnumerable<int> rows = ClassificationSolutionVariableImpactsCalculator.GetPartitionRows(dataPartition, problemData);
     167
     168      //Calculate original quality-values (via calculator, default is R²)
     169      IEnumerable<double> targetValuesPartition = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, rows);
     170      IEnumerable<double> estimatedClassValuesPartition = Content.GetEstimatedClassValues(rows);
     171
     172      var originalCalculatorValue = ClassificationSolutionVariableImpactsCalculator.CalculateQuality(targetValuesPartition, estimatedClassValuesPartition);
     173      var clonedModel = (IClassificationModel)model.Clone();
     174      foreach (var variableName in originalVariableOrdering) {
     175        if (cancellationToken.Token.IsCancellationRequested) { return null; }
     176        progress.ProgressValue = (double)++i / count;
     177        progress.Status = string.Format("Calculating impact for variable {0} ({1} of {2})", variableName, i, count);
     178
     179        double impact = 0;
     180        //If the variable isn't used for prediction, it has zero impact.
     181        if (model.VariablesUsedForPrediction.Contains(variableName)) {
     182          impact = ClassificationSolutionVariableImpactsCalculator.CalculateImpact(variableName, clonedModel, problemData, modifiableDataset, rows, replMethod, factorReplMethod, targetValuesPartition, originalCalculatorValue);
     183        }
     184        impacts.Add(new Tuple<string, double>(variableName, impact));
     185      }
     186
     187      return impacts;
    178188    }
    179189
    180190    /// <summary>
    181     /// Updates the <see cref="variableImactsArrayView"/> according to the selected ordering <see cref="ascendingCheckBox"/> of the selected Column <see cref="sortByComboBox"/>
     191    /// Updates the <see cref="variableImpactsArrayView"/> according to the selected ordering <see cref="ascendingCheckBox"/> of the selected Column <see cref="sortByComboBox"/>
    182192    /// The default is "Descending" by "VariableImpact" (as in previous versions)
    183193    /// </summary>
    184     private void UpdateDataOrdering() {
     194    private void UpdateOrdering() {
    185195      //Check if valid sortingCriteria is selected and data exists
    186196      if (sortByComboBox.SelectedIndex == -1) { return; }
     
    191201      bool ascending = ascendingCheckBox.Checked;
    192202
    193       IEnumerable<KeyValuePair<string, double>> orderedEntries = null;
     203      IEnumerable<Tuple<string, double>> orderedEntries = null;
    194204
    195205      //Sort accordingly
    196206      switch (selectedItem) {
    197207        case SortingCriteria.ImpactValue:
    198           orderedEntries = rawVariableImpacts.OrderBy(v => v.Value);
     208          orderedEntries = rawVariableImpacts.OrderBy(v => v.Item2);
    199209          break;
    200210        case SortingCriteria.Occurrence:
     
    202212          break;
    203213        case SortingCriteria.VariableName:
    204           orderedEntries = rawVariableImpacts.OrderBy(v => v.Key, new NaturalStringComparer());
     214          orderedEntries = rawVariableImpacts.OrderBy(v => v.Item1, new NaturalStringComparer());
    205215          break;
    206216        default:
     
    211221
    212222      //Write the data back
    213       var impactArray = new DoubleArray(orderedEntries.Select(i => i.Value).ToArray()) {
    214         ElementNames = orderedEntries.Select(i => i.Key)
     223      var impactArray = new DoubleArray(orderedEntries.Select(i => i.Item2).ToArray()) {
     224        ElementNames = orderedEntries.Select(i => i.Item1)
    215225      };
    216226
    217227      //Could be, if the View was closed
    218       if (!variableImactsArrayView.IsDisposed) {
    219         variableImactsArrayView.Content = (DoubleArray)impactArray.AsReadOnly();
    220       }
    221     }
    222     #endregion 
     228      if (!variableImpactsArrayView.IsDisposed) {
     229        variableImpactsArrayView.Content = (DoubleArray)impactArray.AsReadOnly();
     230      }
     231    }
    223232  }
    224233}
Note: See TracChangeset for help on using the changeset viewer.