Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Indexes redesigned to return data reference directly for cleaner code

Browse Source
This commit is contained in:
Simon Rozman
2016-03-08 14:09:23 +01:00
parent 4d72a5bc4c
commit e13133d0e4
6 changed files with 106 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
lib/libZRCola/include/zrcola/common.h
View File

@@ -55,7 +55,7 @@ namespace ZRCola {
///
/// Memory index
///
template <class T, class T_idx = unsigned __int32>
template <class T, class T_idx = unsigned __int32, class T_data = T>
class index : public std::vector<T_idx>
{
protected:
@@ -70,6 +70,58 @@ namespace ZRCola {
index(_In_ std::vector<T> &h) : host(h) {}
///
/// Returns data at given position according to the index
///
/// \param[in] pos Position
///
/// \returns Data reference
///
inline const T_data& at(size_type pos) const
{
return (const T_data&)host.at(std::vector<T_idx>::at(pos));
}
///
/// Returns data at given position according to the index
///
/// \param[in] pos Position
///
/// \returns Data reference
///
inline T_data& at(size_type pos)
{
return (T_data&)host.at(std::vector<T_idx>::at(pos));
}
///
/// Returns data at given position according to the index
///
/// \param[in] pos Position
///
/// \returns Data reference
///
inline const T_data& operator[](size_type pos) const
{
return (const T_data&)host[std::vector<T_idx>::at(pos)];
}
///
/// Returns data at given position according to the index
///
/// \param[in] pos Position
///
/// \returns Data reference
///
inline T_data& operator[](size_type pos)
{
return (T_data&)host[std::vector<T_idx>::at(pos)];
}
///
/// Sorts index
///
@@ -90,7 +142,7 @@ namespace ZRCola {
/// - =0 when a == b
/// - >0 when a > b
///
virtual int compare(_In_ const T &a, _In_ const T &b) const = 0;
virtual int compare(_In_ const T_data &a, _In_ const T_data &b) const = 0;
///
@@ -104,7 +156,7 @@ namespace ZRCola {
/// - =0 when a == b
/// - >0 when a > b
///
virtual int compare_sort(_In_ const T &a, _In_ const T &b) const = 0;
virtual int compare_sort(_In_ const T_data &a, _In_ const T_data &b) const = 0;
///
@@ -119,26 +171,26 @@ namespace ZRCola {
/// - true if found
/// - false otherwise
///
bool find(_In_ const T &el, _Out_ size_type &start, _Out_ size_type &end) const
bool find(_In_ const T_data &el, _Out_ size_type &start, _Out_ size_type &end) const
{
// Start with the full search area.
for (start = 0, end = size(); start < end; ) {
size_type m = (start + end) / 2;
int r = compare(el, host[at(m)]);
int r = compare(el, at(m));
if (r < 0) end = m;
else if (r > 0) start = m + 1;
else {
// Narrow the search area on the left to start at the first element in the run.
for (size_type end2 = m; start < end2;) {
size_type m = (start + end2) / 2;
int r = compare(el, host[at(m)]);
int r = compare(el, at(m));
if (r <= 0) end2 = m; else start = m + 1;
}
// Narrow the search area on the right to end at the first element not in the run.
for (size_type start2 = m + 1; start2 < end;) {
size_type m = (start2 + end) / 2;
int r = compare(el, host[at(m)]);
int r = compare(el, at(m));
if (0 <= r) start2 = m + 1; else end = m;
}
@@ -152,8 +204,8 @@ namespace ZRCola {
private:
static int __cdecl compare_s(void *p, const void *a, const void *b)
{
const index<T, T_idx> *t = (const index<T, T_idx>*)p;
return t->compare_sort(t->host[*(const T_idx*)a], t->host[*(const T_idx*)b]);
const index<T, T_idx, T_data> *t = (const index<T, T_idx, T_data>*)p;
return t->compare_sort((const T_data&)t->host[*(const T_idx*)a], (const T_data&)t->host[*(const T_idx*)b]);
}
};

50
lib/libZRCola/include/zrcola/translate.h
View File

@@ -81,7 +81,7 @@ namespace ZRCola {
///
/// Composition index
///
class indexComp : public index<unsigned __int16, unsigned __int32>
class indexComp : public index<unsigned __int16, unsigned __int32, translation>
{
public:
///
@@ -89,7 +89,7 @@ namespace ZRCola {
///
/// \param[in] h Reference to vector holding the data
///
indexComp(_In_ std::vector<unsigned __int16> &h) : index<unsigned __int16, unsigned __int32>(h) {}
indexComp(_In_ std::vector<unsigned __int16> &h) : index<unsigned __int16, unsigned __int32, translation>(h) {}
///
/// Compares two transformations by string (for searching)
@@ -102,13 +102,9 @@ namespace ZRCola {
/// - =0 when a == b
/// - >0 when a > b
///
virtual int compare(_In_ const unsigned __int16 &a, _In_ const unsigned __int16 &b) const
virtual int compare(_In_ const translation &a, _In_ const translation &b) const
{
const translation
&trans_a = (const translation&)a,
&trans_b = (const translation&)b;
int r = translation::CompareString(trans_a.str, trans_a.str_len, trans_b.str, trans_b.str_len);
int r = translation::CompareString(a.str, a.str_len, b.str, b.str_len);
if (r != 0) return r;
return 0;
@@ -125,17 +121,13 @@ namespace ZRCola {
/// - =0 when a == b
/// - >0 when a > b
///
virtual int compare_sort(_In_ const unsigned __int16 &a, _In_ const unsigned __int16 &b) const
virtual int compare_sort(_In_ const translation &a, _In_ const translation &b) const
{
const translation
&trans_a = (const translation&)a,
&trans_b = (const translation&)b;
int r = translation::CompareString(trans_a.str, trans_a.str_len, trans_b.str, trans_b.str_len);
int r = translation::CompareString(a.str, a.str_len, b.str, b.str_len);
if (r != 0) return r;
if (trans_a.chr < trans_b.chr) return -1;
else if (trans_a.chr > trans_b.chr) return +1;
if (a.chr < b.chr) return -1;
else if (a.chr > b.chr) return +1;
return 0;
}
@@ -145,7 +137,7 @@ namespace ZRCola {
///
/// Decomposition index
///
class indexDecomp : public index<unsigned __int16, unsigned __int32>
class indexDecomp : public index<unsigned __int16, unsigned __int32, translation>
{
public:
///
@@ -153,7 +145,7 @@ namespace ZRCola {
///
/// \param[in] h Reference to vector holding the data
///
indexDecomp(_In_ std::vector<unsigned __int16> &h) : index<unsigned __int16, unsigned __int32>(h) {}
indexDecomp(_In_ std::vector<unsigned __int16> &h) : index<unsigned __int16, unsigned __int32, translation>(h) {}
///
/// Compares two transformations by character (for searching)
@@ -166,14 +158,10 @@ namespace ZRCola {
/// - =0 when a == b
/// - >0 when a > b
///
virtual int compare(_In_ const unsigned __int16 &a, _In_ const unsigned __int16 &b) const
virtual int compare(_In_ const translation &a, _In_ const translation &b) const
{
const translation
&trans_a = (const translation&)a,
&trans_b = (const translation&)b;
if (trans_a.chr < trans_b.chr) return -1;
else if (trans_a.chr > trans_b.chr) return +1;
if (a.chr < b.chr) return -1;
else if (a.chr > b.chr) return +1;
return 0;
}
@@ -189,16 +177,12 @@ namespace ZRCola {
/// - =0 when a == b
/// - >0 when a > b
///
virtual int compare_sort(_In_ const unsigned __int16 &a, _In_ const unsigned __int16 &b) const
virtual int compare_sort(_In_ const translation &a, _In_ const translation &b) const
{
const translation
&trans_a = (const translation&)a,
&trans_b = (const translation&)b;
if (a.chr < b.chr) return -1;
else if (a.chr > b.chr) return +1;
if (trans_a.chr < trans_b.chr) return -1;
else if (trans_a.chr > trans_b.chr) return +1;
int r = translation::CompareString(trans_a.str, trans_a.str_len, trans_b.str, trans_b.str_len);
int r = translation::CompareString(a.str, a.str_len, b.str, b.str_len);
if (r != 0) return r;
return 0;