Changeset 16047


Ignore:
Timestamp:
08/06/18 13:58:34 (3 years ago)
Author:
mkommend
Message:

#2876: Merged r15607, r15610 into stable.

Location:
stable
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Optimization.Views

  • stable/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.Designer.cs

    r15584 r16047  
    5454      this.yAxisComboBox = new System.Windows.Forms.ComboBox();
    5555      this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
     56      this.openBubbleChartViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    5657      this.noRunsLabel = new System.Windows.Forms.Label();
    5758      this.splitContainer = new System.Windows.Forms.SplitContainer();
     
    112113      // chart
    113114      //
    114       this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    115             | System.Windows.Forms.AnchorStyles.Left) 
     115      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     116            | System.Windows.Forms.AnchorStyles.Left)
    116117            | System.Windows.Forms.AnchorStyles.Right)));
    117118      chartArea1.Name = "ChartArea1";
     
    132133      this.chart.MouseMove += new System.Windows.Forms.MouseEventHandler(this.chart_MouseMove);
    133134      //
     135      // openBubbleChartViewToolStripMenuItem
     136      //
     137      this.openBubbleChartViewToolStripMenuItem.Name = "openBubbleChartViewToolStripMenuItem";
     138      this.openBubbleChartViewToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
     139      this.openBubbleChartViewToolStripMenuItem.Text = "Open BubbleChart View";
     140      this.openBubbleChartViewToolStripMenuItem.Click += new System.EventHandler(this.openBubbleChartViewToolStripMenuItem_Click);
     141      //
    134142      // noRunsLabel
    135143      //
     
    183191      // statisticsGroupBox
    184192      //
    185       this.statisticsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    186             | System.Windows.Forms.AnchorStyles.Left) 
     193      this.statisticsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     194            | System.Windows.Forms.AnchorStyles.Left)
    187195            | System.Windows.Forms.AnchorStyles.Right)));
    188196      this.statisticsGroupBox.Controls.Add(this.statisticsMatrixView);
     
    239247    private System.Windows.Forms.ToolTip tooltip;
    240248    protected System.Windows.Forms.CheckBox showStatisticsCheckBox;
     249    private System.Windows.Forms.ToolStripMenuItem openBubbleChartViewToolStripMenuItem;
    241250  }
    242251}
  • stable/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.cs

    r15584 r16047  
    4848    public RunCollectionBoxPlotView() {
    4949      InitializeComponent();
     50      chart.ContextMenuStrip.Items.Insert(0, openBubbleChartViewToolStripMenuItem);
     51
    5052      categoricalMapping = new Dictionary<int, Dictionary<object, double>>();
    5153      seriesCache = new SortedDictionary<double, Series>();
     
    211213
    212214    private void UpdateStatistics() {
    213       DoubleMatrix matrix = new DoubleMatrix(9, seriesCache.Count);
     215      DoubleMatrix matrix = new DoubleMatrix(10, seriesCache.Count);
    214216      matrix.SortableView = false;
    215217      List<string> columnNames = new List<string>();
     
    224226            AxisDimension axisDimension = (AxisDimension)Enum.Parse(typeof(AxisDimension), selectedAxis);
    225227            switch (axisDimension) {
    226               case AxisDimension.Color: value = new StringValue(run.Color.ToString());
     228              case AxisDimension.Color:
     229                value = new StringValue(run.Color.ToString());
    227230                break;
    228231            }
     
    236239      }
    237240      matrix.ColumnNames = columnNames;
    238       matrix.RowNames = new string[] { "Count", "Minimum", "Maximum", "Median", "Average", "Standard Deviation", "Variance", "25th Percentile", "75th Percentile" };
     241      matrix.RowNames = new string[] { "Count", "Minimum", "Maximum", "Median", "Average", "Standard Deviation", "Variance", "25th Percentile", "75th Percentile", "Interquartile Range" };
    239242
    240243      for (int i = 0; i < seriesCache.Count; i++) {
     
    250253        matrix[7, i] = seriesValues.Quantile(0.25);
    251254        matrix[8, i] = seriesValues.Quantile(0.75);
     255        matrix[9, i] = matrix[8, i] - matrix[7, i];
    252256      }
    253257      statisticsMatrixView.Content = matrix;
     
    445449    }
    446450
     451    private void openBubbleChartViewToolStripMenuItem_Click(object sender, EventArgs e) {
     452      RunCollectionBubbleChartView bubbleChartView = new RunCollectionBubbleChartView();
     453      bubbleChartView.Content = this.Content;
     454      bubbleChartView.xAxisComboBox.SelectedItem = xAxisComboBox.SelectedItem;
     455      bubbleChartView.yAxisComboBox.SelectedItem = yAxisComboBox.SelectedItem;
     456      bubbleChartView.Show();
     457    }
     458
    447459    private void chart_MouseMove(object sender, MouseEventArgs e) {
    448460      string newTooltipText = string.Empty;
     
    463475    }
    464476
    465   public bool StatisticsVisible {
    466     get { return splitContainer.Panel2Collapsed; }
    467     set { splitContainer.Panel2Collapsed = value; }
    468   }
    469  
     477    public bool StatisticsVisible {
     478      get { return splitContainer.Panel2Collapsed; }
     479      set { splitContainer.Panel2Collapsed = value; }
     480    }
     481
    470482    public void SetXAxis(string axisName) {
    471483      xAxisComboBox.SelectedItem = axisName;
  • stable/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBubbleChartView.Designer.cs

    r15584 r16047  
    201201      // chart
    202202      //
    203       this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    204             | System.Windows.Forms.AnchorStyles.Left) 
     203      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     204            | System.Windows.Forms.AnchorStyles.Left)
    205205            | System.Windows.Forms.AnchorStyles.Right)));
    206206      chartArea1.Name = "ChartArea1";
     
    455455
    456456    private System.Windows.Forms.Label xAxisLabel;
    457     private System.Windows.Forms.ComboBox xAxisComboBox;
     457    internal System.Windows.Forms.ComboBox xAxisComboBox;
    458458    private System.Windows.Forms.Label yAxisLabel;
    459     private System.Windows.Forms.ComboBox yAxisComboBox;
     459    internal System.Windows.Forms.ComboBox yAxisComboBox;
    460460    private System.Windows.Forms.TrackBar yTrackBar;
    461461    private System.Windows.Forms.TrackBar xTrackBar;
Note: See TracChangeset for help on using the changeset viewer.