Menu
▾
▴
[Octave-cvsupdate] SF.net SVN: octave:[10242] trunk/octave-forge/main/geometry
|
From: <jpi...@us...> - 2012-04-16 10:01:18
|
Revision: 10242
http://octave.svn.sourceforge.net/octave/?rev=10242&view=rev
Author: jpicarbajal
Date: 2012-04-16 10:01:07 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
geometry: porting new functions to polygon2d
Modified Paths:
--------------
trunk/octave-forge/main/geometry/NEWS
trunk/octave-forge/main/geometry/PKG_ADD
trunk/octave-forge/main/geometry/PKG_DEL
Added Paths:
-----------
trunk/octave-forge/main/geometry/inst/polygons2d/curvature.m
trunk/octave-forge/main/geometry/inst/polygons2d/parametrize.m
Modified: trunk/octave-forge/main/geometry/NEWS
===================================================================
--- trunk/octave-forge/main/geometry/NEWS 2012-04-16 09:53:45 UTC (rev 10241)
+++ trunk/octave-forge/main/geometry/NEWS 2012-04-16 10:01:07 UTC (rev 10242)
@@ -18,7 +18,8 @@
* Solved bugs:
- simplifypolygon.m returned empty polygons when points are repeated, i.e when
the polygon is not correctly formed.
-
+ - Removed installation warnings.
+
===============================================================================
geometry-1.4.1 Release Date: 2012-03-24 Release Manager: Juan Pablo Carbajal
===============================================================================
Modified: trunk/octave-forge/main/geometry/PKG_ADD
===================================================================
--- trunk/octave-forge/main/geometry/PKG_ADD 2012-04-16 09:53:45 UTC (rev 10241)
+++ trunk/octave-forge/main/geometry/PKG_ADD 2012-04-16 10:01:07 UTC (rev 10242)
@@ -30,7 +30,7 @@
%dep_folder = [dep_folder filesep arch];
-if (! exist (fullfile (pkg_folder, "inst"), "dir"))
+if (! exist (fullfile (dirname, "inst"), "dir"))
%% Installing
for ii=1:length (dirlist)
addpath ( [ pkg_folder filesep() dirlist{ii}],"-end")
@@ -40,7 +40,7 @@
%% Testing
warning("geometry:Devel","Adding path for testing.");
for ii=1:length(dirlist)
- addpath ([ pkg_folder "/inst/" dirlist{ii}])
+ addpath ([ dirname "/inst/" dirlist{ii}])
endfor
endif
%addpath (dep_folder)
Modified: trunk/octave-forge/main/geometry/PKG_DEL
===================================================================
--- trunk/octave-forge/main/geometry/PKG_DEL 2012-04-16 09:53:45 UTC (rev 10241)
+++ trunk/octave-forge/main/geometry/PKG_DEL 2012-04-16 10:01:07 UTC (rev 10242)
@@ -29,7 +29,7 @@
%dep_folder = [dep_folder filesep arch];
-if (! exist (fullfile (pkg_folder, "inst"), "dir"))
+if (! exist (fullfile (dirname, "inst"), "dir"))
## Run this if the package is installed
for ii=1:length (dirlist)
rmpath ( [ pkg_folder filesep() dirlist{ii}])
@@ -37,7 +37,7 @@
else
warning("geometry:Devel","Removing path for testing.");
for ii=1:length(dirlist)
- rmpath ([ pkg_folder "/inst/" dirlist{ii}])
+ rmpath ([ dirname "/inst/" dirlist{ii}])
endfor
endif
%rmpath (dep_folder);
Added: trunk/octave-forge/main/geometry/inst/polygons2d/curvature.m
===================================================================
--- trunk/octave-forge/main/geometry/inst/polygons2d/curvature.m (rev 0)
+++ trunk/octave-forge/main/geometry/inst/polygons2d/curvature.m 2012-04-16 10:01:07 UTC (rev 10242)
@@ -0,0 +1,177 @@
+%% Copyright (C) 2003-2011 David Legland <dav...@gr...>
+%% Copyright (C) 2012 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%% All rights reserved.
+%%
+%% Redistribution and use in source and binary forms, with or without
+%% modification, are permitted provided that the following conditions are met:
+%%
+%% 1 Redistributions of source code must retain the above copyright notice,
+%% this list of conditions and the following disclaimer.
+%% 2 Redistributions in binary form must reproduce the above copyright
+%% notice, this list of conditions and the following disclaimer in the
+%% documentation and/or other materials provided with the distribution.
+%%
+%% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ''AS IS''
+%% AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+%% IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+%% ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
+%% ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+%% DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+%% SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+%% CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+%% OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+%% OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+%%
+%% The views and conclusions contained in the software and documentation are
+%% those of the authors and should not be interpreted as representing official
+%% policies, either expressed or implied, of the copyright holders.
+
+%% -*- texinfo -*-
+%% @deftypefn {Function File} {@var{kappa} = } curvature (@var{t}, @var{px}, @var{py},@var{method},@var{degree})
+%% @deftypefnx {Function File} {@var{kappa} = } curvature (@var{t}, @var{poly},@var{method},@var{degree})
+%% @deftypefnx {Function File} {@var{kappa} = } curvature (@var{px}, @var{py},@var{method},@var{degree})
+%% @deftypefnx {Function File} {@var{kappa} = } curvature (@var{points},@var{method},@var{degree})
+%% @deftypefnx {Function File} {[@var{kappa} @var{poly} @var{t}] = } curvature (@dots{})
+%% Estimate curvature of a polyline defined by points.
+%%
+%% First compute an approximation of the curve given by PX and PY, with
+%% the parametrization @var{t}. Then compute the curvature of approximated curve
+%% for each point.
+%% @var{method} used for approximation can be only: 'polynom', with specified degree.
+%% Further methods will be provided in a future version.
+%% @var{t}, @var{px}, and @var{py} are N-by-1 array of the same length. The points
+%% can be specified as a single N-by-2 array.
+%%
+%% If the argument @var{t} is not given, the parametrization is estimated using
+%% function @code{parametrize}.
+%%
+%% If requested, @var{poly} contains the approximating polygon evlauted at the
+%% parametrization @var{t}.
+%%
+%% @seealso{parametrize, polygons2d}
+%% @end deftypefn
+
+function [kappa, varargout] = curvature(varargin)
+
+ % default values
+ degree = 5;
+ t=0; % parametrization of curve
+ tc=0; % indices of points wished for curvature
+
+
+ % =================================================================
+
+ % Extract method and degree ------------------------------
+
+ nargin = length(varargin);
+ varN = varargin{nargin};
+ varN2 = varargin{nargin-1};
+
+ if ischar(varN2)
+ % method and degree are specified
+ method = varN2;
+ degree = varN;
+ varargin = varargin(1:nargin-2);
+ elseif ischar(varN)
+ % only method is specified, use degree 6 as default
+ method = varN;
+ varargin = varargin{1:nargin-1};
+ else
+ % method and degree are implicit : use 'polynom' and 6
+ method = 'polynom';
+ end
+
+ % extract input parametrization and curve. -----------------------
+ nargin = length(varargin);
+ if nargin==1
+ % parameters are just the points -> compute caracterization.
+ var = varargin{1};
+ px = var(:,1);
+ py = var(:,2);
+ elseif nargin==2
+ var = varargin{2};
+ if size(var, 2)==2
+ % parameters are t and POINTS
+ px = var(:,1);
+ py = var(:,2);
+ t = varargin{1};
+ else
+ % parameters are px and py
+ px = varargin{1};
+ py = var;
+ end
+ elseif nargin==3
+ var = varargin{2};
+ if size(var, 2)==2
+ % parameters are t, POINTS, and tc
+ px = var(:,1);
+ py = var(:,2);
+ t = varargin{1};
+ else
+ % parameters are t, px and py
+ t = varargin{1};
+ px = var;
+ py = varargin{3};
+ end
+ elseif nargin==4
+ % parameters are t, px, py and tc
+ t = varargin{1};
+ px = varargin{2};
+ py = varargin{3};
+ tc = varargin{4};
+ end
+
+ % compute implicit parameters --------------------------
+
+ % if t and/or tc are not computed, use implicit definition
+ if t==0
+ t = parametrize(px, py, 'norm');
+ end
+
+ % if tc not defined, compute curvature for all points
+ if tc==0
+ tc = t;
+ else
+ % else convert from indices to parametrization values
+ tc = t(tc);
+ end
+
+
+ % =================================================================
+ % compute curvature for each point of the curve
+
+ if strcmp(method, 'polynom')
+ % compute coefficients of interpolation functions
+ x0 = polyfit(t, px, degree);
+ y0 = polyfit(t, py, degree);
+
+ % compute coefficients of first and second derivatives. In the case of a
+ % polynom, it is possible to compute coefficient of derivative by
+ % multiplying with a matrix.
+ derive = diag(degree:-1:0);
+ xp = circshift(x0*derive, [0 1]);
+ yp = circshift(y0*derive, [0 1]);
+ xs = circshift(xp*derive, [0 1]);
+ ys = circshift(yp*derive, [0 1]);
+
+ % compute values of first and second derivatives for needed points
+ xprime = polyval(xp, tc);
+ yprime = polyval(yp, tc);
+ xsec = polyval(xs, tc);
+ ysec = polyval(ys, tc);
+
+ % compute value of curvature
+ kappa = (xprime.*ysec - xsec.*yprime)./ ...
+ power(xprime.*xprime + yprime.*yprime, 3/2);
+
+ if nargout > 1
+ varargout{1} = [polyval(x0,tc(:)) polyval(y0,tc(:))];
+ if nargout > 2
+ varargout{2} = tc;
+ end
+ end
+ else
+ error('unknown method');
+ end
+
+endfunction
Added: trunk/octave-forge/main/geometry/inst/polygons2d/parametrize.m
===================================================================
--- trunk/octave-forge/main/geometry/inst/polygons2d/parametrize.m (rev 0)
+++ trunk/octave-forge/main/geometry/inst/polygons2d/parametrize.m 2012-04-16 10:01:07 UTC (rev 10242)
@@ -0,0 +1,96 @@
+%% Copyright (C) 2003-2011 David Legland <dav...@gr...>
+%% Copyright (C) 2012 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%% All rights reserved.
+%%
+%% Redistribution and use in source and binary forms, with or without
+%% modification, are permitted provided that the following conditions are met:
+%%
+%% 1 Redistributions of source code must retain the above copyright notice,
+%% this list of conditions and the following disclaimer.
+%% 2 Redistributions in binary form must reproduce the above copyright
+%% notice, this list of conditions and the following disclaimer in the
+%% documentation and/or other materials provided with the distribution.
+%%
+%% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ''AS IS''
+%% AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+%% IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+%% ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
+%% ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+%% DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+%% SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+%% CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+%% OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+%% OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+%%
+%% The views and conclusions contained in the software and documentation are
+%% those of the authors and should not be interpreted as representing official
+%% policies, either expressed or implied, of the copyright holders.
+
+%% -*- texinfo -*-
+%% @deftypefn {Function File} {@var{par} = } parametrize (@var{poly})
+%% @deftypefnx {Function File} {@var{par} = } parametrize (@var{px},@var{py})
+%% @deftypefnx {Function File} {@var{par} = } parametrize (@dots{},@var{normalize})
+%%
+%% Parametrization of a curve, based on edges length
+%%
+%% Returns a parametrization of the curve defined by the serie of points,
+%% based on euclidean distance between two consecutive points.
+%% POLY is a N-by-2 array, representing coordinates of vertices. The
+%% result PAR is N-by-1, and contains the cumulative length of edges until
+%% corresponding vertex. The function also accepts the polygon as two inputs
+%% @var{px} and @var{py} representinx coordinates x and y respectively.
+%% When optional argument @var{normalize} is non-empty @var{par} is rescaled
+%% such that the last element equals 1, i.e. @code{@var{par}(end)==1}.
+%%
+%% Example
+%% @example
+%% % Parametrize a circle approximation
+%% poly = circleToPolygon([0 0 1], 200);
+%% p = parametrize(poly);
+%% p(end)
+%% ans =
+%% 6.2829
+%% p = parametrize(poly,'norm');
+%% p(end)
+%% ans =
+%% 1
+%% p = parametrize(poly,true);
+%% p(end)
+%% ans =
+%% 1
+%% @end example
+%%
+%% @seealso{polygons2d, polylineLength}
+%% @end deftypefn
+function par = parametrize(varargin)
+ %% Process inputs
+
+ % extract vertex coordinates
+ if size(varargin{1}, 2) > 1
+ % vertices in a single array
+ pts = varargin{1};
+ normalize = numel(varargin) > 1;
+ elseif size(varargin{1}, 2) == 1 && numel(varargin) >= 2
+ % points as separate arrays
+ pts = [varargin{1} varargin{2}];
+ normalize = numel(varargin) > 2;
+ end
+
+ %% Parametrize polyline
+
+ % compute cumulative sum of euclidean distances between consecutive
+ % vertices, setting distance of first vertex to 0.
+ if size(pts, 2) == 2
+ % process points in 2D
+ par = [0 ; cumsum(hypot(diff(pts(:,1)), diff(pts(:,2))))];
+ else
+ % process points in arbitrary dimension
+ par = [0 ; cumsum(sqrt(sum(diff(pts).^2, 2)))];
+ end
+
+ % eventually rescale between 0 and 1
+ if normalize
+ par = par / par(end);
+ end
+
+endfunction
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
