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

Comparing branches/development/src/utils/ParameterManager.hpp (file contents):
Revision 1700 by gezelter, Mon Mar 26 15:27:16 2012 UTC vs.
Revision 1780 by jmarr, Mon Aug 20 18:28:22 2012 UTC

# Line 149 | Line 149 | struct ParameterTraits<std::pair<int, int> >{
149      } else {
150        sprintf(painCave.errMsg,
151                "ParameterManager Error: "
152 <              "Not enough tokens to make pair!\n");
152 >              "Incorrect number of tokens to make a pair!\n");
153        painCave.severity = OPENMD_ERROR;
154        painCave.isFatal = 1;
155        simError();    
# Line 167 | Line 167 | struct ParameterTraits<OpenMD::Vector3d >{
167    template<typename T> static RepType convert(T v)        {RepType tmp; convert(v,tmp);return tmp;}
168    static bool convert(RepType v, RepType& r)            {r=v; return true;}
169    static bool convert(std::string v, RepType& r) {
170 +    std::cerr << "calling tokenizer\n";
171      OpenMD::StringTokenizer tokenizer(v," ();,\t\n\r");
172      if (tokenizer.countTokens() == 3) {
173        RealType v1 = tokenizer.nextTokenAsDouble();
# Line 217 | Line 218 | class Parameter : public ParameterBase{ (public)
218   class Parameter : public ParameterBase{
219   public:    
220    typedef ParameterTraits<ParamType> ValueType;
221 <  void setDefaultValue(const ParamType& value) {data_ = value; defaultValue_ = true;}
221 >  void setDefaultValue(const ParamType& value) {data_ = value; defaultValue_ = true; empty_ = false;}
222    ParamType getData() { return data_;}
223    
224    virtual bool setData(std::string sval) {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines