Mercurial > repos > public > sbplib
changeset 248:81e0ead29431 feature/beams
Fixed package names in +parametrization
| author | Jonatan Werpers <jonatan@werpers.com> |
|---|---|
| date | Mon, 05 Sep 2016 16:34:22 +0200 |
| parents | c2ca9717db4d |
| children | 02423f9323c6 |
| files | +parametrization/Curve.m +parametrization/Ti.m +parametrization/old/curve_discretise.m +parametrization/old/plot_shape.m +parametrization/old/shape_discretise.m +parametrization/old/shape_linesegments.m +parametrization/old/triang_interp.m +parametrization/old/triang_interp_pts.m +parametrization/old/triang_show.m |
| diffstat | 9 files changed, 54 insertions(+), 54 deletions(-) [+] |
line wrap: on
line diff
diff -r c2ca9717db4d -r 81e0ead29431 +parametrization/Curve.m --- a/+parametrization/Curve.m Wed Aug 31 17:31:25 2016 +0200 +++ b/+parametrization/Curve.m Mon Sep 05 16:34:22 2016 +0200 @@ -24,7 +24,7 @@ if ~isempty(transformation) transformation.base_g = g; transformation.base_gp = gp; - [g,gp] = grid.Curve.transform_g(g,gp,transformation); + [g,gp] = parametrization.Curve.transform_g(g,gp,transformation); end obj.g = g; @@ -106,7 +106,7 @@ % New function and derivative g_new = @(t)obj.g(arcPar(t)); gp_new = @(t) normalize(obj.gp(arcPar(t))); - curve = grid.Curve(g_new,gp_new); + curve = parametrization.Curve(g_new,gp_new); end @@ -131,7 +131,7 @@ function D = reverse(C) % g = C.g; % gp = C.gp; - % D = grid.Curve(@(t)g(1-t),@(t)-gp(1-t)); + % D = parametrization.Curve(@(t)g(1-t),@(t)-gp(1-t)); D = C.transform([],[],-1); end @@ -157,7 +157,7 @@ transformation.flip = flip*flip_old; end - D = grid.Curve(g,gp,transformation); + D = parametrization.Curve(g,gp,transformation); end @@ -171,7 +171,7 @@ % v(2,:) = x(2,:)+a(2); % end - % D = grid.Curve(@g_fun,gp); + % D = parametrization.Curve(@g_fun,gp); D = C.transform([],a); end @@ -206,7 +206,7 @@ % v = A*gp(t); % end - % D = grid.Curve(@g_fun,@gp_fun); + % D = parametrization.Curve(@g_fun,@gp_fun); % g = A(g-a)+a = Ag - Aa + a; b = - A*a + a; @@ -237,7 +237,7 @@ % v = A*gp(t); % end - % D = grid.Curve(@g_fun,@gp_fun); + % D = parametrization.Curve(@g_fun,@gp_fun); % g = A(g-a)+a = Ag - Aa + a; @@ -268,7 +268,7 @@ end g = @g_fun; - obj = grid.Curve(g); + obj = parametrization.Curve(g); end function obj = circle(c,r,phi) @@ -288,7 +288,7 @@ v(2,:) = (phi(2)-phi(1))*r*cos(w); end - obj = grid.Curve(@g_fun,@g_fun_deriv); + obj = parametrization.Curve(@g_fun,@g_fun_deriv); end function obj = bezier(p0, p1, p2, p3) @@ -302,7 +302,7 @@ v(2,:) = 3*(1-t).^2*(p1(2)-p0(2)) + 6*(1-t).*t*(p2(2)-p1(2)) + 3*t.^2*(p3(2)-p2(2)); end - obj = grid.Curve(@g_fun,@g_fun_deriv); + obj = parametrization.Curve(@g_fun,@g_fun_deriv); end
diff -r c2ca9717db4d -r 81e0ead29431 +parametrization/Ti.m --- a/+parametrization/Ti.m Wed Aug 31 17:31:25 2016 +0200 +++ b/+parametrization/Ti.m Mon Sep 05 16:34:22 2016 +0200 @@ -119,7 +119,7 @@ new_gs{i} = gs{i}.translate(a); end - ti = grid.Ti(new_gs{:}); + ti = parametrization.Ti(new_gs{:}); end % Mirrors the Ti so that the resulting Ti is still left handed. @@ -134,7 +134,7 @@ new_gs{2} = gs{4}.mirror(a,b).reverse(); new_gs{4} = gs{2}.mirror(a,b).reverse(); - ti = grid.Ti(new_gs{:}); + ti = parametrization.Ti(new_gs{:}); end function ti = rotate(obj,a,rad) @@ -144,7 +144,7 @@ new_gs{i} = gs{i}.rotate(a,rad); end - ti = grid.Ti(new_gs{:}); + ti = parametrization.Ti(new_gs{:}); end function ti = rotate_edges(obj,n); @@ -153,18 +153,18 @@ new_i = mod(i - n,4); new_gs{new_i+1} = obj.gs{i+1}; end - ti = grid.Ti(new_gs{:}); + ti = parametrization.Ti(new_gs{:}); end end methods(Static) function obj = points(p1, p2, p3, p4) - g1 = grid.Curve.line(p1,p2); - g2 = grid.Curve.line(p2,p3); - g3 = grid.Curve.line(p3,p4); - g4 = grid.Curve.line(p4,p1); + g1 = parametrization.Curve.line(p1,p2); + g2 = parametrization.Curve.line(p2,p3); + g3 = parametrization.Curve.line(p3,p4); + g4 = parametrization.Curve.line(p4,p1); - obj = grid.Ti(g1,g2,g3,g4); + obj = parametrization.Ti(g1,g2,g3,g4); end function label(varargin) @@ -190,11 +190,11 @@ ti.show(2,2); - grid.place_label(pc,str); - grid.place_label(pw,'w'); - grid.place_label(pe,'e'); - grid.place_label(ps,'s'); - grid.place_label(pn,'n'); + parametrization.place_label(pc,str); + parametrization.place_label(pw,'w'); + parametrization.place_label(pe,'e'); + parametrization.place_label(ps,'s'); + parametrization.place_label(pn,'n'); end end end
diff -r c2ca9717db4d -r 81e0ead29431 +parametrization/old/curve_discretise.m --- a/+parametrization/old/curve_discretise.m Wed Aug 31 17:31:25 2016 +0200 +++ b/+parametrization/old/curve_discretise.m Mon Sep 05 16:34:22 2016 +0200 @@ -33,7 +33,7 @@ if do_plot fprintf('n:%d max: %f min: %f\n', n, max(d),min(d)); - p = grid.map_curve(g,t); + p = parametrization.map_curve(g,t); figure show(g,t,h); end @@ -44,11 +44,11 @@ t = linspace(0,1,n); t = equalize_d(g,t); d = D(g,t); - p = grid.map_curve(g,t); + p = parametrization.map_curve(g,t); end function d = D(g,t) - p = grid.map_curve(g,t); + p = parametrization.map_curve(g,t); d = zeros(1,length(t)-1); for i = 1:length(d) @@ -71,11 +71,11 @@ function show(g,t,hh) - p = grid.map_curve(g,t); + p = parametrization.map_curve(g,t); - h = grid.plot_curve(g); + h = parametrization.plot_curve(g); h.LineWidth = 2; axis equal hold on @@ -84,7 +84,7 @@ h.MarkerSize = 24; hold off - n = grid.curve_normals(g,t); + n = parametrization.curve_normals(g,t); hold on for i = 1:length(t) p0 = p(:,i);
diff -r c2ca9717db4d -r 81e0ead29431 +parametrization/old/plot_shape.m --- a/+parametrization/old/plot_shape.m Wed Aug 31 17:31:25 2016 +0200 +++ b/+parametrization/old/plot_shape.m Mon Sep 05 16:34:22 2016 +0200 @@ -6,7 +6,7 @@ hs = {}; hold on for i = 1:length(s) - hs{end+1} = grid.plot_curve(s{i},n); + hs{end+1} = parametrization.plot_curve(s{i},n); end hold off end \ No newline at end of file
diff -r c2ca9717db4d -r 81e0ead29431 +parametrization/old/shape_discretise.m --- a/+parametrization/old/shape_discretise.m Wed Aug 31 17:31:25 2016 +0200 +++ b/+parametrization/old/shape_discretise.m Mon Sep 05 16:34:22 2016 +0200 @@ -2,7 +2,7 @@ function p = shape_discretise(s,h) p = []; for i = 1:length(s) - [~,pt] = grid.curve_discretise(s{i},h); + [~,pt] = parametrization.curve_discretise(s{i},h); p = [p, pt]; end end \ No newline at end of file
diff -r c2ca9717db4d -r 81e0ead29431 +parametrization/old/shape_linesegments.m --- a/+parametrization/old/shape_linesegments.m Wed Aug 31 17:31:25 2016 +0200 +++ b/+parametrization/old/shape_linesegments.m Mon Sep 05 16:34:22 2016 +0200 @@ -3,7 +3,7 @@ l = {}; for i = 1:length(s) - t = grid.curve_discretise(s{i},h); - l = [l, grid.curve_linesegments(s{i},t)]; + t = parametrization.curve_discretise(s{i},h); + l = [l, parametrization.curve_linesegments(s{i},t)]; end end \ No newline at end of file
diff -r c2ca9717db4d -r 81e0ead29431 +parametrization/old/triang_interp.m --- a/+parametrization/old/triang_interp.m Wed Aug 31 17:31:25 2016 +0200 +++ b/+parametrization/old/triang_interp.m Mon Sep 05 16:34:22 2016 +0200 @@ -13,9 +13,9 @@ o.A = g1(0); o.B = g2(0); o.C = g3(0); - o.Sa = grid.triang_interp.square_to_triangle_interp(g2,g3,g1); - o.Sb = grid.triang_interp.square_to_triangle_interp(g3,g1,g2); - o.Sc = grid.triang_interp.square_to_triangle_interp(g1,g2,g3); + o.Sa = parametrization.triang_interp.square_to_triangle_interp(g2,g3,g1); + o.Sb = parametrization.triang_interp.square_to_triangle_interp(g3,g1,g2); + o.Sc = parametrization.triang_interp.square_to_triangle_interp(g1,g2,g3); end @@ -30,17 +30,17 @@ ka = @(t)(o.g1(1-t)+o.g2(t))/2; - h = grid.plot_curve(ma); + h = parametrization.plot_curve(ma); h.Color = Color.blue; - h = grid.plot_curve(mb); + h = parametrization.plot_curve(mb); h.Color = Color.blue; - h = grid.plot_curve(mc); + h = parametrization.plot_curve(mc); h.Color = Color.blue; - h = grid.plot_curve(na); + h = parametrization.plot_curve(na); h.Color = Color.red; - h = grid.plot_curve(ka); + h = parametrization.plot_curve(ka); h.Color = Color.red; [a(1),a(2)] = ma(1/3); @@ -50,7 +50,7 @@ d = ka(1-1/3); - grid.label_pt(a,b,c,d); + parametrization.label_pt(a,b,c,d); % t = linspace(0,1,N); @@ -59,23 +59,23 @@ % sb = @(s)o.Sb(s,t(i)); % sc = @(s)o.Sc(s,t(i)); - % h = grid.plot_curve(sa); + % h = parametrization.plot_curve(sa); % h.Color = Color.blue; - % h = grid.plot_curve(sb); + % h = parametrization.plot_curve(sb); % h.Color = Color.blue; - % h = grid.plot_curve(sc); + % h = parametrization.plot_curve(sc); % h.Color = Color.blue; % end - h = grid.plot_curve(o.g1); + h = parametrization.plot_curve(o.g1); h.LineWidth = 2; h.Color = Color.red; - h = grid.plot_curve(o.g2); + h = parametrization.plot_curve(o.g2); h.LineWidth = 2; h.Color = Color.red; - h = grid.plot_curve(o.g3); + h = parametrization.plot_curve(o.g3); h.LineWidth = 2; h.Color = Color.red; @@ -90,8 +90,8 @@ % The collapsed side is mapped to the corner oposite to g1. % This is done such that for S(s,t), S(s,1) = g1(s) function S = square_to_triangle_interp(g1,g2,g3) - corner = grid.line_segment(g3(0),g3(0)); - S = grid.transfinite_interp(corner,g3,f(g1),f(g2)) + corner = parametrization.line_segment(g3(0),g3(0)); + S = parametrization.transfinite_interp(corner,g3,f(g1),f(g2)) % Function to flip a curve function h = f(g)
diff -r c2ca9717db4d -r 81e0ead29431 +parametrization/old/triang_interp_pts.m --- a/+parametrization/old/triang_interp_pts.m Wed Aug 31 17:31:25 2016 +0200 +++ b/+parametrization/old/triang_interp_pts.m Mon Sep 05 16:34:22 2016 +0200 @@ -8,5 +8,5 @@ g2 = @(t)(p2 + t*(p3-p2)); g3 = @(t)(p3 + t*(p1-p3)); - S = grid.triang_interp(g1,g2,g3); + S = parametrization.triang_interp(g1,g2,g3); end
diff -r c2ca9717db4d -r 81e0ead29431 +parametrization/old/triang_show.m --- a/+parametrization/old/triang_show.m Wed Aug 31 17:31:25 2016 +0200 +++ b/+parametrization/old/triang_show.m Mon Sep 05 16:34:22 2016 +0200 @@ -4,8 +4,8 @@ ih = ishold(); hold on - h_grid = grid.triang_plot_interp(S,n); - h_bord = grid.triang_plot_interp(S,2); + h_grid = parametrization.triang_plot_interp(S,n); + h_bord = parametrization.triang_plot_interp(S,2); set(h_grid,'Color',[0 0.4470 0.7410]); set(h_bord,'Color',[0.8500 0.3250 0.0980]);