Ignore:
Timestamp:
07/08/15 12:53:55 (7 years ago)
Author:
mkommend
Message:

#2335: Merged changes into trunk.

Location:
trunk/sources/HeuristicLab.DataPreprocessing.Views
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.DataPreprocessing.Views

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing.Viewsmergedeligible
      /stable/HeuristicLab.DataPreprocessing.Viewsmergedeligible
      /branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing.Views10321-10322
      /branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing.Views5516-5520
      /branches/Benchmarking/sources/HeuristicLab.DataPreprocessing.Views6917-7005
      /branches/CloningRefactoring/HeuristicLab.DataPreprocessing.Views4656-4721
      /branches/CodeEditor/HeuristicLab.DataPreprocessing.Views11700-11806
      /branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing.Views5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing.Views5815-6180
      /branches/DataAnalysis/HeuristicLab.DataPreprocessing.Views4458-4459,​4462,​4464
      /branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views10085-11101
      /branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing.Views6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing.Views5060
      /branches/HLScript/HeuristicLab.DataPreprocessing.Views10331-10358
      /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.DataPreprocessing.Views11570-12508
      /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing.Views6123-9799
      /branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing.Views10202-10483
      /branches/NET40/sources/HeuristicLab.DataPreprocessing.Views5138-5162
      /branches/NSGA-II Changes/HeuristicLab.DataPreprocessing.Views12033-12122
      /branches/ParallelEngine/HeuristicLab.DataPreprocessing.Views5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing.Views7568-7810
      /branches/QAPAlgorithms/HeuristicLab.DataPreprocessing.Views6350-6627
      /branches/Restructure trunk solution/HeuristicLab.DataPreprocessing.Views6828
      /branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing.Views8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing.Views7787-8333
      /branches/SlaveShutdown/HeuristicLab.DataPreprocessing.Views8944-8956
      /branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing.Views10204-10479
      /branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing.Views5370-5682
      /branches/Trunk/HeuristicLab.DataPreprocessing.Views6829-6865
      /branches/UnloadJobs/HeuristicLab.DataPreprocessing.Views9168-9215
      /branches/VNS/HeuristicLab.DataPreprocessing.Views5594-5752
      /branches/histogram/HeuristicLab.DataPreprocessing.Views5959-6341
  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingDataTableView.cs

    r12012 r12676  
    4747
    4848    public IEnumerable<double> Classification { get; set; }
     49    public bool IsDetailedChartViewEnabled { get; set; }
    4950
    5051    public PreprocessingDataTableView() {
     
    145146        RegisterDataRowEvents(row);
    146147        var series = new Series(row.Name);
    147         if (row.VisualProperties.DisplayName.Trim() != String.Empty) series.LegendText = row.VisualProperties.DisplayName;
     148        if (row.VisualProperties.DisplayName.Trim() != String.Empty)
     149          series.LegendText = row.VisualProperties.DisplayName;
    148150        else series.LegendText = row.Name;
     151
    149152        ConfigureSeries(series, row);
    150153        FillSeriesWithRowValues(series, row);
    151154
     155        if (IsDetailedChartViewEnabled) {
     156          series.LegendText += " Values: " + row.Values.Count;
     157        }
    152158        if (Classification == null)
    153159          chart.Series.Add(series);
     
    661667
    662668        chart.Titles.Add(row.Name);
    663 
     669        int featureOverallValueCount = 0;
     670        if (IsDetailedChartViewEnabled)
     671          featureOverallValueCount = row.Values.Count(x => !IsInvalidValue(x));
    664672        foreach (KeyValuePair<double, List<double>> entry in valuesPerClass) {
    665673          var s = new Series(row.Name + entry.Key);
     
    669677
    670678          s.LegendText = entry.Key.ToString();
    671 
     679          if (IsDetailedChartViewEnabled) {
     680            int featureValueCount = entry.Value.Count(x => !IsInvalidValue(x));
     681            s.LegendText += " Values: ";
     682            s.LegendText += (featureOverallValueCount > 0) ?
     683              string.Format("{0} ({1:F2}%)", featureValueCount, (featureValueCount / (double)featureOverallValueCount) * 100)
     684            : "0";
     685          }
    672686          chart.Series.Add(s);
    673687        }
     
    752766                              ? "Y"
    753767                              : Content.VisualProperties.YAxisTitle;
    754         series.Points.Add(new DataPoint(d - intervalCenter, sum) {
    755           ToolTip =
    756             xAxisTitle + ": [" + (d - intervalWidth) + "-" + d + ")" + Environment.NewLine +
    757             yAxisTitle + ": " + sum
    758         });
     768        DataPoint newDataPoint = new DataPoint(d - intervalCenter, sum);
     769        newDataPoint.ToolTip =
     770          xAxisTitle + ": [" + (d - intervalWidth) + "-" + d + ")" + Environment.NewLine +
     771          yAxisTitle + ": " + sum;
     772        int overallValueCount = row.Values.Count();
     773        if (overallValueCount > 0)
     774          newDataPoint.ToolTip += string.Format(" ({0:F2}%)", (sum / overallValueCount) * 100);
     775        series.Points.Add(newDataPoint);
    759776      }
    760777    }
Note: See TracChangeset for help on using the changeset viewer.