- Timestamp:
- 04/16/13 13:13:41 (11 years ago)
- Location:
- branches/OaaS
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/OaaS
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll 23 24 packages
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Analysis.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Analysis.Views merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Analysis.Views 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Analysis.Views 6917-7005 /branches/CMAES/HeuristicLab.Analysis.Views 9141-9257 /branches/CloningRefactoring/HeuristicLab.Analysis.Views 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Analysis.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Analysis.Views 5815-6180 /branches/DataAnalysis/HeuristicLab.Analysis.Views 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Analysis.Views 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Analysis.Views 5060 /branches/NET40/sources/HeuristicLab.Analysis.Views 5138-5162 /branches/ParallelEngine/HeuristicLab.Analysis.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Analysis.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Analysis.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Analysis.Views 6828 /branches/RuntimeOptimizer/HeuristicLab.Analysis.Views 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views 7787-8333 /branches/SlaveShutdown/HeuristicLab.Analysis.Views 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Analysis.Views 5370-5682 /branches/Trunk/HeuristicLab.Analysis.Views 6829-6865 /branches/UnloadJobs/HeuristicLab.Analysis.Views 9168-9215 /branches/VNS/HeuristicLab.Analysis.Views 5594-5752 /branches/histogram/HeuristicLab.Analysis.Views 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/OaaS/HeuristicLab.Analysis.Views/3.3/DataTableView.cs
r7979 r9363 20 20 #endregion 21 21 22 using HeuristicLab.Collections; 23 using HeuristicLab.Core.Views; 24 using HeuristicLab.MainForm; 22 25 using System; 23 26 using System.Collections.Generic; … … 26 29 using System.Windows.Forms; 27 30 using System.Windows.Forms.DataVisualization.Charting; 28 using HeuristicLab.Collections;29 using HeuristicLab.Core.Views;30 using HeuristicLab.MainForm;31 31 32 32 namespace HeuristicLab.Analysis.Views { … … 115 115 public void ShowConfiguration() { 116 116 if (Content != null) { 117 using ( DataTableVisualPropertiesDialogdialog = new DataTableVisualPropertiesDialog(Content)) {117 using (var dialog = new DataTableVisualPropertiesDialog(Content)) { 118 118 dialog.ShowDialog(this); 119 119 } … … 123 123 foreach (var row in rows) { 124 124 RegisterDataRowEvents(row); 125 Seriesseries = new Series(row.Name);125 var series = new Series(row.Name); 126 126 if (row.VisualProperties.DisplayName.Trim() != String.Empty) series.LegendText = row.VisualProperties.DisplayName; 127 127 else series.LegendText = row.Name; … … 231 231 if (!Content.VisualProperties.AxisTitleColor.IsEmpty) area.AxisY2.TitleForeColor = Content.VisualProperties.AxisTitleColor; 232 232 area.AxisY2.Title = Content.VisualProperties.SecondYAxisTitle; 233 234 area.AxisX.IsLogarithmic = Content.VisualProperties.XAxisLogScale; 235 area.AxisX2.IsLogarithmic = Content.VisualProperties.SecondXAxisLogScale; 236 area.AxisY.IsLogarithmic = Content.VisualProperties.YAxisLogScale; 237 area.AxisY2.IsLogarithmic = Content.VisualProperties.SecondYAxisLogScale; 233 238 } 234 239 … … 500 505 break; 501 506 default: { 507 bool yLogarithmic = series.YAxisType == AxisType.Primary 508 ? Content.VisualProperties.YAxisLogScale 509 : Content.VisualProperties.SecondYAxisLogScale; 510 bool xLogarithmic = series.XAxisType == AxisType.Primary 511 ? Content.VisualProperties.XAxisLogScale 512 : Content.VisualProperties.SecondXAxisLogScale; 502 513 for (int i = 0; i < row.Values.Count; i++) { 503 514 var value = row.Values[i]; 504 DataPointpoint = new DataPoint();505 point.XValue = row.VisualProperties.StartIndexZero ? i : i + 1;506 if (IsInvalidValue(value) )515 var point = new DataPoint(); 516 point.XValue = row.VisualProperties.StartIndexZero && !xLogarithmic ? i : i + 1; 517 if (IsInvalidValue(value) || (yLogarithmic && value <= 0)) 507 518 point.IsEmpty = true; 508 519 else … … 537 548 double intervalCenter = intervalWidth / 2; 538 549 539 double min = 0.0 ;550 double min = 0.0, max = 0.0; 540 551 if (!Double.IsNaN(Content.VisualProperties.XAxisMinimumFixedValue) && !Content.VisualProperties.XAxisMinimumAuto) 541 552 min = Content.VisualProperties.XAxisMinimumFixedValue; 542 553 else min = minValue; 554 if (!Double.IsNaN(Content.VisualProperties.XAxisMaximumFixedValue) && !Content.VisualProperties.XAxisMaximumAuto) 555 max = Content.VisualProperties.XAxisMaximumFixedValue; 556 else max = maxValue + intervalWidth; 543 557 544 558 double axisInterval = intervalWidth / row.VisualProperties.ScaleFactor; … … 550 564 551 565 // get the range or intervals which define the grouping of the frequency values 552 var doubleRange = DoubleRange(min, max Value + intervalWidth, intervalWidth).Skip(1).ToList();566 var doubleRange = DoubleRange(min, max, intervalWidth).Skip(1).ToList(); 553 567 554 568 // aggregate the row values by unique key and frequency value
Note: See TracChangeset
for help on using the changeset viewer.