X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FRENUMBER%2FRenumberingFactory.cxx;h=2da7cde909324327eeecc7c95a356728094397ef;hb=c4551c56aa89896595842e5b41b048044681b4e8;hp=fd4410e9011414fd75113b222c24ad15f9958c1c;hpb=a787799e3bcf19598227996617e5113e68ff36fb;p=tools%2Fmedcoupling.git diff --git a/src/RENUMBER/RenumberingFactory.cxx b/src/RENUMBER/RenumberingFactory.cxx index fd4410e90..2da7cde90 100644 --- a/src/RENUMBER/RenumberingFactory.cxx +++ b/src/RENUMBER/RenumberingFactory.cxx @@ -27,20 +27,27 @@ #endif #include - -using namespace std; +#include namespace MED_RENUMBER -{ - Renumbering* RenumberingFactory(const string &s) +{ + bool CompareRenumMeth(const std::string& s1, const char *s2) + { + std::string ss1(s1),ss2(s2); + std::transform(ss1.begin(), ss1.end(), ss1.begin(), ::tolower); + std::transform(ss2.begin(), ss2.end(), ss2.begin(), ::tolower); + return ss1==ss2; + } + + Renumbering* RenumberingFactory(const std::string &s) { #ifdef MED_ENABLE_METIS #ifdef ENABLE_BOOST - if (s==METIS_ALG) + if ( CompareRenumMeth(s,METIS_ALG) ) { return new METISRenumbering; } - else if(s==BOOST_ALG) + else if( CompareRenumMeth(s,BOOST_ALG) ) { return new BOOSTRenumbering; } @@ -51,7 +58,7 @@ namespace MED_RENUMBER } #endif #ifndef ENABLE_BOOST - if (s==METIS_ALG) + if ( CompareRenumMeth(s,METIS_ALG) ) { return new METISRenumbering; } @@ -64,7 +71,7 @@ namespace MED_RENUMBER #endif #ifndef MED_ENABLE_METIS #ifdef ENABLE_BOOST - if (s==BOOST_ALG) + if ( CompareRenumMeth(s,BOOST_ALG) ) { return new BOOSTRenumbering; }