GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r646:cb05b478d08e

Updates merge method...

Alexandre Leroux -

r646:cb05b478d08e

parent child

Context file:

r646:cb05b478d08e

Collapse all files

core/include/Data/ArrayData.h +10 -19

                          return;
                      }
-                     if (prepend) {
-                         auto otherDataSize = other.m_Data.size();
-                         m_Data.insert(m_Data.begin(), otherDataSize, 0.);
-                         for (auto i = 0; i < otherDataSize; ++i) {
-                             m_Data.replace(i, other.m_Data.at(i));
+                         }
+                     }
-                     else {
-                         m_Data.append(other.m_Data);
+                     }
+                     insert(other.cbegin(), other.cend(), prepend);
                  }
                  void clear()
                      }
                  }
-                 /// Inserts at the end of the array data the values passed as a parameter. This
-                 /// method is intended to be used in the context of generating a back insert iterator, or only
-                 /// if it's ensured that the total size of the vector is consistent with the number of
-                 /// components of the array data
-                 /// @param values the values to insert
-                 /// @sa http://en.cppreference.com/w/cpp/iterator/back_inserter
-                 void push_back(const QVector<double> &values)
+                 void insert(ArrayDataIterator first, ArrayDataIterator last, bool prepend = false)
                  {
-                     Q_ASSERT(values.size() % m_NbComponents == 0);
-                     m_Data.append(values);
+                     auto firstImpl = dynamic_cast<arraydata_detail::IteratorValue<Dim, true> *>(first->impl());
+                     auto lastImpl = dynamic_cast<arraydata_detail::IteratorValue<Dim, true> *>(last->impl());
+                     if (firstImpl && lastImpl) {
+                         auto insertIt = prepend ? m_Data.begin() : m_Data.end();
+                         m_Data.insert(insertIt, firstImpl->m_It, lastImpl->m_It);
+                     }
                  }
                  /**

core/include/Data/DataSeries.h +12 -21

                  friend class DataSeriesMergeHelper;
              public:
-                 /// Tag needed to define the push_back() method
-                 /// @sa push_back()
-                 using value_type = DataSeriesIteratorValue;
                  /// @sa IDataSeries::xAxisData()
                  std::shared_ptr<ArrayData<1> > xAxisData() override { return m_XAxisData; }
                  const std::shared_ptr<ArrayData<1> > xAxisData() const { return m_XAxisData; }
                      }
                  }
+                 void insert(DataSeriesIterator first, DataSeriesIterator last, bool prepend = false)
+                 {
+                     auto firstImpl = dynamic_cast<dataseries_detail::IteratorValue<Dim, true> *>(first->impl());
+                     auto lastImpl = dynamic_cast<dataseries_detail::IteratorValue<Dim, true> *>(last->impl());
+                     if (firstImpl && lastImpl) {
+                         m_XAxisData->insert(firstImpl->m_XIt, lastImpl->m_XIt, prepend);
+                         m_ValuesData->insert(firstImpl->m_ValuesIt, lastImpl->m_ValuesIt, prepend);
+                     }
+                 }
                  /// @sa IDataSeries::minXAxisData()
                  DataSeriesIterator minXAxisData(double minXAxisData) const override
                  {
                          begin, end, minXAxisData,
                          [](const auto &itValue, const auto &value) { return itValue.x() < value; });
                      auto upperIt = std::upper_bound(
-                         begin, end, maxXAxisData,
+                         lowerIt, end, maxXAxisData,
                          [](const auto &value, const auto &itValue) { return value < itValue.x(); });
                      return std::make_pair(lowerIt, upperIt);
                  virtual void lockWrite() { m_Lock.lockForWrite(); }
                  virtual void unlock() { m_Lock.unlock(); }
-                 // ///// //
-                 // Other //
-                 // ///// //
-                 /// Inserts at the end of the data series the value of the iterator passed as a parameter. This
-                 /// method is intended to be used in the context of generating a back insert iterator
-                 /// @param iteratorValue the iterator value containing the values to insert
-                 /// @sa http://en.cppreference.com/w/cpp/iterator/back_inserter
-                 /// @sa merge()
-                 /// @sa value_type
-                 void push_back(const value_type &iteratorValue)
+                 {
-                     m_XAxisData->push_back(QVector<double>{iteratorValue.x()});
-                     m_ValuesData->push_back(iteratorValue.values());
+                 }
              protected:
                  /// Protected ctor (DataSeries is abstract). The vectors must have the same size, otherwise a
                  /// DataSeries with no values will be created.

core/include/Data/DataSeriesMergeHelper.h +22 -71

		@@ -27,45 +27,6 MergeScope<FEnd> scope(FEnd end)
27	27	return MergeScope<FEnd>{end};
28	28	}
29	29
30		/**
31		* Enum used to position a data series relative to another during a merge operation
32		*/
33		enum class MergePosition { LOWER_THAN, GREATER_THAN, EQUAL, OVERLAP };
34
35		/**
36		* Computes the position of the first data series relative to the second data series
37		* @param lhs the first data series
38		* @param rhs the second data series
39		* @return the merge position computed
40		* @remarks the data series must not be empty
41		*/
42		template <int Dim>
43		MergePosition mergePosition(DataSeries<Dim> &lhs, DataSeries<Dim> &rhs)
44		{
45		Q_ASSERT(!lhs.isEmpty() && !rhs.isEmpty());
46
47		// Case lhs < rhs
48		auto lhsLast = --lhs.cend();
49		auto rhsFirst = rhs.cbegin();
50		if (lhsLast->x() < rhsFirst->x()) {
51		return MergePosition::LOWER_THAN;
52		}
53
54		// Case lhs > rhs
55		auto lhsFirst = lhs.cbegin();
56		auto rhsLast = --rhs.cend();
57		if (lhsFirst->x() > rhsLast->x()) {
58		return MergePosition::GREATER_THAN;
59		}
60
61		// Other cases
62		auto equal = std::equal(lhs.cbegin(), lhs.cend(), rhs.cbegin(), rhs.cend(),
63		[](const auto &it1, const auto &it2) {
64		return it1.x() == it2.x() && it1.values() == it2.values();
65		});
66		return equal ? MergePosition::EQUAL : MergePosition::OVERLAP;
67		}
68
69	30	} // namespace detail
70	31
71	32
		@@ -92,40 +53,30 struct DataSeriesMergeHelper {
92	53	return;
93	54	}
94	55
95		// Gets the position of the source in relation to the destination
96		auto sourcePosition = detail::mergePosition(source, dest);
	56	auto destMin = dest.cbegin()->x();
	57	auto destMax = (--dest.cend())->x();
	58
	59	auto sourceBegin = source.cbegin();
	60	auto sourceEnd = source.cend();
	61	auto sourceMin = sourceBegin->x();
	62	auto sourceMax = (--source.cend())->x();
97	63
98		switch (sourcePosition) {
99		case detail::MergePosition::LOWER_THAN:
100		case detail::MergePosition::GREATER_THAN: {
101		auto prepend = sourcePosition == detail::MergePosition::LOWER_THAN;
102		dest.m_XAxisData->add(*source.m_XAxisData, prepend);
103		dest.m_ValuesData->add(*source.m_ValuesData, prepend);
104		break;
105		}
106		case detail::MergePosition::EQUAL:
107		// the data series equal each other : no merge made
108		break;
109		case detail::MergePosition::OVERLAP: {
110		// the two data series overlap : merge is made
111		auto temp = dest.clone();
112		if (auto tempSeries = dynamic_cast<DataSeries<Dim> *>(temp.get())) {
113		// Makes the merge :
114		// - Data are sorted by x-axis values
115		// - If two entries are in the source range and the other range, only one entry
116		// is retained as result
117		// - The results are stored directly in the data series
118		dest.clear();
119		std::set_union(
120		tempSeries->cbegin(), tempSeries->cend(), source.cbegin(), source.cend(),
121		std::back_inserter(dest),
122		[](const auto &it1, const auto &it2) { return it1.x() < it2.x(); });
123		}
124		break;
125		}
126		default:
127		Q_ASSERT(false);
	64	// Case : source bounds are inside dest bounds -> no merge is made
	65	if (sourceMin >= destMin && sourceMax <= destMax) {
	66	return;
128	67	}
	68
	69	// Default case :
	70	// - prepend to dest the values of source that are lower than min value of dest
	71	// - append to dest the values of source that are greater than max value of dest
	72	auto lowerIt
	73	= std::lower_bound(sourceBegin, sourceEnd, destMin,
	74	[](const auto &it, const auto &val) { return it.x() < val; });
	75	auto upperIt
	76	= std::upper_bound(lowerIt, sourceEnd, destMax,
	77	[](const auto &val, const auto &it) { return val < it.x(); });
	78	dest.insert(sourceBegin, lowerIt, true);
	79	dest.insert(upperIt, sourceEnd);
129	80	}
130	81	};
131	82

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