Mercurial > repos > public > sbplib

changeset 1091:b4054942e277 feature/dataspline

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rewrite dataSpline() avoiding the spline function in Curve and using fnder for the differentiation
author Jonatan Werpers <jonatan@werpers.com>
date Fri, 05 Apr 2019 10:17:04 +0200
parents 3c187e639dfa
children 47a72344db71
files +parametrization/dataSpline.m
diffstat 1 files changed, 6 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
diff -r 3c187e639dfa -r b4054942e277 +parametrization/dataSpline.m
--- a/+parametrization/dataSpline.m	Fri Apr 05 09:06:03 2019 +0200
+++ b/+parametrization/dataSpline.m	Fri Apr 05 10:17:04 2019 +0200
@@ -11,32 +11,16 @@
 	assert(length(t_data)==length(f_data),'Vectors must be same length');
 	m_data = length(t_data);
 
-	% Create spline interpolant
-	f = parametrization.Curve.spline(t_data, f_data);
-
-	% Reparametrize with a parameter s in [0, 1]
-	tmin = min(t_data);
-	tmax = max(t_data);
-	t = @(s) tmin + s*(tmax-tmin);
+	pp_g = spapi(4, t_data, f_data); % equivalent to g = spapi(aptknt(t_data, 4), t_data, f_data)
+	% or  (not sure what the difference is?!)
+	% g = spapi(optknt(t_data, 4), t_data, f_data)
+	pp_gp = fnder(g);
 
-	% Create parameterized curve
-	g = @(s) [t(s); f(t(s))];
+	g = @(t)fnval(pp_g, t);
+	pp_gp = @(t)fnval(pp_gp, t);
 
-	% Compute numerical derivative of curve using twice as many points as in data set
-	m = 2*m_data;
-	ops = sbp.D2Standard(m, {0, 1}, 6);
-	gp = parametrization.Curve.numericalDerivative(g, ops.D1);
-
-	% Create curve object
 	C = parametrization.Curve(g, gp);
 
 	% Reparametrize with arclength parametrization
 	C = C.arcLengthParametrization(m_data);
-
-	% To avoid nested function calls, evaluate curve and compute final spline.
-	tv = linspace(0, 1, m_data);
-	gv = C.g(tv);
-	g = parametrization.Curve.spline(tv, gv);
-	C = parametrization.Curve(g);
-
 end