mirror-github-bspeice/cuburn
1
0
Fork 0
mirror of https://github.com/stevenrobertson/cuburn.git synced 2025-02-05 11:40:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix spline derivative calculation.

Browse Source
This commit is contained in:
Steven Robertson 2011-10-29 10:51:33 -04:00
parent bfff915b7e
commit 6204f36ebc
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cuburn/genome.py
View File

@ -39,33 +39,34 @@ class SplEval(object):
# Normalize to [0,1] # Normalize to [0,1]
t = itime - times[1] t = itime - times[1]
times = times - times[1] times = times - times[1]
t = t / times[2] scale = 1 / times[2]
times = times / times[2] t = t * scale
return times, vals, t times = times * scale
return times, vals, t, scale
def __call__(self, itime, deriv=0): def __call__(self, itime, deriv=0):
times, vals, t = self.find_knots(itime) times, vals, t, scale = self.find_knots(itime)
m1 = (vals[2] - vals[0]) / (1.0 - times[0]) m1 = (vals[2] - vals[0]) / (1.0 - times[0])
m2 = (vals[3] - vals[1]) / times[3] m2 = (vals[3] - vals[1]) / times[3]
mat = self._mat mat = self._mat
if deriv: if deriv:
mat = mat * self._deriv ** (deriv) mat = mat * (scale * self._deriv) ** deriv
val = [m1, vals[1], m2, vals[2]] * mat * np.array([[t**3, t**2, t, 1]]).T val = [m1, vals[1], m2, vals[2]] * mat * np.array([[t**3, t**2, t, 1]]).T
return val[0,0] return val[0,0]
def _plt(self, name='SplEval'): def _plt(self, name='SplEval', fig=111, show=True):
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
x = np.linspace(-0.05, 1.05, 500) x = np.linspace(-0.0, 1.0, 500)
r = x[1] - x[0] r = x[1] - x[0]
derivs = [(self(i+2*r)-self(i-2*r))/(4*r) for i in x] plt.figure(fig)
plt.figure(1)
plt.title(name) plt.title(name)
plt.plot(x,map(self,x),x,[self(i,1) for i in x],'--',x,derivs,'r.') plt.plot(x,map(self,x),x,[self(i,1) for i in x],'--',
plt.show() self.knots[0],self.knots[1],'x')
plt.xlim(0.0, 1.0)
if show:
plt.show()
def __str__(self): def __str__(self):
return '[%g:%g]' % (self(0), self(1)) return '[%g:%g]' % (self(0), self(1))