Changeset 16162


Ignore:
Timestamp:
09/20/18 14:46:32 (13 months ago)
Author:
gkronber
Message:

#2888: merged r15839,r15845 from trunk to stable

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.DataAnalysis.Views

  • stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/FactorPartialDependencePlot.cs

    r15584 r16162  
    143143      // Configure axis
    144144      chart.CustomizeAllChartAreas();
    145       chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = true;
    146       chart.ChartAreas[0].AxisX.ScaleView.Zoomable = true;
    147       chart.ChartAreas[0].CursorX.Interval = 0;
    148 
    149       chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = true;
    150       chart.ChartAreas[0].AxisY.ScaleView.Zoomable = true;
    151       chart.ChartAreas[0].CursorY.Interval = 0;
     145      chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = false;
     146      chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = false;
     147
     148      chart.ChartAreas[0].Axes.ToList().ForEach(x => { x.ScaleView.Zoomable = false; });
    152149
    153150      Disposed += Control_Disposed;
  • stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs

    r15584 r16162  
    215215      // Configure axis
    216216      chart.CustomizeAllChartAreas();
    217       chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = true;
    218       chart.ChartAreas[0].AxisX.ScaleView.Zoomable = true;
    219       chart.ChartAreas[0].CursorX.Interval = 0;
    220 
    221       chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = true;
    222       chart.ChartAreas[0].AxisY.ScaleView.Zoomable = true;
    223       chart.ChartAreas[0].CursorY.Interval = 0;
     217      chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = false;
     218      chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = false;
     219
     220      chart.ChartAreas[0].Axes.ToList().ForEach(x => { x.ScaleView.Zoomable = false; });
    224221
    225222      configToolStripMenuItem = new ToolStripMenuItem("Configuration");
     
    351348
    352349    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();
     350      trainingMin = solutions.Select(s => s.ProblemData.Dataset.GetDoubleValues(freeVariable, s.ProblemData.TrainingIndices).Where(x => !double.IsNaN(x)).Min()).Max();
     351      trainingMax = solutions.Select(s => s.ProblemData.Dataset.GetDoubleValues(freeVariable, s.ProblemData.TrainingIndices).Where(x => !double.IsNaN(x)).Max()).Min();
    355352
    356353      if (initializeAxisRanges) {
Note: See TracChangeset for help on using the changeset viewer.