Changeset 12774


Ignore:
Timestamp:
07/17/15 12:34:45 (6 years ago)
Author:
abeham
Message:

#2431: minor improvements

Location:
branches/PerformanceComparison
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/PerformanceComparison/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityPerClockAnalyzer.cs

    r12771 r12774  
    2121
    2222using System;
     23using System.Linq;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
     
    7475
    7576    public override IOperation Apply() {
    76       var executionTime = Math.Max(ExecutionTimeParameter.ResultValue.Value.TotalSeconds, 0.001);
     77      var executionTime = Math.Max(ExecutionTimeParameter.ResultValue.Value.TotalSeconds, 0.2);
    7778      var bestQuality = BestQualityParameter.ActualValue.Value;
    7879
    7980      var dataTable = QualityPerClockParameter.ResultValue;
    80       dataTable.Rows["First-hit Graph"].Values.Add(Tuple.Create(executionTime, bestQuality));
     81      var values = dataTable.Rows["First-hit Graph"].Values;
     82      if (values.Count == 0 || values.Last().Item2 != bestQuality)
     83        dataTable.Rows["First-hit Graph"].Values.Add(Tuple.Create(executionTime, bestQuality));
    8184
    8285      return base.Apply();
  • branches/PerformanceComparison/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityPerEvaluationsAnalyzer.cs

    r12771 r12774  
    2121
    2222using System;
     23using System.Linq;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
     
    7677
    7778      var dataTable = QualityPerEvaluationsParameter.ResultValue;
    78       dataTable.Rows["First-hit Graph"].Values.Add(Tuple.Create((double)evaluations, bestQuality));
     79      var values = dataTable.Rows["First-hit Graph"].Values;
     80      if (values.Count == 0 || values.Last().Item2 != bestQuality)
     81        values.Add(Tuple.Create((double)evaluations, bestQuality));
    7982
    8083      return base.Apply();
  • branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionECDFView.cs

    r12771 r12774  
    163163      SuspendRepaint();
    164164      try {
     165        combinedDataTable.VisualProperties.XAxisLogScale = false;
    165166        combinedDataTable.Rows.Clear();
    166167        var table = (string)dataTableComboBox.SelectedItem;
     
    211212          foreach (var h in hits) {
    212213            total += h.Value;
    213             row.Values.Add(Tuple.Create(Math.Max(1, h.Key), total / (group.Item2.Count * levels.Length)));
     214            row.Values.Add(Tuple.Create(h.Key, total / (group.Item2.Count * levels.Length)));
    214215          }
    215216          combinedDataTable.Rows.Add(row);
    216217        }
    217218        combinedDataTable.VisualProperties.XAxisTitle = string.Join(" / ", xAxisTitles);
     219        combinedDataTable.VisualProperties.XAxisLogScale = logScalingCheckBox.Checked;
    218220      } finally { ResumeRepaint(true); }
    219221    }
     
    222224      string selectedItem = (string)groupComboBox.SelectedItem;
    223225
    224       var groupings = Content.ParameterNames.ToArray();
     226      var groupings = Content.ParameterNames.OrderBy(x => x).ToArray();
    225227      groupComboBox.Items.Clear();
    226228      groupComboBox.Items.Add(AllRuns);
Note: See TracChangeset for help on using the changeset viewer.