diff options
author | Tavian Barnes <tavianator@gmail.com> | 2011-06-10 00:58:17 -0600 |
---|---|---|
committer | Tavian Barnes <tavianator@gmail.com> | 2011-06-10 00:58:17 -0600 |
commit | d4560540b80ac1a05c86812c51119ed08f01de9d (patch) | |
tree | 4ebf4b67b4993e5a85f40d480958ebedff268483 /src/vZ/RK.hpp | |
parent | c44f70badcf31bfd9e8e67ce34c65bff1e1522e2 (diff) | |
download | vz-d4560540b80ac1a05c86812c51119ed08f01de9d.tar.xz |
Add h*c rather than c to x() for function evaluations.
Previously, the x value passed was always partitioning the interval
[x, x + 1], rather than [x, x + h].
Diffstat (limited to 'src/vZ/RK.hpp')
-rw-r--r-- | src/vZ/RK.hpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/vZ/RK.hpp b/src/vZ/RK.hpp index 8964741..6a2a1e1 100644 --- a/src/vZ/RK.hpp +++ b/src/vZ/RK.hpp @@ -82,6 +82,7 @@ namespace vZ k.push_back(k1); // k2..n + Scalar h(this->h()); for (typename ACoefficients::const_iterator i = a.begin(); i != a.end(); ++i) @@ -92,10 +93,10 @@ namespace vZ Scalar aij = i->at(j); c += aij; - y += aij*this->h()*k.at(j); + y += h*aij*k.at(j); } - k.push_back(this->f()(this->x() + c, y)); + k.push_back(this->f()(this->x() + h*c, y)); } return k; @@ -106,10 +107,11 @@ namespace vZ GenericRKIntegrator<Y>::calculateY(const KVector& k, const BCoefficients& b) const { - Y y = this->y(); + Y y(this->y()); + Scalar h(this->h()); for (typename std::vector<Scalar>::size_type i = 0; i < k.size(); ++i) { - y += this->h()*b.at(i)*k.at(i); + y += h*b.at(i)*k.at(i); } return y; |