HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r605:06b66012b93b

(Refactoring) Renames IDataSeries::subData()

Alexandre Leroux -

r605:06b66012b93b

parent child

Context file:

r605:06b66012b93b

Collapse all files

core/include/Data/DataSeries.h +10 -11

                      return it == cbegin() ? cend() : --it;
                  }
-                 std::pair<DataSeriesIterator, DataSeriesIterator> subData(double min, double max) const override
+                 std::pair<DataSeriesIterator, DataSeriesIterator> xAxisRange(double minXAxisData,
+                                                                              double maxXAxisData) const override
                  {
-                     if (min > max) {
-                         std::swap(min, max);
+                     if (minXAxisData > maxXAxisData) {
+                         std::swap(minXAxisData, maxXAxisData);
                      }
                      auto begin = cbegin();
                      auto end = cend();
-                     auto lowerIt
-                         = std::lower_bound(begin, end, min, [](const auto &itValue, const auto &value) {
-                               return itValue.x() < value;
-                           });
-                     auto upperIt
-                         = std::upper_bound(begin, end, max, [](const auto &value, const auto &itValue) {
-                               return value < itValue.x();
-                           });
+                     auto lowerIt = std::lower_bound(
+                         begin, end, minXAxisData,
+                         [](const auto &itValue, const auto &value) { return itValue.x() < value; });
+                     auto upperIt = std::upper_bound(
+                         begin, end, maxXAxisData,
+                         [](const auto &value, const auto &itValue) { return value < itValue.x(); });
                      return std::make_pair(lowerIt, upperIt);
                  }

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

                  /// equal to the value passed in parameter, or the end iterator if there is no matching value
                  virtual DataSeriesIterator maxXAxisData(double maxXAxisData) const = 0;
-                 virtual std::pair<DataSeriesIterator, DataSeriesIterator> subData(double min,
-                                                                                   double max) const = 0;
+                 /// @return the iterators pointing to the range of data whose x-axis values are between min and
+                 /// max passed in parameters
+                 virtual std::pair<DataSeriesIterator, DataSeriesIterator>
+                 xAxisRange(double minXAxisData, double maxXAxisData) const = 0;
                  // /////// //
                  // Mutexes //

core/src/Data/ScalarSeries.cpp +1 -1

                  auto subValuesData = QVector<double>();
                  this->lockRead();
                  {
-                     auto bounds = subData(range.m_TStart, range.m_TEnd);
+                     auto bounds = xAxisRange(range.m_TStart, range.m_TEnd);
                      for (auto it = bounds.first; it != bounds.second; ++it) {
                          subXAxisData.append(it->x());
                          subValuesData.append(it->value());

core/src/Data/VectorSeries.cpp +1 -1

                  this->lockRead();
                  {
-                     auto bounds = subData(range.m_TStart, range.m_TEnd);
+                     auto bounds = xAxisRange(range.m_TStart, range.m_TEnd);
                      for (auto it = bounds.first; it != bounds.second; ++it) {
                          subXAxisData.append(it->x());
                          subXValuesData.append(it->value(0));

core/tests/Data/TestDataSeries.cpp +37 -29

                  void testMaxXAxisData();
                  /// Input test data
-                 /// @sa testSubdata()
-                 void testSubdata_data();
+                 /// @sa testXAxisRange()
+                 void testXAxisRange_data();
-                 /// Tests get subdata of two data series
-                 void testSubdata();
+                 /// Tests get x-axis range of a data series
+                 void testXAxisRange();
              };
              void TestDataSeries::testCtor_data()
                  }
              }
-             void TestDataSeries::testSubdata_data()
+             void TestDataSeries::testXAxisRange_data()
              {
                  // ////////////// //
                  // Test structure //
                  // ////////////// //
-                 // Data series to get subdata
+                 // Data series to get x-axis range
                  QTest::addColumn<std::shared_ptr<ScalarSeries> >("dataSeries");
                  // Min/max values
                  QTest::addColumn<double>("min");
                  QTest::addColumn<double>("max");
-                 // Expected values after subdata
+                 // Expected values
                  QTest::addColumn<QVector<double> >("expectedXAxisData");
                  QTest::addColumn<QVector<double> >("expectedValuesData");
                  // Test cases //
                  // ////////// //
-                 QTest::newRow("subData1") << createSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.})
-                                           << -1. << 3.2 << QVector<double>{1., 2., 3.}
-                                           << QVector<double>{100., 200., 300.};
-                 QTest::newRow("subData2") << createSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.})
-                                           << 1. << 4. << QVector<double>{1., 2., 3., 4.}
-                                           << QVector<double>{100., 200., 300., 400.};
-                 QTest::newRow("subData3") << createSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.})
-                                           << 1. << 3.9 << QVector<double>{1., 2., 3.}
-                                           << QVector<double>{100., 200., 300.};
-                 QTest::newRow("subData4") << createSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.})
-                                           << 0. << 0.9 << QVector<double>{} << QVector<double>{};
-                 QTest::newRow("subData5") << createSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.})
-                                           << 0. << 1. << QVector<double>{1.} << QVector<double>{100.};
-                 QTest::newRow("subData6") << createSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.})
-                                           << 2.1 << 6. << QVector<double>{3., 4., 5.}
-                                           << QVector<double>{300., 400., 500.};
-                 QTest::newRow("subData7") << createSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.})
-                                           << 6. << 9. << QVector<double>{} << QVector<double>{};
-                 QTest::newRow("subData8") << createSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.})
-                                           << 5. << 9. << QVector<double>{5.} << QVector<double>{500.};
+                 QTest::newRow("xAxisRange1") << createSeries({1., 2., 3., 4., 5.},
+                                                              {100., 200., 300., 400., 500.})
+                                              << -1. << 3.2 << QVector<double>{1., 2., 3.}
+                                              << QVector<double>{100., 200., 300.};
+                 QTest::newRow("xAxisRange2") << createSeries({1., 2., 3., 4., 5.},
+                                                              {100., 200., 300., 400., 500.})
+                                              << 1. << 4. << QVector<double>{1., 2., 3., 4.}
+                                              << QVector<double>{100., 200., 300., 400.};
+                 QTest::newRow("xAxisRange3") << createSeries({1., 2., 3., 4., 5.},
+                                                              {100., 200., 300., 400., 500.})
+                                              << 1. << 3.9 << QVector<double>{1., 2., 3.}
+                                              << QVector<double>{100., 200., 300.};
+                 QTest::newRow("xAxisRange4") << createSeries({1., 2., 3., 4., 5.},
+                                                              {100., 200., 300., 400., 500.})
+                                              << 0. << 0.9 << QVector<double>{} << QVector<double>{};
+                 QTest::newRow("xAxisRange5") << createSeries({1., 2., 3., 4., 5.},
+                                                              {100., 200., 300., 400., 500.})
+                                              << 0. << 1. << QVector<double>{1.} << QVector<double>{100.};
+                 QTest::newRow("xAxisRange6") << createSeries({1., 2., 3., 4., 5.},
+                                                              {100., 200., 300., 400., 500.})
+                                              << 2.1 << 6. << QVector<double>{3., 4., 5.}
+                                              << QVector<double>{300., 400., 500.};
+                 QTest::newRow("xAxisRange7") << createSeries({1., 2., 3., 4., 5.},
+                                                              {100., 200., 300., 400., 500.})
+                                              << 6. << 9. << QVector<double>{} << QVector<double>{};
+                 QTest::newRow("xAxisRange8") << createSeries({1., 2., 3., 4., 5.},
+                                                              {100., 200., 300., 400., 500.})
+                                              << 5. << 9. << QVector<double>{5.} << QVector<double>{500.};
              }
