From: <mk...@us...> - 2003-08-14 21:56:47
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData In directory sc8-pr-cvs1:/tmp/cvs-serv15755/Include/SimData Modified Files: DataArchive.h DataManager.h Enum.h Quat.h Random.h Log Message: Index: DataArchive.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/DataArchive.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** DataArchive.h 14 Aug 2003 12:19:12 -0000 1.15 --- DataArchive.h 14 Aug 2003 21:50:30 -0000 1.16 *************** *** 279,288 **** /** ! * Get all children of a given path. * ! * For path "A:X.Y", returns all object id's "A:X.Y.*". The id's * can be converted to human-readable form by getPathString(). * ! * @param path the path to search for children * @returns a list of object id's immediately below the given path. */ --- 279,288 ---- /** ! * Get all children of a given object id. * ! * For id "A:X.Y", returns all object id's "A:X.Y.*". The id's * can be converted to human-readable form by getPathString(). * ! * @param id the object id to search for children * @returns a list of object id's immediately below the given path. */ *************** *** 414,418 **** * Find the table entry corresponding to a given object. * ! * @param path the object id to lookup * @param path_str the path string, if available (only used for * error logging). --- 414,418 ---- * Find the table entry corresponding to a given object. * ! * @param id the object id to lookup * @param path_str the path string, if available (only used for * error logging). Index: DataManager.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/DataManager.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DataManager.h 14 Aug 2003 12:19:12 -0000 1.7 --- DataManager.h 14 Aug 2003 21:50:30 -0000 1.8 *************** *** 93,102 **** /** ! * Get all children of a given path. * ! * For path "A:X.Y", returns all object id's "A:X.Y.*". The id's * can be converted to human-readable form by getPathString(). * ! * @param path the path to search for children * @returns a list of object id's immediately below the given path. */ --- 93,102 ---- /** ! * Get all children of a given object id. * ! * For id "A:X.Y", returns all object id's "A:X.Y.*". The id's * can be converted to human-readable form by getPathString(). * ! * @param id the object id to search for children * @returns a list of object id's immediately below the given path. */ Index: Enum.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Enum.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Enum.h 14 Aug 2003 12:19:12 -0000 1.11 --- Enum.h 14 Aug 2003 21:50:30 -0000 1.12 *************** *** 333,337 **** /// Get a list of Enums in the range between two Enums (inclusive). ! inline const std::vector<EnumLink> range(const EnumLink& a, const EnumLink& b) const; /// Get a list of Enums in the range between two strings (inclusive). --- 333,337 ---- /// Get a list of Enums in the range between two Enums (inclusive). ! inline const std::vector<EnumLink> range(EnumLink const &a, EnumLink const &b) const; /// Get a list of Enums in the range between two strings (inclusive). *************** *** 342,346 **** /// Test for inclusion in the Enumeration set. ! inline bool contains(const EnumLink& x) const; /// Test for inclusion in the Enumeration set. --- 342,346 ---- /// Test for inclusion in the Enumeration set. ! inline bool contains(EnumLink const &x) const; /// Test for inclusion in the Enumeration set. *************** *** 351,355 **** /// Test for inclusion in the Enumeration set. ! bool contains(const std::string& token) const { assert(__core.valid()); return __core->containsToken(token); --- 351,355 ---- /// Test for inclusion in the Enumeration set. ! bool contains(std::string const &token) const { assert(__core.valid()); return __core->containsToken(token); *************** *** 595,599 **** EnumLink const & operator=(EnumLink const &e) { return EnumLink::operator=(e); } EnumLink const &operator =(int value) { return EnumLink::operator=(value); } ! EnumLink const &operator =(std::string &token) { return EnumLink::operator=(token); } #endif /// Return a string representation (for SWIG/Python). --- 595,599 ---- EnumLink const & operator=(EnumLink const &e) { return EnumLink::operator=(e); } EnumLink const &operator =(int value) { return EnumLink::operator=(value); } ! EnumLink const &operator =(std::string const &token) { return EnumLink::operator=(token); } #endif /// Return a string representation (for SWIG/Python). *************** *** 622,631 **** } ! inline const std::vector<EnumLink> Enumeration::range(const EnumLink& a, const EnumLink& b) const { if (a.__E != *this || b.__E != *this) throw EnumTypeError(); return __range(a.getIndex(), b.getIndex()); } ! inline const std::vector<EnumLink> Enumeration::range(const std::string& a, const std::string& b) const { return __range(getIndexByToken(a), getIndexByToken(b)); } --- 622,631 ---- } ! inline const std::vector<EnumLink> Enumeration::range(EnumLink const &a, EnumLink const &b) const { if (a.__E != *this || b.__E != *this) throw EnumTypeError(); return __range(a.getIndex(), b.getIndex()); } ! inline const std::vector<EnumLink> Enumeration::range(std::string const &a, std::string const &b) const { return __range(getIndexByToken(a), getIndexByToken(b)); } *************** *** 664,668 **** } ! inline bool Enumeration::contains(const EnumLink& x) const { return x.__E == *this; } inline EnumLink Enumeration::last() const { --- 664,668 ---- } ! inline bool Enumeration::contains(EnumLink const &x) const { return x.__E == *this; } inline EnumLink Enumeration::last() const { Index: Quat.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Quat.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Quat.h 14 Aug 2003 12:19:12 -0000 1.4 --- Quat.h 14 Aug 2003 21:50:30 -0000 1.5 *************** *** 318,322 **** * Set this Quat to represent a rotation about an axis. * ! * @param the angle of rotation (right-handed) in radians. * @param x the x component of the rotation axis. * @param y the y component of the rotation axis. --- 318,322 ---- * Set this Quat to represent a rotation about an axis. * ! * @param angle the angle of rotation (right-handed) in radians. * @param x the x component of the rotation axis. * @param y the y component of the rotation axis. *************** *** 329,333 **** * Set this Quat to represent a rotation about an axis. * ! * @param the angle of rotation (right-handed) in radians. * @param vec the rotation axis. */ --- 329,333 ---- * Set this Quat to represent a rotation about an axis. * ! * @param angle the angle of rotation (right-handed) in radians. * @param vec the rotation axis. */ Index: Random.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Random.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Random.h 7 Aug 2003 17:47:30 -0000 1.11 --- Random.h 14 Aug 2003 21:50:30 -0000 1.12 *************** *** 185,189 **** * Reseed the random number generator. * ! * @param seed the new seed. */ void setSeed(unsigned long int s); --- 185,189 ---- * Reseed the random number generator. * ! * @param s the new seed. */ void setSeed(unsigned long int s); *************** *** 356,360 **** * Reseed the random number generator. * ! * @param seed the new seed. */ void setSeed(unsigned long int s); --- 356,360 ---- * Reseed the random number generator. * ! * @param s the new seed. */ void setSeed(unsigned long int s); |