git-svn-id: https://reactphysics3d.googlecode.com/svn/trunk@202 92aac97c-a6ce-11dd-a772-7fcde58d38e6

This commit is contained in:
chappuis.daniel 2009-10-08 21:43:14 +00:00
parent 8a465f3868
commit b036b0e9ab

View File

@ -18,29 +18,29 @@
***************************************************************************/ ***************************************************************************/
// Libraries // Libraries
#include "RK4.h" #include "RungeKutta4.h"
#include <cassert> #include <cassert>
// We want to use the ReactPhysics3D namespace // We want to use the ReactPhysics3D namespace
using namespace reactphysics3d; using namespace reactphysics3d;
// Constructor // Constructor
RK4::RK4() { RungeKutta4::RungeKutta4() {
} }
// Copy-constructor // Copy-constructor
RK4::RK4(const RK4& rk4) { RungeKutta4::RungeKutta4(const RungeKutta4& rk4) {
} }
// Destructor // Destructor
RK4::~RK4() { RungeKutta4::~RungeKutta4() {
} }
// Compute a derivative body state at time t // Compute a derivative body state at time t
DerivativeBodyState RK4::evaluate(const BodyState& bodyState, const Time& time) { DerivativeBodyState RungeKutta4::evaluate(const BodyState& bodyState, const Time& time) {
// Compute the derivaties values at time t // Compute the derivaties values at time t
Vector3D linearVelocity = bodyState.getLinearVelocity(); Vector3D linearVelocity = bodyState.getLinearVelocity();
@ -53,7 +53,7 @@ DerivativeBodyState RK4::evaluate(const BodyState& bodyState, const Time& time)
} }
// Compute a derivative body state at time t + dt according to the last derivative body state // Compute a derivative body state at time t + dt according to the last derivative body state
DerivativeBodyState RK4::evaluate(BodyState bodyState, const Time& time, const Time& timeStep, DerivativeBodyState RungeKutta4::evaluate(BodyState bodyState, const Time& time, const Time& timeStep,
const DerivativeBodyState& lastDerivativeBodyState) { const DerivativeBodyState& lastDerivativeBodyState) {
// Compute the bodyState at time t + dt // Compute the bodyState at time t + dt
bodyState.computeAtTime(timeStep, lastDerivativeBodyState); bodyState.computeAtTime(timeStep, lastDerivativeBodyState);
@ -69,7 +69,7 @@ DerivativeBodyState RK4::evaluate(BodyState bodyState, const Time& time, const T
} }
// Integrate a body state over time. This method use the RK4 integration algorithm // Integrate a body state over time. This method use the RK4 integration algorithm
void RK4::integrate(BodyState& bodyState, const Time& time, const Time& timeStep) { void RungeKutta4::integrate(BodyState& bodyState, const Time& time, const Time& timeStep) {
// Compute the 4 derivatives body states at different time values. // Compute the 4 derivatives body states at different time values.
DerivativeBodyState a = evaluate(bodyState, time); DerivativeBodyState a = evaluate(bodyState, time);