-             void TestDataSeries::testSubdata()
+             void TestDataSeries::testXAxisRange()
              {
                  QFETCH(std::shared_ptr<ScalarSeries>, dataSeries);
                  QFETCH(double, min);
                  QFETCH(QVector<double>, expectedXAxisData);
                  QFETCH(QVector<double>, expectedValuesData);
-                 auto bounds = dataSeries->subData(min, max);
+                 auto bounds = dataSeries->xAxisRange(min, max);
                  QVERIFY(std::equal(bounds.first, bounds.second, expectedXAxisData.cbegin(),
                                     expectedXAxisData.cend(),
                                     [](const auto &it, const auto &expectedX) { return it.x() == expectedX; }));

gui/src/Visualization/VisualizationGraphHelper.cpp +1 -1

                      // - Gets the data of the series included in the current range
                      // - Updates each plottable by adding, for each data item, a point that takes x-axis data
                      // and value data. The correct value is retrieved according to the index of the component
-                     auto subDataIts = dataSeries.subData(range.m_TStart, range.m_TEnd);
+                     auto subDataIts = dataSeries.xAxisRange(range.m_TStart, range.m_TEnd);
                      for (auto it = subDataIts.first; it != subDataIts.second; ++it) {
                          for (const auto &dataContainer : dataContainers) {
                              auto componentIndex = dataContainer.first;

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