ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/utils/ParameterManager.hpp
(Generate patch)

Comparing trunk/src/utils/ParameterManager.hpp (file contents):
Revision 748 by chuckv, Wed Nov 16 21:37:45 2005 UTC vs.
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC

# Line 44 | Line 44
44   *
45   *  Created by Charles F. Vardeman II on 11/16/05.
46   *  @author  Charles F. Vardeman II
47 < *  @version $Id: ParameterManager.hpp,v 1.1 2005-11-16 21:37:45 chuckv Exp $
47 > *  @version $Id: ParameterManager.hpp,v 1.3 2006-05-17 21:51:42 tim Exp $
48   *
49   */
50  
# Line 57 | Line 57
57   #include <vector>
58   #include <string>
59   #include <map>
60 + #include "config.h"
61  
62  
62
63   #include "utils/CaseConversion.hpp"
64  
65  
# Line 109 | Line 109 | struct ParameterTraits<int>{
109    static std::string getParamType() { return "int";}  
110   };
111  
112 < //double
112 > //RealType
113   template<>                    
114 < struct ParameterTraits<double>{
115 <  typedef double RepType;
114 > struct ParameterTraits<RealType>{
115 >  typedef RealType RepType;
116    template<typename T> static bool    convert(T, RepType&){return false;}
117    template<typename T> static RepType convert(T v)        {RepType tmp; convert(v,tmp);return tmp;}
118    static bool convert(RepType v, RepType& r)            {r=v; return true;}
119 <  static bool convert(int v, RepType& r)                {r = static_cast<double>(v); return true;}
120 <  static std::string getParamType() { return "double";}    
119 >  static bool convert(int v, RepType& r)                {r = static_cast<RealType>(v); return true;}
120 >  static std::string getParamType() { return "RealType";}    
121   };
122  
123  
# Line 134 | Line 134 | class ParameterBase { (public)
134    bool empty() {return empty_;}
135    virtual bool setData(std::string) = 0;
136    virtual bool setData(int) = 0;
137 <  virtual bool setData(double) = 0;
137 >  virtual bool setData(RealType) = 0;
138    virtual std::string getParamType() = 0;
139   protected:
140      std::string keyword_;
# Line 157 | Line 157 | class Parameter : public ParameterBase{ (public)
157      return internalSetData<int>(ival);
158    }
159    
160 <  virtual bool setData(double dval) {
161 <    return internalSetData<double>(dval);
160 >  virtual bool setData(RealType dval) {
161 >    return internalSetData<RealType>(dval);
162    }
163    
164    virtual std::string getParamType() { return ParameterTraits<ParamType>::getParamType();}
# Line 189 | Line 189 | NAME.setKeyword(KEYWORD);                  \
189  
190   #define DefineParameter(NAME,KEYWORD)                              \
191   NAME.setKeyword(KEYWORD);                  \
192 < parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
192 > parameters_.insert(std::map<std::string, ParameterBase*>::value_type(std::string(KEYWORD), static_cast<ParameterBase*>(&NAME)));
193  
194   #define DefineOptionalParameter(NAME,KEYWORD)                              \
195   NAME.setKeyword(KEYWORD); NAME.setOptional(true);                    \
196 < parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
196 > parameters_.insert(std::map<std::string, ParameterBase*>::value_type(std::string(KEYWORD), static_cast<ParameterBase*>(&NAME)));
197  
198   #define DefineOptionalParameterWithDefaultValue(NAME,KEYWORD, DEFAULTVALUE)                              \
199   NAME.setKeyword(KEYWORD); NAME.setOptional(true); NAME.setDefaultValue(DEFAULTVALUE);                      \
200 < parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
200 > parameters_.insert(std::map<std::string, ParameterBase*>::value_type(std::string(KEYWORD), static_cast<ParameterBase*>(&NAME)));
201  
202   #define CheckParameter(NAME, CONSTRAINT)                              \
203   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();} }                

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines