[ViewVC] Diff of: group/trunk/OOPSE-2.0/src/io/BendTypesSectionParser.hpp

Comparing trunk/OOPSE-2.0/src/io/BendTypesSectionParser.hpp (file contents):
Revision 1930 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 2501 by chuckv, Thu Dec 8 15:38:49 2005 UTC

#	Line 1 \| Line 1
1	<	/*
1	>	/*
2		* Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3		*
4		* The University of Notre Dame grants you ("Licensee") a
#	Line 43 \| Line 43 \| namespace oopse {
43		#define IO_BENDTYPESSECTIONPARSER_HPP
44		#include <map>
45		#include "io/SectionParser.hpp"
46	+	#include "io/ForceFieldOptions.hpp"
47		namespace oopse {
48
49	<	/**
50	<	* @class BendTypesSectionParser BendTypesSectionParser.hpp "io/BendTypesSectionParser.hpp"
51	<	*/
52	<	class BendTypesSectionParser : public SectionParser {
53	<	public:
54	<	BendTypesSectionParser();
49	>	/**
50	>	* @class BendTypesSectionParser BendTypesSectionParser.hpp "io/BendTypesSectionParser.hpp"
51	>	*/
52	>	class BendTypesSectionParser : public SectionParser {
53	>	public:
54	>	BendTypesSectionParser(ForceFieldOptions& options);
55
56	<	private:
56	>	private:
57
58	<	enum BendTypeEnum{
59	<	btHarmonic,
60	<	btGhostBend,
61	<	btUreyBradley,
62	<	btCubic,
63	<	btQuartic,
64	<	btPolynomial,
65	<	btUnknown
66	<	};
58	>	enum BendTypeEnum{
59	>	btHarmonic,
60	>	btGhostBend,
61	>	btUreyBradley,
62	>	btCubic,
63	>	btQuartic,
64	>	btPolynomial,
65	>	btUnknown
66	>	};
67
68	<	void parseLine(ForceField& ff, const std::string& line, int lineNo);
68	>	void parseLine(ForceField& ff, const std::string& line, int lineNo);
69
70	<	BendTypeEnum getBendTypeEnum(const std::string& str);
70	>	BendTypeEnum getBendTypeEnum(const std::string& str);
71
72	<	std::map<std::string, BendTypeEnum> stringToEnumMap_;
73	<	};
72	>	std::map<std::string, BendTypeEnum> stringToEnumMap_;
73	>	ForceFieldOptions& options_;
74	>	};
75
76
77		} //namespace oopse

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