[ViewVC] Diff of: group/branches/new_design/OOPSE-2.0/src/io/BendTypesSectionParser.cpp

Comparing branches/new_design/OOPSE-2.0/src/io/BendTypesSectionParser.cpp (file contents):
Revision 1788 by tim, Wed Nov 24 22:12:12 2004 UTC vs.
Revision 1789 by tim, Mon Nov 29 15:27:43 2004 UTC

#	Line 27 \| Line 27
27		#include "types/HarmonicBendType.hpp"
28		#include "types/UreyBradleyBendType.hpp"
29		#include "types/CubicBendType.hpp"
30	<	#include "types/QuadraticBendType.hpp"
30	>	#include "types/QuarticBendType.hpp"
31		#include "types/PolynomialBendType.hpp"
32		namespace oopse {
33
#	Line 117 \| Line 117 \| void BendTypesSectionParser::parseLine(ForceField& ff,
117		double k1 = tokenizer.nextTokenAsDouble();
118		double k0 = tokenizer.nextTokenAsDouble();
119
120	<	bendType = new QuadraticBendType(theta0, k4, k3, k2, k1, k0);
120	>	bendType = new QuarticBendType(theta0, k4, k3, k2, k1, k0);
121		}
122		break;
123

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