Changeset 15839


Ignore:
Timestamp:
03/12/18 15:37:28 (18 months ago)
Author:
fbaching
Message:

#2888: disallow zooming in PartialDependencePlot graphs
handle NaN erros for PartialDependencePlot data

Location:
trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/FactorPartialDependencePlot.cs

    r15583 r15839  
    144144      chart.CustomizeAllChartAreas();
    145145      chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = true;
    146       chart.ChartAreas[0].AxisX.ScaleView.Zoomable = true;
    147146      chart.ChartAreas[0].CursorX.Interval = 0;
    148147
    149148      chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = true;
    150       chart.ChartAreas[0].AxisY.ScaleView.Zoomable = true;
    151149      chart.ChartAreas[0].CursorY.Interval = 0;
     150
     151      chart.ChartAreas[0].Axes.ToList().ForEach(x => { x.ScaleView.Zoomable = false; });
    152152
    153153      Disposed += Control_Disposed;
  • trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs

    r15818 r15839  
    216216      chart.CustomizeAllChartAreas();
    217217      chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = true;
    218       chart.ChartAreas[0].AxisX.ScaleView.Zoomable = true;
    219218      chart.ChartAreas[0].CursorX.Interval = 0;
    220219
    221220      chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = true;
    222       chart.ChartAreas[0].AxisY.ScaleView.Zoomable = true;
    223221      chart.ChartAreas[0].CursorY.Interval = 0;
     222
     223      chart.ChartAreas[0].Axes.ToList().ForEach(x => { x.ScaleView.Zoomable = false; });
    224224
    225225      configToolStripMenuItem = new ToolStripMenuItem("Configuration");
     
    351351
    352352    private void RecalculateTrainingLimits(bool initializeAxisRanges) {
    353       trainingMin = solutions.Select(s => s.ProblemData.Dataset.GetDoubleValues(freeVariable, s.ProblemData.TrainingIndices).Min()).Max();
    354       trainingMax = solutions.Select(s => s.ProblemData.Dataset.GetDoubleValues(freeVariable, s.ProblemData.TrainingIndices).Max()).Min();
     353      trainingMin = solutions.Select(s => s.ProblemData.Dataset.GetDoubleValues(freeVariable, s.ProblemData.TrainingIndices).Where(x => !double.IsNaN(x)).Min()).Max();
     354      trainingMax = solutions.Select(s => s.ProblemData.Dataset.GetDoubleValues(freeVariable, s.ProblemData.TrainingIndices).Where(x => !double.IsNaN(x)).Max()).Min();
    355355
    356356      if (initializeAxisRanges) {
Note: See TracChangeset for help on using the changeset viewer.