GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r604:6cc1dd13aa83

(Refactoring) Renames IDataSeries::minData() and IDataSeries::maxData()

Alexandre Leroux -

r604:6cc1dd13aa83

parent child

Context file:

r604:6cc1dd13aa83

Collapse all files

core/include/Data/DataSeries.h +4 -4

                          std::make_unique<dataseries_detail::IteratorValue<Dim> >(*this, false)}};
                  }
-                 /// @sa IDataSeries::minData()
-                 DataSeriesIterator minData(double minXAxisData) const override
+                 /// @sa IDataSeries::minXAxisData()
+                 DataSeriesIterator minXAxisData(double minXAxisData) const override
                  {
                      return std::lower_bound(
                          cbegin(), cend(), minXAxisData,
                          [](const auto &itValue, const auto &value) { return itValue.x() < value; });
                  }
-                 /// @sa IDataSeries::maxData()
-                 DataSeriesIterator maxData(double maxXAxisData) const override
+                 /// @sa IDataSeries::maxXAxisData()
+                 DataSeriesIterator maxXAxisData(double maxXAxisData) const override
                  {
                      // Gets the first element that greater than max value
                      auto it = std::upper_bound(

core/include/Data/IDataSeries.h +2 -2

                  /// @return the iterator to the first entry of the data series whose x-axis data is greater than
                  /// or equal to the value passed in parameter, or the end iterator if there is no matching value
-                 virtual DataSeriesIterator minData(double minXAxisData) const = 0;
+                 virtual DataSeriesIterator minXAxisData(double minXAxisData) const = 0;
                  /// @return the iterator to the last entry of the data series whose x-axis data is less than or
                  /// equal to the value passed in parameter, or the end iterator if there is no matching value
-                 virtual DataSeriesIterator maxData(double maxXAxisData) const = 0;
+                 virtual DataSeriesIterator maxXAxisData(double maxXAxisData) const = 0;
                  virtual std::pair<DataSeriesIterator, DataSeriesIterator> subData(double min,
                                                                                    double max) const = 0;

core/src/Variable/VariableModel.cpp +2 -2

                              case TSTART_COLUMN:
                                  // Shows the min value of the data series above the range tstart
                                  return dateTimeVariant([min = variable->range().m_TStart](
-                                     const auto &dataSeries) { return dataSeries.minData(min); });
+                                     const auto &dataSeries) { return dataSeries.minXAxisData(min); });
                              case TEND_COLUMN:
                                  // Shows the max value of the data series under the range tend
                                  return dateTimeVariant([max = variable->range().m_TEnd](
-                                     const auto &dataSeries) { return dataSeries.maxData(max); });
+                                     const auto &dataSeries) { return dataSeries.maxXAxisData(max); });
                              case UNIT_COLUMN:
                                  return variable->metadata().value(QStringLiteral("units"));
                              case MISSION_COLUMN:

core/tests/Data/TestDataSeries.cpp +14 -14

                  void testMerge();
                  /// Input test data
-                 /// @sa testMinData()
-                 void testMinData_data();
+                 /// @sa testMinXAxisData()
+                 void testMinXAxisData_data();
-                 /// Tests get min data of a data series
-                 void testMinData();
+                 /// Tests get min x-axis data of a data series
+                 void testMinXAxisData();
                  /// Input test data
-                 /// @sa testMaxData()
-                 void testMaxData_data();
+                 /// @sa testMaxXAxisData()
+                 void testMaxXAxisData_data();
-                 /// Tests get max data of a data series
-                 void testMaxData();
+                 /// Tests get max x-axis data of a data series
+                 void testMaxXAxisData();
                  /// Input test data
                  /// @sa testSubdata()
                                     seriesValuesData.cbegin()));
              }
-             void TestDataSeries::testMinData_data()
+             void TestDataSeries::testMinXAxisData_data()
              {
                  // ////////////// //
                  // Test structure //
                                            << std::numeric_limits<double>::quiet_NaN();
              }
-             void TestDataSeries::testMinData()
+             void TestDataSeries::testMinXAxisData()
              {
                  QFETCH(std::shared_ptr<ScalarSeries>, dataSeries);
                  QFETCH(double, min);
                  QFETCH(bool, expectedOK);
                  QFETCH(double, expectedMin);
-                 auto it = dataSeries->minData(min);
+                 auto it = dataSeries->minXAxisData(min);
                  QCOMPARE(expectedOK, it != dataSeries->cend());
                  }
              }
-             void TestDataSeries::testMaxData_data()
+             void TestDataSeries::testMaxXAxisData_data()
              {
                  // ////////////// //
                  // Test structure //
                                            << std::numeric_limits<double>::quiet_NaN();
              }
-             void TestDataSeries::testMaxData()
+             void TestDataSeries::testMaxXAxisData()
              {
                  QFETCH(std::shared_ptr<ScalarSeries>, dataSeries);
                  QFETCH(double, max);
                  QFETCH(bool, expectedOK);
                  QFETCH(double, expectedMax);
-                 auto it = dataSeries->maxData(max);
+                 auto it = dataSeries->maxXAxisData(max);
                  QCOMPARE(expectedOK, it != dataSeries->cend());

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages