--- trunk/src/io/ForceFieldOptions.hpp 2005/12/30 23:15:59 834 +++ trunk/src/io/ForceFieldOptions.hpp 2006/05/17 21:51:42 963 @@ -57,13 +57,13 @@ namespace oopse { DeclareParameter(DistanceType, std::string); DeclareParameter(EnergyMixingRule, std::string); DeclareParameter(CutoffPolicy, std::string); - DeclareParameter(EnergyUnitScaling, double); - DeclareParameter(DistanceUnitScaling, double); - DeclareParameter(AngleUnitScaling, double); + DeclareParameter(EnergyUnitScaling, RealType); + DeclareParameter(DistanceUnitScaling, RealType); + DeclareParameter(AngleUnitScaling, RealType); DeclareParameter(TorsionAngleConvention, std::string); - DeclareParameter(vdw14scale, double); - DeclareParameter(electrostatic14scale, double); - DeclareParameter(dielectric, double); + DeclareParameter(vdw14scale, RealType); + DeclareParameter(electrostatic14scale, RealType); + DeclareParameter(dielectric, RealType); public: ForceFieldOptions(); @@ -83,12 +83,12 @@ namespace oopse { bool result; ParamMap::iterator i =parameters_.find(keyword); if (i != parameters_.end()) { - if(isType(value)){ + if(isInteger(value)){ int ival = lexi_cast(value); result = i->second->setData(ival); } - else if (isType(value)){ - double dval = lexi_cast(value); + else if (isType(value)){ + RealType dval = lexi_cast(value); result = i->second->setData(dval); } else{ result = i->second->setData(value);