Mercurial > repos > public > sbplib

changeset 1094:ad3089f04e0b feature/dataspline

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert changes in Curve so that spline() is not a static method.
author Martin Almquist <malmquist@stanford.edu>
date Fri, 05 Apr 2019 13:33:25 -0700
parents fdff002ebb32
children eec03e78c6f2
files +parametrization/Curve.m
diffstat 1 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/+parametrization/Curve.m	Fri Apr 05 13:15:45 2019 -0700
+++ b/+parametrization/Curve.m	Fri Apr 05 13:33:25 2019 -0700
@@ -103,7 +103,7 @@
             % Construct arcLength function using splines
             tvec = linspace(0,1,N);
             arcVec = obj.arcLength(0,tvec);
-            tFunc = parametrization.Curve.spline(arcVec,tvec); % t as a function of arcLength
+            tFunc = spline(arcVec,tvec); % t as a function of arcLength
             L = obj.arcLength(0,1);
             arcPar = @(s) tFunc(s*L);
 
@@ -259,8 +259,8 @@
             gVec = g(t)';
             gpVec = (D1*gVec)';
 
-            gp1_fun = parametrization.Curve.spline(t,gpVec(1,:));
-            gp2_fun = parametrization.Curve.spline(t,gpVec(2,:));
+            gp1_fun = spline(t,gpVec(1,:));
+            gp2_fun = spline(t,gpVec(2,:));
             gp_out = @(t) [gp1_fun(t);gp2_fun(t)];
         end
 
@@ -279,16 +279,6 @@
             obj = parametrization.Curve(@g_fun, @g_fun_deriv);
         end
 
-        % Returns a function handle to the spline.
-        function f = spline(tval,fval,spline_order)
-            default_arg('spline_order',4);
-            [m,~] = size(tval);
-            assert(m==1,'Need row vectors.');
-
-            f_spline = spapi( optknt(tval,spline_order), tval, fval );
-            f = @(t) fnval(f_spline,t);
-        end
-
         function obj = circle(c,r,phi)
             default_arg('phi',[0; 2*pi])
             default_arg('c',[0; 0])
@@ -392,3 +382,13 @@
         end
     end
 end
+
+% Returns a function handle to the spline.
+function f = spline(tval,fval,spline_order)
+    default_arg('spline_order',4);
+    [m,~] = size(tval);
+    assert(m==1,'Need row vectors.');
+
+    f_spline = spapi( optknt(tval,spline_order), tval, fval );
+    f = @(t) fnval(f_spline,t);
+end