--- trunk/src/utils/ParameterManager.hpp 2005/11/16 21:37:45 748 +++ trunk/src/utils/ParameterManager.hpp 2008/10/22 20:01:49 1313 @@ -44,7 +44,7 @@ * * Created by Charles F. Vardeman II on 11/16/05. * @author Charles F. Vardeman II - * @version $Id: ParameterManager.hpp,v 1.1 2005-11-16 21:37:45 chuckv Exp $ + * @version $Id: ParameterManager.hpp,v 1.5 2008-10-22 20:01:49 gezelter Exp $ * */ @@ -57,13 +57,14 @@ #include #include #include +#include "config.h" - +#include "utils/simError.h" +#include "utils/StringTokenizer.hpp" #include "utils/CaseConversion.hpp" - template struct ParameterTraits; @@ -109,18 +110,57 @@ struct ParameterTraits{ static std::string getParamType() { return "int";} }; -//double +//int +template<> +struct ParameterTraits{ + typedef unsigned long int RepType; + template static bool convert(T, RepType&){return false;} + template static RepType convert(T v) {RepType tmp; convert(v,tmp);return tmp;} + static bool convert(RepType v, RepType& r) { r=v; return true;} + static bool convert(int v, RepType& r) {r = static_cast(v); return true;} + static std::string getParamType() { return "unsigned long int";} +}; + +//RealType template<> -struct ParameterTraits{ - typedef double RepType; +struct ParameterTraits{ + typedef RealType RepType; template static bool convert(T, RepType&){return false;} template static RepType convert(T v) {RepType tmp; convert(v,tmp);return tmp;} static bool convert(RepType v, RepType& r) {r=v; return true;} - static bool convert(int v, RepType& r) {r = static_cast(v); return true;} - static std::string getParamType() { return "double";} + static bool convert(int v, RepType& r) {r = static_cast(v); return true;} + static bool convert(unsigned long int v, RepType& r) {r = static_cast(v); return true;} + static std::string getParamType() { return "RealType";} }; +//Pair of ints +template<> +struct ParameterTraits >{ + typedef std::pair RepType; + template static bool convert(T, RepType&){return false;} + template static RepType convert(T v) {RepType tmp; convert(v,tmp);return tmp;} + static bool convert(RepType v, RepType& r) {r=v; return true;} + static bool convert(std::string v, RepType& r) { + oopse::StringTokenizer tokenizer(v," ;,\t\n\r"); + if (tokenizer.countTokens() == 2) { + int atom1 = tokenizer.nextTokenAsInt(); + int atom2 = tokenizer.nextTokenAsInt(); + r = std::make_pair(atom1, atom2); + return true; + } else { + sprintf(painCave.errMsg, + "ParameterManager Error: " + "Not enough tokens to make pair!\n"); + painCave.severity = OOPSE_ERROR; + painCave.isFatal = 1; + simError(); + } + return false; + } + static std::string getParamType() { return "std::pair";} +}; + class ParameterBase { public: ParameterBase() : keyword_(), optional_(false), defaultValue_(false), empty_(true) {} @@ -134,10 +174,12 @@ class ParameterBase { (public) bool empty() {return empty_;} virtual bool setData(std::string) = 0; virtual bool setData(int) = 0; - virtual bool setData(double) = 0; + virtual bool setData(unsigned long int) = 0; + virtual bool setData(RealType) = 0; + virtual bool setData(std::pair) = 0; virtual std::string getParamType() = 0; protected: - std::string keyword_; + std::string keyword_; bool optional_; bool defaultValue_; bool empty_; @@ -153,13 +195,22 @@ class Parameter : public ParameterBase{ (public) virtual bool setData(std::string sval) { return internalSetData(sval); } + virtual bool setData(int ival) { return internalSetData(ival); } + + virtual bool setData(unsigned long int lival) { + return internalSetData(lival); + } - virtual bool setData(double dval) { - return internalSetData(dval); + virtual bool setData(RealType dval) { + return internalSetData(dval); } + + virtual bool setData(std::pair pval) { + return internalSetData >(pval); + } virtual std::string getParamType() { return ParameterTraits::getParamType();} private: @@ -189,15 +240,15 @@ NAME.setKeyword(KEYWORD); \ #define DefineParameter(NAME,KEYWORD) \ NAME.setKeyword(KEYWORD); \ -parameters_.insert(std::make_pair(std::string(KEYWORD), &NAME)); +parameters_.insert(std::map::value_type(std::string(KEYWORD), static_cast(&NAME))); #define DefineOptionalParameter(NAME,KEYWORD) \ NAME.setKeyword(KEYWORD); NAME.setOptional(true); \ -parameters_.insert(std::make_pair(std::string(KEYWORD), &NAME)); +parameters_.insert(std::map::value_type(std::string(KEYWORD), static_cast(&NAME))); #define DefineOptionalParameterWithDefaultValue(NAME,KEYWORD, DEFAULTVALUE) \ NAME.setKeyword(KEYWORD); NAME.setOptional(true); NAME.setDefaultValue(DEFAULTVALUE); \ -parameters_.insert(std::make_pair(std::string(KEYWORD), &NAME)); +parameters_.insert(std::map::value_type(std::string(KEYWORD), static_cast(&NAME))); #define CheckParameter(NAME, CONSTRAINT) \ if (!NAME.empty()) { if (!(CONSTRAINT)(NAME.getData())) { sprintf(painCave.errMsg,"Error in checking %s : should be %s\n",NAME.getKeyword().c_str(),(CONSTRAINT).getConstraintDescription().c_str()); painCave.isFatal = 1; painCave.severity = OOPSE_ERROR; simError();} }