From b600f834a7eca396875b932cad247a3bb5fe83da Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Wed, 14 Dec 2016 23:08:03 +0100
Subject: [PATCH] Use default data types in string properties
---
alib2algo/src/string/properties/BadCharacterShiftTable.cpp | 4 ++--
alib2algo/src/string/properties/BadCharacterShiftTable.h | 4 ++--
.../src/string/properties/ReversedBadCharacterShiftTable.cpp | 4 ++--
.../src/string/properties/ReversedBadCharacterShiftTable.h | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/alib2algo/src/string/properties/BadCharacterShiftTable.cpp b/alib2algo/src/string/properties/BadCharacterShiftTable.cpp
index 7d1b613b11..2ce43f29d3 100644
--- a/alib2algo/src/string/properties/BadCharacterShiftTable.cpp
+++ b/alib2algo/src/string/properties/BadCharacterShiftTable.cpp
@@ -11,11 +11,11 @@ namespace string {
namespace properties {
-std::map<alphabet::Symbol, size_t> BadCharacterShiftTable::bcs(const string::String& pattern) {
+std::map<DefaultSymbolType, size_t> BadCharacterShiftTable::bcs(const string::String& pattern) {
return dispatch(pattern.getData());
}
-auto BadCharacterShiftTableLinearString = BadCharacterShiftTable::RegistratorWrapper<std::map<alphabet::Symbol, size_t>, string::LinearString < >>(BadCharacterShiftTable::bcs);
+auto BadCharacterShiftTableLinearString = BadCharacterShiftTable::RegistratorWrapper<std::map<DefaultSymbolType, size_t>, string::LinearString < >>(BadCharacterShiftTable::bcs);
} /* namespace properties */
diff --git a/alib2algo/src/string/properties/BadCharacterShiftTable.h b/alib2algo/src/string/properties/BadCharacterShiftTable.h
index a46bf6556a..55b5080e50 100644
--- a/alib2algo/src/string/properties/BadCharacterShiftTable.h
+++ b/alib2algo/src/string/properties/BadCharacterShiftTable.h
@@ -26,13 +26,13 @@ namespace properties {
* Computation of BCS table for BMH from MI(E+\eps)-EVY course 2014
* To get rid of zeros in BCS table we ignore last haystack character
*/
-class BadCharacterShiftTable : public std::SingleDispatch < BadCharacterShiftTable, std::map < alphabet::Symbol, size_t >, const string::StringBase & > {
+class BadCharacterShiftTable : public std::SingleDispatch < BadCharacterShiftTable, std::map < DefaultSymbolType, size_t >, const string::StringBase & > {
public:
/**
* Search for pattern in linear string.
* @return set set of occurences
*/
- static std::map < alphabet::Symbol, size_t > bcs ( const string::String & pattern );
+ static std::map < DefaultSymbolType, size_t > bcs ( const string::String & pattern );
template < class SymbolType >
static std::map < SymbolType, size_t > bcs ( const string::LinearString < SymbolType > & pattern );
diff --git a/alib2algo/src/string/properties/ReversedBadCharacterShiftTable.cpp b/alib2algo/src/string/properties/ReversedBadCharacterShiftTable.cpp
index 93323282aa..640fb26e96 100644
--- a/alib2algo/src/string/properties/ReversedBadCharacterShiftTable.cpp
+++ b/alib2algo/src/string/properties/ReversedBadCharacterShiftTable.cpp
@@ -11,11 +11,11 @@ namespace string {
namespace properties {
-std::map < alphabet::Symbol, size_t > ReversedBadCharacterShiftTable::bcs ( const string::String & pattern ) {
+std::map < DefaultSymbolType, size_t > ReversedBadCharacterShiftTable::bcs ( const string::String & pattern ) {
return dispatch ( pattern.getData ( ) );
}
-auto ReversedBadCharacterShiftTableLinearString = ReversedBadCharacterShiftTable::RegistratorWrapper < std::map < alphabet::Symbol, size_t >, string::LinearString < > > ( ReversedBadCharacterShiftTable::bcs );
+auto ReversedBadCharacterShiftTableLinearString = ReversedBadCharacterShiftTable::RegistratorWrapper < std::map < DefaultSymbolType, size_t >, string::LinearString < > > ( ReversedBadCharacterShiftTable::bcs );
} /* namespace properties */
diff --git a/alib2algo/src/string/properties/ReversedBadCharacterShiftTable.h b/alib2algo/src/string/properties/ReversedBadCharacterShiftTable.h
index 04c2222199..6fa22048b4 100644
--- a/alib2algo/src/string/properties/ReversedBadCharacterShiftTable.h
+++ b/alib2algo/src/string/properties/ReversedBadCharacterShiftTable.h
@@ -26,13 +26,13 @@ namespace properties {
* Computation of BCS table for BMH from MI(E+\eps)-EVY course 2014
* To get rid of zeros in BCS table we ignore last haystack character
*/
-class ReversedBadCharacterShiftTable : public std::SingleDispatch < ReversedBadCharacterShiftTable, std::map < alphabet::Symbol, size_t >, const string::StringBase & > {
+class ReversedBadCharacterShiftTable : public std::SingleDispatch < ReversedBadCharacterShiftTable, std::map < DefaultSymbolType, size_t >, const string::StringBase & > {
public:
/**
* Search for pattern in linear string.
* @return set set of occurences
*/
- static std::map < alphabet::Symbol, size_t > bcs ( const string::String & pattern );
+ static std::map < DefaultSymbolType, size_t > bcs ( const string::String & pattern );
template < class SymbolType >
static std::map < SymbolType, size_t > bcs ( const string::LinearString < SymbolType > & pattern );
--
GitLab