josh/ichigo
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

simplify out the factor of 6

Browse source
This commit is contained in:
Josh Deprez 2021-10-03 18:31:04 +11:00
parent 61a8295962
commit 120c2172ec
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
geom/spline.go
View file

@ -68,7 +68,7 @@ func (s *LinearSpline) Interpolate(x float64) float64 {
type CubicSpline struct { type CubicSpline struct {
Points []Float2 Points []Float2
// moments and intervals // moments (second derivative at 1/6 scale) and intervals
m, h []float64 m, h []float64
// slope of line before and after spline, for extrapolation // slope of line before and after spline, for extrapolation
@ -98,9 +98,12 @@ func (s *CubicSpline) Prepare() error {
s.h[i] = s.Points[i+1].X - s.Points[i].X s.h[i] = s.Points[i+1].X - s.Points[i].X
} }
// Compute moments. m[0] and m[N-1] are chosen to be 0 (natural cubic spline). // Compute moments. m[0] and m[N-1] are chosen to be 0 (natural cubic spline).
// Also these "moments" aren't the true values of the second derivatives
// at the knots - they are calculated at 1/6th scale to avoid a multiply
// and divide by 6.)
// Given: // Given:
// ɣ(i) = 2.0 * (h[i-1] + h[i]) // ɣ(i) = 2.0 * (h[i-1] + h[i])
// b(i) = 6.0 * ((Points[i+1].Y-Points[i].Y)/h[i] - (Points[i].Y-Points[i-1].Y)/h[i-1]) // b(i) = ((Points[i+1].Y-Points[i].Y)/h[i] - (Points[i].Y-Points[i-1].Y)/h[i-1])
// we solve for m[i] in the equations: // we solve for m[i] in the equations:
// h[i-1]*m[i-1] + ɣ(i)*m[i] + h[i]*m[i+1] = b(i) // h[i-1]*m[i-1] + ɣ(i)*m[i] + h[i]*m[i+1] = b(i)
// for i = 1...N-2. // for i = 1...N-2.
@ -122,7 +125,7 @@ func (s *CubicSpline) Prepare() error {
for i := 1; i < N-1; i++ { for i := 1; i < N-1; i++ {
diag[i] = 2.0 * (s.h[i-1] + s.h[i]) diag[i] = 2.0 * (s.h[i-1] + s.h[i])
upper[i] = s.h[i] upper[i] = s.h[i]
B[i] = 6.0 * ((s.Points[i+1].Y-s.Points[i].Y)/s.h[i] - (s.Points[i].Y-s.Points[i-1].Y)/s.h[i-1]) B[i] = (s.Points[i+1].Y-s.Points[i].Y)/s.h[i] - (s.Points[i].Y-s.Points[i-1].Y)/s.h[i-1]
} }
// Forward elimination: // Forward elimination:
for i := 2; i < N-1; i++ { for i := 2; i < N-1; i++ {
@ -134,11 +137,6 @@ func (s *CubicSpline) Prepare() error {
for i := N - 2; i > 0; i-- { for i := N - 2; i > 0; i-- {
s.m[i] = (B[i] - s.h[i]*s.m[i+1]) / diag[i] s.m[i] = (B[i] - s.h[i]*s.m[i+1]) / diag[i]
} }
// Divide all the moments by 6, since all the terms with moments in them
// from this point onwards are divided by six.
for i := range s.m {
s.m[i] /= 6.0
}
// Pre- and post-slope: // Pre- and post-slope:
s.preslope = -s.m[1]*s.h[0] + (s.Points[1].Y-s.Points[0].Y)/s.h[0] s.preslope = -s.m[1]*s.h[0] + (s.Points[1].Y-s.Points[0].Y)/s.h[0]
s.postslope = s.m[N-2]*s.h[N-2] + (s.Points[N-1].Y-s.Points[N-2].Y)/s.h[N-2] s.postslope = s.m[N-2]*s.h[N-2] + (s.Points[N-1].Y-s.Points[N-2].Y)/s.h[N-2]