diff --git a/regXwild/core/ESS/AlgorithmEss.cpp b/regXwild/core/ESS/AlgorithmEss.cpp index 37109ff..8cf0693 100644 --- a/regXwild/core/ESS/AlgorithmEss.cpp +++ b/regXwild/core/ESS/AlgorithmEss.cpp @@ -127,19 +127,10 @@ bool AlgorithmEss::search(const tstring& text, const tstring& filter, bool ignor || (item.mask.curr & ONE && item.mask.prev & ONE) || (item.mask.curr & MORE && item.mask.prev & MORE)) { - ++item.overlay; + ++item.overlay; } else{ item.overlay = 0; } - // disable all combinations for SINGLE. TODO: stub - _stubSINGLECombination() - if( (item.mask.prev & (BOL | EOL)) == 0 && - ( - (item.mask.curr & SINGLE && (item.mask.prev & SINGLE) == 0) || - (item.mask.prev & SINGLE && (item.mask.curr & SINGLE) == 0) )) - { - if(rewindToNextBlock(it)){ continue; } return false; - } - ++item.pos; // TODO: implement non-sequential MS combinations ~ unsigned short int .. diff --git a/regXwildTest/AlgorithmEssTest.cpp b/regXwildTest/AlgorithmEssTest.cpp index 01bca25..b02853b 100644 --- a/regXwildTest/AlgorithmEssTest.cpp +++ b/regXwildTest/AlgorithmEssTest.cpp @@ -882,44 +882,6 @@ namespace regXwildTest } } - /* behaviour by default for non implemented combinations - SINGLE */ - TEST_METHOD(stubSINGLECombinationTest1) - { - tstring data = _T("new tes;ted project-12, and 75_protection of various systems"); - - // MS combination - { - //TODO: implement *,>,?,+,# and combination - { - /* true: */ - - // * - { - Assert::AreEqual(false, searchEss(data, _T("*#"))); - Assert::AreEqual(false, searchEss(data, _T("*#*"))); - Assert::AreEqual(false, searchEss(data, _T("#*"))); - Assert::AreEqual(false, searchEss(data, _T("*#systems"))); - Assert::AreEqual(false, searchEss(data, _T("new*#*systems"))); - Assert::AreEqual(false, searchEss(data, _T("*new#*systems*"))); - Assert::AreEqual(false, searchEss(data, _T("new#*systems"))); - Assert::AreEqual(false, searchEss(data, _T("75*#protection"))); - Assert::AreEqual(false, searchEss(data, _T("75*#*protection"))); - Assert::AreEqual(false, searchEss(data, _T("new*#systems"))); - Assert::AreEqual(false, searchEss(data, _T("*new#*#systems*"))); - } - - /* false */ - { - Assert::AreEqual(false, searchEss(data, _T("*new#systems*"))); - Assert::AreEqual(false, searchEss(data, _T("*new##systems*"))); - Assert::AreEqual(false, searchEss(data, _T("systems*#"))); - Assert::AreEqual(false, searchEss(data, _T("pro#*ject"))); - Assert::AreEqual(false, searchEss(data, _T("systems#*"))); - } - } - } - } - /* behaviour by default for non implemented combinations - END */ TEST_METHOD(stubENDCombinationTest1) {