Skip to content
Snippets Groups Projects
Commit 91a09721 authored by Jan Trávníček's avatar Jan Trávníček
Browse files

move to_string and from_string to ext namespace

parent 5d9691d4
No related branches found
No related tags found
No related merge requests found
Showing
with 59 additions and 59 deletions
...@@ -992,7 +992,7 @@ void DotConverter::transitions(const automaton::NFTA < SymbolType, RankType, Sta ...@@ -992,7 +992,7 @@ void DotConverter::transitions(const automaton::NFTA < SymbolType, RankType, Sta
//put transitions from automaton to "transitions" //put transitions from automaton to "transitions"
for (const auto& transition : fta.getTransitions()) { for (const auto& transition : fta.getTransitions()) {
std::string symbol = replace ( alib::StringDataFactory::toString ( transition.first.first.getSymbol( )), "\"", "\\\"" ); std::string symbol = replace ( alib::StringDataFactory::toString ( transition.first.first.getSymbol( )), "\"", "\\\"" );
symbol += std::to_string(transition.first.first.getRank()); symbol += ext::to_string(transition.first.first.getRank());
   
for(const StateType& to : transition.second) { for(const StateType& to : transition.second) {
std::pair<int, std::vector<int>> key(states.find(to)->second, {}); std::pair<int, std::vector<int>> key(states.find(to)->second, {});
...@@ -1044,7 +1044,7 @@ void DotConverter::transitions(const automaton::DFTA < SymbolType, RankType, Sta ...@@ -1044,7 +1044,7 @@ void DotConverter::transitions(const automaton::DFTA < SymbolType, RankType, Sta
//put transitions from automaton to "transitions" //put transitions from automaton to "transitions"
for (const auto& transition : fta.getTransitions()) { for (const auto& transition : fta.getTransitions()) {
std::string symbol = replace ( alib::StringDataFactory::toString ( transition.first.first.getSymbol( )), "\"", "\\\"" ); std::string symbol = replace ( alib::StringDataFactory::toString ( transition.first.first.getSymbol( )), "\"", "\\\"" );
symbol += std::to_string(transition.first.first.getRank()); symbol += ext::to_string(transition.first.first.getRank());
   
std::pair<int, std::vector<int>> key(states.find(transition.second)->second, {}); std::pair<int, std::vector<int>> key(states.find(transition.second)->second, {});
for(const StateType& state : transition.first.second) { for(const StateType& state : transition.first.second) {
......
...@@ -960,7 +960,7 @@ void TikZConverter::transitions ( const automaton::NFTA < SymbolType, RankType, ...@@ -960,7 +960,7 @@ void TikZConverter::transitions ( const automaton::NFTA < SymbolType, RankType,
// put transitions from automaton to "transitions" // put transitions from automaton to "transitions"
for ( const auto & transition : fta.getTransitions ( ) ) { for ( const auto & transition : fta.getTransitions ( ) ) {
std::string symbol = replace ( alib::StringDataFactory::toString ( transition.first.first.getSymbol ( ) ), "\"", "\\\"" ); std::string symbol = replace ( alib::StringDataFactory::toString ( transition.first.first.getSymbol ( ) ), "\"", "\\\"" );
symbol += std::to_string ( transition.first.first.getRank ( ) ); symbol += ext::to_string ( transition.first.first.getRank ( ) );
   
for ( const StateType & to : transition.second ) { for ( const StateType & to : transition.second ) {
std::pair < int, std::vector < int > > key ( states.find ( to )->second, { } ); std::pair < int, std::vector < int > > key ( states.find ( to )->second, { } );
...@@ -1026,7 +1026,7 @@ void TikZConverter::transitions ( const automaton::DFTA < SymbolType, RankType, ...@@ -1026,7 +1026,7 @@ void TikZConverter::transitions ( const automaton::DFTA < SymbolType, RankType,
// put transitions from automaton to "transitions" // put transitions from automaton to "transitions"
for ( const auto & transition : fta.getTransitions ( ) ) { for ( const auto & transition : fta.getTransitions ( ) ) {
std::string symbol = replace ( alib::StringDataFactory::toString ( transition.first.first.getSymbol ( ) ), "\"", "\\\"" ); std::string symbol = replace ( alib::StringDataFactory::toString ( transition.first.first.getSymbol ( ) ), "\"", "\\\"" );
symbol += std::to_string ( transition.first.first.getRank ( ) ); symbol += ext::to_string ( transition.first.first.getRank ( ) );
   
std::pair < int, std::vector < int > > key ( states.find ( transition.second )->second, { } ); std::pair < int, std::vector < int > > key ( states.find ( transition.second )->second, { } );
   
......
...@@ -71,11 +71,11 @@ automaton::RealTimeHeightDeterministicDPDA < > PDAToRHPDA::convert ( const autom ...@@ -71,11 +71,11 @@ automaton::RealTimeHeightDeterministicDPDA < > PDAToRHPDA::convert ( const autom
int popPushIndex = 0; int popPushIndex = 0;
int popPushSymbols = std::get < 2 > ( transition.first ).size ( ) + to.second.size ( ); int popPushSymbols = std::get < 2 > ( transition.first ).size ( ) + to.second.size ( );
   
DefaultStateType lastUS = common::createUnique ( DefaultStateType ( us + std::to_string ( i ) ), res.getStates ( ) ); DefaultStateType lastUS = common::createUnique ( DefaultStateType ( us + ext::to_string ( i ) ), res.getStates ( ) );
for ( const DefaultSymbolType & pop :std::get < 2 > ( transition.first ) ) { for ( const DefaultSymbolType & pop :std::get < 2 > ( transition.first ) ) {
DefaultStateType fromState = ( popPushIndex == 0 ) ? std::get < 0 > ( transition.first ) : lastUS; DefaultStateType fromState = ( popPushIndex == 0 ) ? std::get < 0 > ( transition.first ) : lastUS;
   
if ( popPushIndex != 0 ) lastUS = common::createUnique ( DefaultStateType ( us + std::to_string ( ++i ) ), res.getStates ( ) ); if ( popPushIndex != 0 ) lastUS = common::createUnique ( DefaultStateType ( us + ext::to_string ( ++i ) ), res.getStates ( ) );
   
DefaultStateType toState = ( popPushIndex == popPushSymbols - 1 ) ? to.first : lastUS; DefaultStateType toState = ( popPushIndex == popPushSymbols - 1 ) ? to.first : lastUS;
   
...@@ -92,7 +92,7 @@ automaton::RealTimeHeightDeterministicDPDA < > PDAToRHPDA::convert ( const autom ...@@ -92,7 +92,7 @@ automaton::RealTimeHeightDeterministicDPDA < > PDAToRHPDA::convert ( const autom
for ( const DefaultSymbolType & push : std::make_reverse ( to.second ) ) { for ( const DefaultSymbolType & push : std::make_reverse ( to.second ) ) {
DefaultStateType fromState = ( popPushIndex == 0 ) ? std::get < 0 > ( transition.first ) : lastUS; DefaultStateType fromState = ( popPushIndex == 0 ) ? std::get < 0 > ( transition.first ) : lastUS;
   
if ( popPushIndex != 0 ) lastUS = common::createUnique ( DefaultStateType ( us + std::to_string ( ++i ) ), res.getStates ( ) ); if ( popPushIndex != 0 ) lastUS = common::createUnique ( DefaultStateType ( us + ext::to_string ( ++i ) ), res.getStates ( ) );
   
DefaultStateType toState = ( popPushIndex == popPushSymbols - 1 ) ? to.first : lastUS; DefaultStateType toState = ( popPushIndex == popPushSymbols - 1 ) ? to.first : lastUS;
   
...@@ -145,11 +145,11 @@ automaton::RealTimeHeightDeterministicNPDA < > PDAToRHPDA::convert ( const autom ...@@ -145,11 +145,11 @@ automaton::RealTimeHeightDeterministicNPDA < > PDAToRHPDA::convert ( const autom
int popPushIndex = 0; int popPushIndex = 0;
int popPushSymbols = std::get < 2 > ( transition.first ).size ( ) + to.second.size ( ); int popPushSymbols = std::get < 2 > ( transition.first ).size ( ) + to.second.size ( );
   
DefaultStateType lastUS = common::createUnique ( DefaultStateType ( us + std::to_string ( i ) ), res.getStates ( ) ); DefaultStateType lastUS = common::createUnique ( DefaultStateType ( us + ext::to_string ( i ) ), res.getStates ( ) );
std::for_each ( std::get < 2 > ( transition.first ).begin ( ), std::get < 2 > ( transition.first ).end ( ), [&] ( const DefaultSymbolType & pop ) { std::for_each ( std::get < 2 > ( transition.first ).begin ( ), std::get < 2 > ( transition.first ).end ( ), [&] ( const DefaultSymbolType & pop ) {
DefaultStateType fromState = ( popPushIndex == 0 ) ? std::get < 0 > ( transition.first ) : lastUS; DefaultStateType fromState = ( popPushIndex == 0 ) ? std::get < 0 > ( transition.first ) : lastUS;
   
if ( popPushIndex != 0 ) lastUS = common::createUnique ( DefaultStateType ( us + std::to_string ( ++i ) ), res.getStates ( ) ); if ( popPushIndex != 0 ) lastUS = common::createUnique ( DefaultStateType ( us + ext::to_string ( ++i ) ), res.getStates ( ) );
   
DefaultStateType toState = ( popPushIndex == popPushSymbols - 1 ) ? to.first : lastUS; DefaultStateType toState = ( popPushIndex == popPushSymbols - 1 ) ? to.first : lastUS;
   
...@@ -166,7 +166,7 @@ automaton::RealTimeHeightDeterministicNPDA < > PDAToRHPDA::convert ( const autom ...@@ -166,7 +166,7 @@ automaton::RealTimeHeightDeterministicNPDA < > PDAToRHPDA::convert ( const autom
std::for_each ( to.second.rbegin ( ), to.second.rend ( ), [&] ( const DefaultSymbolType & push ) { std::for_each ( to.second.rbegin ( ), to.second.rend ( ), [&] ( const DefaultSymbolType & push ) {
DefaultStateType fromState = ( popPushIndex == 0 ) ? std::get < 0 > ( transition.first ) : lastUS; DefaultStateType fromState = ( popPushIndex == 0 ) ? std::get < 0 > ( transition.first ) : lastUS;
   
if ( popPushIndex != 0 ) lastUS = common::createUnique ( DefaultStateType ( us + std::to_string ( ++i ) ), res.getStates ( ) ); if ( popPushIndex != 0 ) lastUS = common::createUnique ( DefaultStateType ( us + ext::to_string ( ++i ) ), res.getStates ( ) );
   
DefaultStateType toState = ( popPushIndex == popPushSymbols - 1 ) ? to.first : lastUS; DefaultStateType toState = ( popPushIndex == popPushSymbols - 1 ) ? to.first : lastUS;
   
......
...@@ -54,7 +54,7 @@ public: ...@@ -54,7 +54,7 @@ public:
template<class T, class SymbolType > template<class T, class SymbolType >
std::set<SymbolType> NonterminalUnitRuleCycle::getNonterminalUnitRuleCycle(const T& grammar, const SymbolType& nonterminal) { std::set<SymbolType> NonterminalUnitRuleCycle::getNonterminalUnitRuleCycle(const T& grammar, const SymbolType& nonterminal) {
if(grammar.getNonterminalAlphabet().count(nonterminal) == 0) { if(grammar.getNonterminalAlphabet().count(nonterminal) == 0) {
throw exception::CommonException("Nonterminal symbol \"" + std::to_string ( nonterminal ) + "\" is not present in grammar."); throw exception::CommonException("Nonterminal symbol \"" + ext::to_string ( nonterminal ) + "\" is not present in grammar.");
} }
   
std::deque<std::set<SymbolType>> Ni; std::deque<std::set<SymbolType>> Ni;
......
...@@ -34,7 +34,7 @@ public: ...@@ -34,7 +34,7 @@ public:
unsigned i = 0; unsigned i = 0;
for ( const std::shared_ptr < abstraction::OperationAbstraction > & param : params ) { for ( const std::shared_ptr < abstraction::OperationAbstraction > & param : params ) {
if ( ! algo->attachInput ( param, i ) ) if ( ! algo->attachInput ( param, i ) )
throw exception::CommonException ( "Can't connect param at " + std::to_string ( i ) + " of algorithm " + m_name + " with result of type " + std::type_name ( param->type ( ) ) + "." ); throw exception::CommonException ( "Can't connect param at " + ext::to_string ( i ) + " of algorithm " + m_name + " with result of type " + std::type_name ( param->type ( ) ) + "." );
i++; i++;
} }
   
......
...@@ -17,11 +17,11 @@ public: ...@@ -17,11 +17,11 @@ public:
   
virtual Command::Result run ( Environment & ) const override { virtual Command::Result run ( Environment & ) const override {
if ( m_param == "verbose" ) { if ( m_param == "verbose" ) {
common::GlobalData::verbose = std::from_string < bool > ( m_value ); common::GlobalData::verbose = ext::from_string < bool > ( m_value );
} else if ( m_param == "measure" ) { } else if ( m_param == "measure" ) {
common::GlobalData::measure = std::from_string < bool > ( m_value ); common::GlobalData::measure = ext::from_string < bool > ( m_value );
} else if ( m_param == "optimizeXml" ) { } else if ( m_param == "optimizeXml" ) {
common::GlobalData::optimizeXml = std::from_string < bool > ( m_value ); common::GlobalData::optimizeXml = ext::from_string < bool > ( m_value );
} else { } else {
std::cout << "The set parameter " << m_param << " does not exist." << std::endl; std::cout << "The set parameter " << m_param << " does not exist." << std::endl;
} }
......
...@@ -59,7 +59,7 @@ public: ...@@ -59,7 +59,7 @@ public:
int matchInteger ( ) { int matchInteger ( ) {
if ( ! check ( Lexer::TokenType::INTEGER ) ) if ( ! check ( Lexer::TokenType::INTEGER ) )
throw exception::CommonException ( "Mismatched token while matching a token." ); throw exception::CommonException ( "Mismatched token while matching a token." );
int res = std::from_string < int > ( m_current.m_value ); int res = ext::from_string < int > ( m_current.m_value );
m_current = m_lexer.nextToken ( ); m_current = m_lexer.nextToken ( );
return res; return res;
} }
......
...@@ -69,7 +69,7 @@ namespace abstraction { ...@@ -69,7 +69,7 @@ namespace abstraction {
   
template < class Result > template < class Result >
std::shared_ptr < abstraction::OperationAbstraction > ImmediateRegistry::EntryImpl < Result >::getAbstraction ( std::string value ) const { std::shared_ptr < abstraction::OperationAbstraction > ImmediateRegistry::EntryImpl < Result >::getAbstraction ( std::string value ) const {
return std::make_shared < ImmediateValueAbstraction < Result > > ( std::from_string < Result > ( value ) ); return std::make_shared < ImmediateValueAbstraction < Result > > ( ext::from_string < Result > ( value ) );
} }
   
} /* namespace abstraction */ } /* namespace abstraction */
......
...@@ -25,8 +25,8 @@ public: ...@@ -25,8 +25,8 @@ public:
abstraction::CastRegistry::registerCast < double, int > ( ); abstraction::CastRegistry::registerCast < double, int > ( );
abstraction::CastRegistry::registerCast < int, double > ( ); abstraction::CastRegistry::registerCast < int, double > ( );
   
abstraction::CastRegistry::registerCastAlgorithm < std::string, int > ( std::to_string ); abstraction::CastRegistry::registerCastAlgorithm < std::string, int > ( ext::to_string );
abstraction::CastRegistry::registerCastAlgorithm < int, std::string > ( (int(*)(std::string)) std::from_string < int > ); abstraction::CastRegistry::registerCastAlgorithm < int, std::string > ( (int(*)(std::string)) ext::from_string < int > );
   
abstraction::CastRegistry::registerCast < bool, int > ( ); abstraction::CastRegistry::registerCast < bool, int > ( );
   
......
...@@ -22,7 +22,7 @@ protected: ...@@ -22,7 +22,7 @@ protected:
private: private:
virtual bool attachInput ( const std::shared_ptr < OperationAbstraction > & input, unsigned index ) override { virtual bool attachInput ( const std::shared_ptr < OperationAbstraction > & input, unsigned index ) override {
if ( index != 0 ) if ( index != 0 )
throw exception::CommonException ( "Out of range index: " + std::to_string ( index ) + " max: " + std::to_string ( numberOfParams ( ) ) + "." ); throw exception::CommonException ( "Out of range index: " + ext::to_string ( index ) + " max: " + ext::to_string ( numberOfParams ( ) ) + "." );
   
std::shared_ptr < ValueOperationAbstraction < ParamType > > validData = std::dynamic_pointer_cast < ValueOperationAbstraction < ParamType > > ( input ); std::shared_ptr < ValueOperationAbstraction < ParamType > > validData = std::dynamic_pointer_cast < ValueOperationAbstraction < ParamType > > ( input );
if ( validData ) { if ( validData ) {
...@@ -79,7 +79,7 @@ public: ...@@ -79,7 +79,7 @@ public:
   
virtual std::shared_ptr < OperationAbstraction > getXmlParserFromParam ( unsigned index, std::deque < sax::Token > tokens ) const override { virtual std::shared_ptr < OperationAbstraction > getXmlParserFromParam ( unsigned index, std::deque < sax::Token > tokens ) const override {
if ( index != 0 ) if ( index != 0 )
throw exception::CommonException ( "Out of range index: " + std::to_string ( index ) + " max: " + std::to_string ( numberOfParams ( ) ) + "." ); throw exception::CommonException ( "Out of range index: " + ext::to_string ( index ) + " max: " + ext::to_string ( numberOfParams ( ) ) + "." );
   
std::string paramType = std::type_name < ParamType > ( ); std::string paramType = std::type_name < ParamType > ( );
return Registry::getXmlParserAbstraction ( std::move ( paramType ), std::move ( tokens ) ); return Registry::getXmlParserAbstraction ( std::move ( paramType ), std::move ( tokens ) );
......
...@@ -76,7 +76,7 @@ class Component { ...@@ -76,7 +76,7 @@ class Component {
if ( !ComponentConstraint < Derived, DataType, SetType >::available ( static_cast < const Derived & > ( * this ), symbol ) ) { if ( !ComponentConstraint < Derived, DataType, SetType >::available ( static_cast < const Derived & > ( * this ), symbol ) ) {
std::string elementTypeName ( std::type_name < SetType * > ( ) ); std::string elementTypeName ( std::type_name < SetType * > ( ) );
elementTypeName.back ( ) = ' '; elementTypeName.back ( ) = ' ';
throw::exception::CommonException ( elementTypeName + "element " + std::to_string ( symbol ) + " is not available." ); throw::exception::CommonException ( elementTypeName + "element " + ext::to_string ( symbol ) + " is not available." );
} }
} }
   
...@@ -88,7 +88,7 @@ class Component { ...@@ -88,7 +88,7 @@ class Component {
if ( ComponentConstraint < Derived, DataType, SetType >::used ( static_cast < const Derived & > ( * this ), symbol ) ) { if ( ComponentConstraint < Derived, DataType, SetType >::used ( static_cast < const Derived & > ( * this ), symbol ) ) {
std::string elementTypeName ( std::type_name < SetType * > ( ) ); std::string elementTypeName ( std::type_name < SetType * > ( ) );
elementTypeName.back ( ) = ' '; elementTypeName.back ( ) = ' ';
throw::exception::CommonException ( elementTypeName + "element " + std::to_string ( symbol ) + " is used." ); throw::exception::CommonException ( elementTypeName + "element " + ext::to_string ( symbol ) + " is used." );
} }
} }
   
...@@ -241,7 +241,7 @@ class Element { ...@@ -241,7 +241,7 @@ class Element {
if ( !ElementConstraint < Derived, DataType, ElementType >::available ( static_cast < const Derived & > ( * this ), symbol ) ) { if ( !ElementConstraint < Derived, DataType, ElementType >::available ( static_cast < const Derived & > ( * this ), symbol ) ) {
std::string elementTypeName ( std::type_name < ElementType * > ( ) ); std::string elementTypeName ( std::type_name < ElementType * > ( ) );
elementTypeName.back ( ) = ' '; elementTypeName.back ( ) = ' ';
throw::exception::CommonException ( elementTypeName + std::to_string ( symbol ) + " is not available." ); throw::exception::CommonException ( elementTypeName + ext::to_string ( symbol ) + " is not available." );
} }
} }
   
......
...@@ -148,14 +148,14 @@ public: ...@@ -148,14 +148,14 @@ public:
if ( /* common::GlobalData::optimizeXml && */ tagName == "Ref" ) { if ( /* common::GlobalData::optimizeXml && */ tagName == "Ref" ) {
sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::START_ELEMENT, "Ref" ); sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::START_ELEMENT, "Ref" );
sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::START_ATTRIBUTE, "id" ); sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::START_ATTRIBUTE, "id" );
int id = std::from_string < int > ( sax::FromXMLParserHelper::popTokenData ( input, sax::Token::TokenType::CHARACTER ) ); int id = ext::from_string < int > ( sax::FromXMLParserHelper::popTokenData ( input, sax::Token::TokenType::CHARACTER ) );
sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::END_ATTRIBUTE, "id" ); sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::END_ATTRIBUTE, "id" );
sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::END_ELEMENT, "Ref" ); sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::END_ELEMENT, "Ref" );
std::map < int, WrapperBaseBase * >::iterator elem = input.idToInstance ( std::type_name < Group > ( ) ).find ( id ); std::map < int, WrapperBaseBase * >::iterator elem = input.idToInstance ( std::type_name < Group > ( ) ).find ( id );
   
if ( elem == input.idToInstance ( std::type_name < Group > ( ) ).end ( ) ) { if ( elem == input.idToInstance ( std::type_name < Group > ( ) ).end ( ) ) {
std::cerr << input.dump ( ) << std::endl; std::cerr << input.dump ( ) << std::endl;
throw exception::CommonException ( "XML Inconsistent ( id not found " + std::to_string ( id ) + " )" ); throw exception::CommonException ( "XML Inconsistent ( id not found " + ext::to_string ( id ) + " )" );
} }
   
return * ( ( Group * ) elem->second ); return * ( ( Group * ) elem->second );
...@@ -169,7 +169,7 @@ public: ...@@ -169,7 +169,7 @@ public:
int id = 0; int id = 0;
if ( ref ) { if ( ref ) {
std::deque < sax::Token >::iterator tmp = input + 2; std::deque < sax::Token >::iterator tmp = input + 2;
id = std::from_string < int > ( sax::FromXMLParserHelper::popTokenData ( tmp, sax::Token::TokenType::CHARACTER ) ); id = ext::from_string < int > ( sax::FromXMLParserHelper::popTokenData ( tmp, sax::Token::TokenType::CHARACTER ) );
} }
   
Group res ( callback->second->parse ( input ) ); Group res ( callback->second->parse ( input ) );
...@@ -208,7 +208,7 @@ public: ...@@ -208,7 +208,7 @@ public:
if ( common::GlobalData::optimizeXml && elem != context.instanceToId ( std::type_name < Group > ( ) ).end ( ) ) { if ( common::GlobalData::optimizeXml && elem != context.instanceToId ( std::type_name < Group > ( ) ).end ( ) ) {
output.emplace_back ( "Ref", sax::Token::TokenType::START_ELEMENT ); output.emplace_back ( "Ref", sax::Token::TokenType::START_ELEMENT );
output.emplace_back ( "id", sax::Token::TokenType::START_ATTRIBUTE ); output.emplace_back ( "id", sax::Token::TokenType::START_ATTRIBUTE );
output.emplace_back ( std::to_string ( elem->second ), sax::Token::TokenType::CHARACTER ); output.emplace_back ( ext::to_string ( elem->second ), sax::Token::TokenType::CHARACTER );
output.emplace_back ( "id", sax::Token::TokenType::END_ATTRIBUTE ); output.emplace_back ( "id", sax::Token::TokenType::END_ATTRIBUTE );
output.emplace_back ( "Ref", sax::Token::TokenType::END_ELEMENT ); output.emplace_back ( "Ref", sax::Token::TokenType::END_ELEMENT );
} else { } else {
...@@ -225,7 +225,7 @@ public: ...@@ -225,7 +225,7 @@ public:
/* emplace referenced attribute */ /* emplace referenced attribute */
if ( common::GlobalData::optimizeXml ) { if ( common::GlobalData::optimizeXml ) {
output.emplace ( output.begin ( ) + pos + 1, "ref", sax::Token::TokenType::START_ATTRIBUTE ); output.emplace ( output.begin ( ) + pos + 1, "ref", sax::Token::TokenType::START_ATTRIBUTE );
output.emplace ( output.begin ( ) + pos + 2, std::to_string ( id ), sax::Token::TokenType::CHARACTER ); output.emplace ( output.begin ( ) + pos + 2, ext::to_string ( id ), sax::Token::TokenType::CHARACTER );
output.emplace ( output.begin ( ) + pos + 3, "ref", sax::Token::TokenType::END_ATTRIBUTE ); output.emplace ( output.begin ( ) + pos + 3, "ref", sax::Token::TokenType::END_ATTRIBUTE );
   
context.instanceToId ( std::type_name < Group > ( ) ).insert ( std::make_pair ( static_cast< const CommonBaseBase * > ( & data.getData ( ) ), id ) ); context.instanceToId ( std::type_name < Group > ( ) ).insert ( std::make_pair ( static_cast< const CommonBaseBase * > ( & data.getData ( ) ), id ) );
......
...@@ -55,10 +55,10 @@ void MeasurementResultsXml::composeTimeDataFrame ( std::deque < sax::Token > & t ...@@ -55,10 +55,10 @@ void MeasurementResultsXml::composeTimeDataFrame ( std::deque < sax::Token > & t
   
tokens.emplace_back ( TIME_DATA_FRAME_TAG, sax::Token::TokenType::START_ELEMENT ); tokens.emplace_back ( TIME_DATA_FRAME_TAG, sax::Token::TokenType::START_ELEMENT );
tokens.emplace_back ( TIME_DATA_FRAME_DURATION_TAG, sax::Token::TokenType::START_ELEMENT ); tokens.emplace_back ( TIME_DATA_FRAME_DURATION_TAG, sax::Token::TokenType::START_ELEMENT );
tokens.emplace_back ( std::to_string ( frame.duration.count ( ) ), sax::Token::TokenType::CHARACTER ); tokens.emplace_back ( ext::to_string ( frame.duration.count ( ) ), sax::Token::TokenType::CHARACTER );
tokens.emplace_back ( TIME_DATA_FRAME_DURATION_TAG, sax::Token::TokenType::END_ELEMENT ); tokens.emplace_back ( TIME_DATA_FRAME_DURATION_TAG, sax::Token::TokenType::END_ELEMENT );
tokens.emplace_back ( TIME_DATA_FRAME_IN_FRAME_DURATION_TAG, sax::Token::TokenType::START_ELEMENT ); tokens.emplace_back ( TIME_DATA_FRAME_IN_FRAME_DURATION_TAG, sax::Token::TokenType::START_ELEMENT );
tokens.emplace_back ( std::to_string ( frame.inFrameDuration.count ( ) ), sax::Token::TokenType::CHARACTER ); tokens.emplace_back ( ext::to_string ( frame.inFrameDuration.count ( ) ), sax::Token::TokenType::CHARACTER );
tokens.emplace_back ( TIME_DATA_FRAME_IN_FRAME_DURATION_TAG, sax::Token::TokenType::END_ELEMENT ); tokens.emplace_back ( TIME_DATA_FRAME_IN_FRAME_DURATION_TAG, sax::Token::TokenType::END_ELEMENT );
tokens.emplace_back ( TIME_DATA_FRAME_TAG, sax::Token::TokenType::END_ELEMENT ); tokens.emplace_back ( TIME_DATA_FRAME_TAG, sax::Token::TokenType::END_ELEMENT );
} }
...@@ -68,16 +68,16 @@ void MeasurementResultsXml::composeMemoryDataFrame ( std::deque < sax::Token > & ...@@ -68,16 +68,16 @@ void MeasurementResultsXml::composeMemoryDataFrame ( std::deque < sax::Token > &
   
tokens.emplace_back ( MEMORY_DATA_FRAME_TAG, sax::Token::TokenType::START_ELEMENT ); tokens.emplace_back ( MEMORY_DATA_FRAME_TAG, sax::Token::TokenType::START_ELEMENT );
tokens.emplace_back ( MEMORY_DATA_FRAME_START_HEAP_USAGE_TAG, sax::Token::TokenType::START_ELEMENT ); tokens.emplace_back ( MEMORY_DATA_FRAME_START_HEAP_USAGE_TAG, sax::Token::TokenType::START_ELEMENT );
tokens.emplace_back ( std::to_string ( frame.startHeapUsage ), sax::Token::TokenType::CHARACTER ); tokens.emplace_back ( ext::to_string ( frame.startHeapUsage ), sax::Token::TokenType::CHARACTER );
tokens.emplace_back ( MEMORY_DATA_FRAME_START_HEAP_USAGE_TAG, sax::Token::TokenType::END_ELEMENT ); tokens.emplace_back ( MEMORY_DATA_FRAME_START_HEAP_USAGE_TAG, sax::Token::TokenType::END_ELEMENT );
tokens.emplace_back ( MEMORY_DATA_FRAME_END_HEAP_USAGE_TAG, sax::Token::TokenType::START_ELEMENT ); tokens.emplace_back ( MEMORY_DATA_FRAME_END_HEAP_USAGE_TAG, sax::Token::TokenType::START_ELEMENT );
tokens.emplace_back ( std::to_string ( frame.endHeapUsage ), sax::Token::TokenType::CHARACTER ); tokens.emplace_back ( ext::to_string ( frame.endHeapUsage ), sax::Token::TokenType::CHARACTER );
tokens.emplace_back ( MEMORY_DATA_FRAME_END_HEAP_USAGE_TAG, sax::Token::TokenType::END_ELEMENT ); tokens.emplace_back ( MEMORY_DATA_FRAME_END_HEAP_USAGE_TAG, sax::Token::TokenType::END_ELEMENT );
tokens.emplace_back ( MEMORY_DATA_FRAME_HIGH_WATERMARK_TAG, sax::Token::TokenType::START_ELEMENT ); tokens.emplace_back ( MEMORY_DATA_FRAME_HIGH_WATERMARK_TAG, sax::Token::TokenType::START_ELEMENT );
tokens.emplace_back ( std::to_string ( frame.highWatermark ), sax::Token::TokenType::CHARACTER ); tokens.emplace_back ( ext::to_string ( frame.highWatermark ), sax::Token::TokenType::CHARACTER );
tokens.emplace_back ( MEMORY_DATA_FRAME_HIGH_WATERMARK_TAG, sax::Token::TokenType::END_ELEMENT ); tokens.emplace_back ( MEMORY_DATA_FRAME_HIGH_WATERMARK_TAG, sax::Token::TokenType::END_ELEMENT );
tokens.emplace_back ( MEMORY_DATA_FRAME_IN_FRAME_HIGH_WATERMARK_TAG, sax::Token::TokenType::START_ELEMENT ); tokens.emplace_back ( MEMORY_DATA_FRAME_IN_FRAME_HIGH_WATERMARK_TAG, sax::Token::TokenType::START_ELEMENT );
tokens.emplace_back ( std::to_string ( frame.inFrameHighWatermark ), sax::Token::TokenType::CHARACTER ); tokens.emplace_back ( ext::to_string ( frame.inFrameHighWatermark ), sax::Token::TokenType::CHARACTER );
tokens.emplace_back ( MEMORY_DATA_FRAME_IN_FRAME_HIGH_WATERMARK_TAG, sax::Token::TokenType::END_ELEMENT ); tokens.emplace_back ( MEMORY_DATA_FRAME_IN_FRAME_HIGH_WATERMARK_TAG, sax::Token::TokenType::END_ELEMENT );
tokens.emplace_back ( MEMORY_DATA_FRAME_TAG, sax::Token::TokenType::END_ELEMENT ); tokens.emplace_back ( MEMORY_DATA_FRAME_TAG, sax::Token::TokenType::END_ELEMENT );
} }
...@@ -95,7 +95,7 @@ void MeasurementResultsXml::composeCounterDataFrame ( std::deque < sax::Token > ...@@ -95,7 +95,7 @@ void MeasurementResultsXml::composeCounterDataFrame ( std::deque < sax::Token >
tokens.emplace_back ( measurements::to_string ( elem.first ), sax::Token::TokenType::CHARACTER ); tokens.emplace_back ( measurements::to_string ( elem.first ), sax::Token::TokenType::CHARACTER );
tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_NAME_TAG, sax::Token::TokenType::END_ELEMENT ); tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_NAME_TAG, sax::Token::TokenType::END_ELEMENT );
tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_VALUE_TAG, sax::Token::TokenType::START_ELEMENT ); tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_VALUE_TAG, sax::Token::TokenType::START_ELEMENT );
tokens.emplace_back ( std::to_string ( elem.second ), sax::Token::TokenType::CHARACTER ); tokens.emplace_back ( ext::to_string ( elem.second ), sax::Token::TokenType::CHARACTER );
tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_VALUE_TAG, sax::Token::TokenType::END_ELEMENT ); tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_VALUE_TAG, sax::Token::TokenType::END_ELEMENT );
tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_TAG, sax::Token::TokenType::END_ELEMENT ); tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_TAG, sax::Token::TokenType::END_ELEMENT );
} }
...@@ -110,7 +110,7 @@ void MeasurementResultsXml::composeCounterDataFrame ( std::deque < sax::Token > ...@@ -110,7 +110,7 @@ void MeasurementResultsXml::composeCounterDataFrame ( std::deque < sax::Token >
tokens.emplace_back ( measurements::to_string ( elem.first ), sax::Token::TokenType::CHARACTER ); tokens.emplace_back ( measurements::to_string ( elem.first ), sax::Token::TokenType::CHARACTER );
tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_NAME_TAG, sax::Token::TokenType::END_ELEMENT ); tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_NAME_TAG, sax::Token::TokenType::END_ELEMENT );
tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_VALUE_TAG, sax::Token::TokenType::START_ELEMENT ); tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_VALUE_TAG, sax::Token::TokenType::START_ELEMENT );
tokens.emplace_back ( std::to_string ( elem.second ), sax::Token::TokenType::CHARACTER ); tokens.emplace_back ( ext::to_string ( elem.second ), sax::Token::TokenType::CHARACTER );
tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_VALUE_TAG, sax::Token::TokenType::END_ELEMENT ); tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_VALUE_TAG, sax::Token::TokenType::END_ELEMENT );
tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_TAG, sax::Token::TokenType::END_ELEMENT ); tokens.emplace_back ( COUNTER_DATA_FRAME_COUNTER_TAG, sax::Token::TokenType::END_ELEMENT );
} }
......
...@@ -52,7 +52,7 @@ void Double::operator>>(std::ostream& out) const { ...@@ -52,7 +52,7 @@ void Double::operator>>(std::ostream& out) const {
} }
   
Double::operator std::string() const { Double::operator std::string() const {
return std::to_string(m_data); return ext::to_string(m_data);
} }
   
Double Double::parse(std::deque<sax::Token>::iterator& input) { Double Double::parse(std::deque<sax::Token>::iterator& input) {
...@@ -61,7 +61,7 @@ Double Double::parse(std::deque<sax::Token>::iterator& input) { ...@@ -61,7 +61,7 @@ Double Double::parse(std::deque<sax::Token>::iterator& input) {
   
double Double::parseRaw(std::deque<sax::Token>::iterator& input) { double Double::parseRaw(std::deque<sax::Token>::iterator& input) {
sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::START_ELEMENT, Double::getXmlTagName()); sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::START_ELEMENT, Double::getXmlTagName());
double data = std::from_string < double > (sax::FromXMLParserHelper::popTokenData(input, sax::Token::TokenType::CHARACTER)); double data = ext::from_string < double > (sax::FromXMLParserHelper::popTokenData(input, sax::Token::TokenType::CHARACTER));
sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::END_ELEMENT, Double::getXmlTagName()); sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::END_ELEMENT, Double::getXmlTagName());
return data; return data;
} }
...@@ -72,7 +72,7 @@ void Double::compose(std::deque<sax::Token>& out) const { ...@@ -72,7 +72,7 @@ void Double::compose(std::deque<sax::Token>& out) const {
   
void Double::compose(std::deque<sax::Token>& out, double primitive) { void Double::compose(std::deque<sax::Token>& out, double primitive) {
out.emplace_back(Double::getXmlTagName(), sax::Token::TokenType::START_ELEMENT); out.emplace_back(Double::getXmlTagName(), sax::Token::TokenType::START_ELEMENT);
out.emplace_back(std::to_string(primitive), sax::Token::TokenType::CHARACTER); out.emplace_back(ext::to_string(primitive), sax::Token::TokenType::CHARACTER);
out.emplace_back(Double::getXmlTagName(), sax::Token::TokenType::END_ELEMENT); out.emplace_back(Double::getXmlTagName(), sax::Token::TokenType::END_ELEMENT);
} }
   
......
...@@ -47,7 +47,7 @@ void Integer::operator>>(std::ostream& out) const { ...@@ -47,7 +47,7 @@ void Integer::operator>>(std::ostream& out) const {
} }
   
Integer::operator std::string() const { Integer::operator std::string() const {
return std::to_string(m_data); return ext::to_string(m_data);
} }
   
Integer Integer::parse(std::deque<sax::Token>::iterator& input) { Integer Integer::parse(std::deque<sax::Token>::iterator& input) {
...@@ -56,7 +56,7 @@ Integer Integer::parse(std::deque<sax::Token>::iterator& input) { ...@@ -56,7 +56,7 @@ Integer Integer::parse(std::deque<sax::Token>::iterator& input) {
   
int Integer::parseRaw(std::deque<sax::Token>::iterator& input) { int Integer::parseRaw(std::deque<sax::Token>::iterator& input) {
sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::START_ELEMENT, Integer::getXmlTagName()); sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::START_ELEMENT, Integer::getXmlTagName());
int data = std::from_string < int > (sax::FromXMLParserHelper::popTokenData(input, sax::Token::TokenType::CHARACTER)); int data = ext::from_string < int > (sax::FromXMLParserHelper::popTokenData(input, sax::Token::TokenType::CHARACTER));
sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::END_ELEMENT, Integer::getXmlTagName()); sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::END_ELEMENT, Integer::getXmlTagName());
return data; return data;
} }
...@@ -67,7 +67,7 @@ void Integer::compose(std::deque<sax::Token>& out) const { ...@@ -67,7 +67,7 @@ void Integer::compose(std::deque<sax::Token>& out) const {
   
void Integer::compose(std::deque<sax::Token>& out, int primitive) { void Integer::compose(std::deque<sax::Token>& out, int primitive) {
out.emplace_back(Integer::getXmlTagName(), sax::Token::TokenType::START_ELEMENT); out.emplace_back(Integer::getXmlTagName(), sax::Token::TokenType::START_ELEMENT);
out.emplace_back(std::to_string(primitive), sax::Token::TokenType::CHARACTER); out.emplace_back(ext::to_string(primitive), sax::Token::TokenType::CHARACTER);
out.emplace_back(Integer::getXmlTagName(), sax::Token::TokenType::END_ELEMENT); out.emplace_back(Integer::getXmlTagName(), sax::Token::TokenType::END_ELEMENT);
} }
   
......
...@@ -51,7 +51,7 @@ void Unsigned::operator>>(std::ostream& out) const { ...@@ -51,7 +51,7 @@ void Unsigned::operator>>(std::ostream& out) const {
} }
   
Unsigned::operator std::string() const { Unsigned::operator std::string() const {
return std::to_string(m_data); return ext::to_string(m_data);
} }
   
Unsigned Unsigned::parse(std::deque<sax::Token>::iterator& input) { Unsigned Unsigned::parse(std::deque<sax::Token>::iterator& input) {
...@@ -60,7 +60,7 @@ Unsigned Unsigned::parse(std::deque<sax::Token>::iterator& input) { ...@@ -60,7 +60,7 @@ Unsigned Unsigned::parse(std::deque<sax::Token>::iterator& input) {
   
unsigned Unsigned::parseRaw(std::deque<sax::Token>::iterator& input) { unsigned Unsigned::parseRaw(std::deque<sax::Token>::iterator& input) {
sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::START_ELEMENT, Unsigned::getXmlTagName()); sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::START_ELEMENT, Unsigned::getXmlTagName());
unsigned data = std::from_string < unsigned > (sax::FromXMLParserHelper::popTokenData(input, sax::Token::TokenType::CHARACTER)); unsigned data = ext::from_string < unsigned > (sax::FromXMLParserHelper::popTokenData(input, sax::Token::TokenType::CHARACTER));
sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::END_ELEMENT, Unsigned::getXmlTagName()); sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::END_ELEMENT, Unsigned::getXmlTagName());
return data; return data;
} }
...@@ -71,7 +71,7 @@ void Unsigned::compose(std::deque<sax::Token>& out) const { ...@@ -71,7 +71,7 @@ void Unsigned::compose(std::deque<sax::Token>& out) const {
   
void Unsigned::compose(std::deque<sax::Token>& out, unsigned primitive) { void Unsigned::compose(std::deque<sax::Token>& out, unsigned primitive) {
out.emplace_back(Unsigned::getXmlTagName(), sax::Token::TokenType::START_ELEMENT); out.emplace_back(Unsigned::getXmlTagName(), sax::Token::TokenType::START_ELEMENT);
out.emplace_back(std::to_string(primitive), sax::Token::TokenType::CHARACTER); out.emplace_back(ext::to_string(primitive), sax::Token::TokenType::CHARACTER);
out.emplace_back(Unsigned::getXmlTagName(), sax::Token::TokenType::END_ELEMENT); out.emplace_back(Unsigned::getXmlTagName(), sax::Token::TokenType::END_ELEMENT);
} }
   
......
...@@ -47,7 +47,7 @@ void UnsignedLong::operator>>(std::ostream& out) const { ...@@ -47,7 +47,7 @@ void UnsignedLong::operator>>(std::ostream& out) const {
} }
   
UnsignedLong::operator std::string() const { UnsignedLong::operator std::string() const {
return std::to_string(m_data); return ext::to_string(m_data);
} }
   
UnsignedLong UnsignedLong::parse(std::deque<sax::Token>::iterator& input) { UnsignedLong UnsignedLong::parse(std::deque<sax::Token>::iterator& input) {
...@@ -56,7 +56,7 @@ UnsignedLong UnsignedLong::parse(std::deque<sax::Token>::iterator& input) { ...@@ -56,7 +56,7 @@ UnsignedLong UnsignedLong::parse(std::deque<sax::Token>::iterator& input) {
   
unsigned long UnsignedLong::parseRaw(std::deque<sax::Token>::iterator& input) { unsigned long UnsignedLong::parseRaw(std::deque<sax::Token>::iterator& input) {
sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::START_ELEMENT, UnsignedLong::getXmlTagName()); sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::START_ELEMENT, UnsignedLong::getXmlTagName());
unsigned long data = std::from_string < unsigned long > (sax::FromXMLParserHelper::popTokenData(input, sax::Token::TokenType::CHARACTER)); unsigned long data = ext::from_string < unsigned long > (sax::FromXMLParserHelper::popTokenData(input, sax::Token::TokenType::CHARACTER));
sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::END_ELEMENT, UnsignedLong::getXmlTagName()); sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::END_ELEMENT, UnsignedLong::getXmlTagName());
return data; return data;
} }
...@@ -67,7 +67,7 @@ void UnsignedLong::compose(std::deque<sax::Token>& out) const { ...@@ -67,7 +67,7 @@ void UnsignedLong::compose(std::deque<sax::Token>& out) const {
   
void UnsignedLong::compose(std::deque<sax::Token>& out, unsigned long primitive) { void UnsignedLong::compose(std::deque<sax::Token>& out, unsigned long primitive) {
out.emplace_back(UnsignedLong::getXmlTagName(), sax::Token::TokenType::START_ELEMENT); out.emplace_back(UnsignedLong::getXmlTagName(), sax::Token::TokenType::START_ELEMENT);
out.emplace_back(std::to_string(primitive), sax::Token::TokenType::CHARACTER); out.emplace_back(ext::to_string(primitive), sax::Token::TokenType::CHARACTER);
out.emplace_back(UnsignedLong::getXmlTagName(), sax::Token::TokenType::END_ELEMENT); out.emplace_back(UnsignedLong::getXmlTagName(), sax::Token::TokenType::END_ELEMENT);
} }
   
......
...@@ -60,7 +60,7 @@ public: ...@@ -60,7 +60,7 @@ public:
} }
   
virtual operator std::string ( ) const { virtual operator std::string ( ) const {
return "Tmp1(" + std::to_string ( m_data ) + ")"; return "Tmp1(" + ext::to_string ( m_data ) + ")";
} }
   
int getData ( ) const { int getData ( ) const {
...@@ -116,7 +116,7 @@ public: ...@@ -116,7 +116,7 @@ public:
} }
   
virtual operator std::string ( ) const { virtual operator std::string ( ) const {
return "Tmp2(" + std::to_string ( m_data ) + ")"; return "Tmp2(" + ext::to_string ( m_data ) + ")";
} }
   
double getData ( ) const { double getData ( ) const {
...@@ -139,10 +139,10 @@ public: ...@@ -139,10 +139,10 @@ public:
Tmp3 ( const std::string & data ) : m_data ( data ), m_moves ( 0 ), m_copies ( 0 ) { Tmp3 ( const std::string & data ) : m_data ( data ), m_moves ( 0 ), m_copies ( 0 ) {
} }
   
Tmp3 ( const Tmp1 & other ) : m_data ( std::to_string ( other.getData ( ) ) ), m_moves ( 0 ), m_copies ( 0 ) { Tmp3 ( const Tmp1 & other ) : m_data ( ext::to_string ( other.getData ( ) ) ), m_moves ( 0 ), m_copies ( 0 ) {
} }
   
Tmp3 ( const Tmp2 & other ) : m_data ( std::to_string ( other.getData ( ) ) ), m_moves ( 0 ), m_copies ( 0 ) { Tmp3 ( const Tmp2 & other ) : m_data ( ext::to_string ( other.getData ( ) ) ), m_moves ( 0 ), m_copies ( 0 ) {
} }
   
Tmp3 ( const Tmp3 & other ) : m_data ( other.m_data ), m_moves ( other.m_moves ), m_copies ( other.m_copies + 1 ) { Tmp3 ( const Tmp3 & other ) : m_data ( other.m_data ), m_moves ( other.m_moves ), m_copies ( other.m_copies + 1 ) {
......
...@@ -134,7 +134,7 @@ void NonlinearVariableSymbol < SymbolType >::operator >>( std::ostream & out ) c ...@@ -134,7 +134,7 @@ void NonlinearVariableSymbol < SymbolType >::operator >>( std::ostream & out ) c
   
template < class SymbolType > template < class SymbolType >
NonlinearVariableSymbol < SymbolType >::operator std::string ( ) const { NonlinearVariableSymbol < SymbolType >::operator std::string ( ) const {
return "$" + std::to_string ( m_symbol ); return "$" + ext::to_string ( m_symbol );
} }
   
template < class SymbolType > template < class SymbolType >
......
...@@ -279,7 +279,7 @@ AutomatonBase * CompactNFA < SymbolType, StateType >::plunder ( ) && { ...@@ -279,7 +279,7 @@ AutomatonBase * CompactNFA < SymbolType, StateType >::plunder ( ) && {
template < class SymbolType, class StateType > template < class SymbolType, class StateType >
bool CompactNFA < SymbolType, StateType >::addTransition ( StateType from, std::vector < SymbolType > input, StateType to ) { bool CompactNFA < SymbolType, StateType >::addTransition ( StateType from, std::vector < SymbolType > input, StateType to ) {
if ( !getStates ( ).count ( from ) ) if ( !getStates ( ).count ( from ) )
throw AutomatonException ( "State \"" + std::to_string ( from ) + "\" doesn't exist." ); throw AutomatonException ( "State \"" + ext::to_string ( from ) + "\" doesn't exist." );
   
std::set < SymbolType > inputStringAlphabet ( input.begin ( ), input.end ( ) ); std::set < SymbolType > inputStringAlphabet ( input.begin ( ), input.end ( ) );
   
...@@ -288,7 +288,7 @@ bool CompactNFA < SymbolType, StateType >::addTransition ( StateType from, std:: ...@@ -288,7 +288,7 @@ bool CompactNFA < SymbolType, StateType >::addTransition ( StateType from, std::
throw AutomatonException ( "Input string is over different alphabet than automaton" ); throw AutomatonException ( "Input string is over different alphabet than automaton" );
   
if ( !getStates ( ).count ( to ) ) if ( !getStates ( ).count ( to ) )
throw AutomatonException ( "State \"" + std::to_string ( to ) + "\" doesn't exist." ); throw AutomatonException ( "State \"" + ext::to_string ( to ) + "\" doesn't exist." );
   
std::pair < StateType, std::vector < SymbolType > > key = std::make_pair ( std::move ( from ), std::move ( input ) ); std::pair < StateType, std::vector < SymbolType > > key = std::make_pair ( std::move ( from ), std::move ( input ) );
   
...@@ -298,7 +298,7 @@ bool CompactNFA < SymbolType, StateType >::addTransition ( StateType from, std:: ...@@ -298,7 +298,7 @@ bool CompactNFA < SymbolType, StateType >::addTransition ( StateType from, std::
template < class SymbolType, class StateType > template < class SymbolType, class StateType >
void CompactNFA < SymbolType, StateType >::addTransitions ( StateType from, std::vector < SymbolType > input, std::set < StateType > to ) { void CompactNFA < SymbolType, StateType >::addTransitions ( StateType from, std::vector < SymbolType > input, std::set < StateType > to ) {
if ( !getStates ( ).count ( from ) ) if ( !getStates ( ).count ( from ) )
throw AutomatonException ( "State \"" + std::to_string ( from ) + "\" doesn't exist." ); throw AutomatonException ( "State \"" + ext::to_string ( from ) + "\" doesn't exist." );
   
std::set < SymbolType > inputStringAlphabet ( input.begin ( ), input.end ( ) ); std::set < SymbolType > inputStringAlphabet ( input.begin ( ), input.end ( ) );
   
...@@ -329,7 +329,7 @@ const std::map < std::pair < StateType, std::vector < SymbolType > >, std::set < ...@@ -329,7 +329,7 @@ const std::map < std::pair < StateType, std::vector < SymbolType > >, std::set <
template < class SymbolType, class StateType > template < class SymbolType, class StateType >
std::map < std::pair < StateType, std::vector < SymbolType > >, std::set < StateType > > CompactNFA < SymbolType, StateType >::getTransitionsFromState ( const StateType & from ) const { std::map < std::pair < StateType, std::vector < SymbolType > >, std::set < StateType > > CompactNFA < SymbolType, StateType >::getTransitionsFromState ( const StateType & from ) const {
if ( !getStates ( ).count ( from ) ) if ( !getStates ( ).count ( from ) )
throw AutomatonException ( "State \"" + std::to_string ( from ) + "\" doesn't exist" ); throw AutomatonException ( "State \"" + ext::to_string ( from ) + "\" doesn't exist" );
   
std::map < std::pair < StateType, std::vector < SymbolType > >, std::set < StateType > > transitionsFromState; std::map < std::pair < StateType, std::vector < SymbolType > >, std::set < StateType > > transitionsFromState;
   
...@@ -343,7 +343,7 @@ std::map < std::pair < StateType, std::vector < SymbolType > >, std::set < State ...@@ -343,7 +343,7 @@ std::map < std::pair < StateType, std::vector < SymbolType > >, std::set < State
template < class SymbolType, class StateType > template < class SymbolType, class StateType >
std::map < std::pair < StateType, std::vector < SymbolType > >, std::set < StateType > > CompactNFA < SymbolType, StateType >::getTransitionsToState ( const StateType & to ) const { std::map < std::pair < StateType, std::vector < SymbolType > >, std::set < StateType > > CompactNFA < SymbolType, StateType >::getTransitionsToState ( const StateType & to ) const {
if ( !getStates ( ).count ( to ) ) if ( !getStates ( ).count ( to ) )
throw AutomatonException ( "State \"" + std::to_string ( to ) + "\" doesn't exist" ); throw AutomatonException ( "State \"" + ext::to_string ( to ) + "\" doesn't exist" );
   
std::map < std::pair < StateType, std::vector < SymbolType > >, std::set < StateType > > transitionsToState; std::map < std::pair < StateType, std::vector < SymbolType > >, std::set < StateType > > transitionsToState;
   
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment