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

com_translation class extended to support normalization

Browse Source
This commit is contained in:
Simon Rozman 2017-05-08 14:44:53 +02:00
parent 397cfe71dd
commit 4c6839e9fe
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ZRColaCompile/main.cpp
View File

@ -32,6 +32,7 @@ class com_translation
public: public:
int rank_src; ///< Source sequence rank int rank_src; ///< Source sequence rank
int rank_dst; ///< Destination character rank int rank_dst; ///< Destination character rank
string norm; ///< Normalization footprint
inline com_translation() inline com_translation()
{ {
@ -43,15 +44,31 @@ public:
{ {
} }
inline com_translation(int _rank_src, int _rank_dst, const char *_norm) :
rank_src(_rank_src),
rank_dst(_rank_dst),
norm (_norm )
{
}
inline com_translation(int _rank_src, int _rank_dst, string &&_norm) :
rank_src( _rank_src ),
rank_dst( _rank_dst ),
norm (std::move(_norm ))
{
}
inline com_translation(const com_translation &other) : inline com_translation(const com_translation &other) :
rank_src(other.rank_src), rank_src(other.rank_src),
rank_dst(other.rank_dst) rank_dst(other.rank_dst),
norm (other.norm )
{ {
} }
inline com_translation(com_translation &&other) : inline com_translation(com_translation &&other) :
rank_src( other.rank_src ), rank_src( other.rank_src ),
rank_dst( other.rank_dst ) rank_dst( other.rank_dst ),
norm (std::move(other.norm ))
{ {
} }
@ -60,6 +77,7 @@ public:
if (this != std::addressof(other)) { if (this != std::addressof(other)) {
rank_src = other.rank_src; rank_src = other.rank_src;
rank_dst = other.rank_dst; rank_dst = other.rank_dst;
norm = other.norm ;
} }
return *this; return *this;
} }
@ -69,6 +87,7 @@ public:
if (this != std::addressof(other)) { if (this != std::addressof(other)) {
rank_src = other.rank_src ; rank_src = other.rank_src ;
rank_dst = other.rank_dst ; rank_dst = other.rank_dst ;
norm = std::move(other.norm );
} }
return *this; return *this;
} }
@ -77,7 +96,8 @@ public:
{ {
return return
rank_src == other.rank_src && rank_src == other.rank_src &&
rank_dst == other.rank_dst; rank_dst == other.rank_dst &&
norm == other.norm;
} }
inline bool operator!=(_In_ const com_translation &other) const inline bool operator!=(_In_ const com_translation &other) const
@ -90,6 +110,8 @@ public:
if (rank_src < other.rank_src) return true; if (rank_src < other.rank_src) return true;
else if (rank_src > other.rank_src) return false; else if (rank_src > other.rank_src) return false;
else if (rank_dst < other.rank_dst) return true; else if (rank_dst < other.rank_dst) return true;
else if (rank_dst > other.rank_dst) return false;
else if (norm < other.norm ) return true;
else return false; else return false;
} }