changeset 10057:e7e752b1deee octave-forge

geometry: porting new functions to polygon2d
author jpicarbajal
date Mon, 16 Apr 2012 10:17:46 +0000
parents cb526bb31d1d
children 593d09df0e31
files main/geometry/NEWS main/geometry/inst/polygons2d/reversePolygon.m main/geometry/inst/polygons2d/reversePolyline.m main/geometry/inst/polygons2d/supportFunction.m
diffstat 4 files changed, 178 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/main/geometry/NEWS	Mon Apr 16 10:01:07 2012 +0000
+++ b/main/geometry/NEWS	Mon Apr 16 10:17:46 2012 +0000
@@ -6,10 +6,23 @@
 
 * Added functions:
  - curveval.m: Evaluates a polynomial curve defined as a 2-by-N matrix.
+
  - curve2polyline.m: Converts a polynomial curve into a polyline by the adaptive
                      sampling method.
+
  - simplifypolyline.m:  Ramer-Douglas-Peucker algorithm to simplify polylines.
 
+ - parametrize.m: Estimate a parametrization of a polygon/line based on the distance
+                 between the points.
+
+ - curvature.m: Estimation of the curvature of a polygon/line based on polynomial
+                approximation.
+
+ - reversePolygon.m and reversePolyline.m: reverse the orders of the points in
+                                           of polygon/line.
+
+ - supportfunction.m: Compute support function of a polygon.
+
 * Changed functions:
  - distancePointEdge.m: Now the function computes the distance between all points
                         and all edges. A third optional argument provides
@@ -19,7 +32,7 @@
  - 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
 ===============================================================================
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main/geometry/inst/polygons2d/reversePolygon.m	Mon Apr 16 10:17:46 2012 +0000
@@ -0,0 +1,44 @@
+%% Copyright (C) 2003-2011 David Legland <david.legland@grignon.inra.fr>
+%% Copyright (C) 2012 Adapted to Octave by Juan Pablo Carbajal <carbajal@ifi.uzh.ch>
+%% 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{poly2} = } reversePolygon (@var{poly})
+%% Reverse a polygon, by iterating vertices from the end
+%%
+%%   POLY2 = reversePolygon(POLY)
+%%   POLY2 has same vertices as POLY, but in different order. The first
+%%   vertex of the polygon is still the same.
+%%
+%% @seealso{reversePolyline}
+%% @end deftypefn
+
+function rev = reversePolygon(poly)
+
+  rev = poly([1 end:-1:2], :);
+
+endfunction
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main/geometry/inst/polygons2d/reversePolyline.m	Mon Apr 16 10:17:46 2012 +0000
@@ -0,0 +1,43 @@
+%% Copyright (C) 2003-2011 David Legland <david.legland@grignon.inra.fr>
+%% Copyright (C) 2012 Adapted to Octave by Juan Pablo Carbajal <carbajal@ifi.uzh.ch>
+%% 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{poly2} = } reversePolyline (@var{poly})
+%% Reverse a polyline, by iterating vertices from the end
+%%
+%%   POLY2 = reversePolyline(POLY)
+%%   POLY2 has same vertices as POLY, but POLY2(i,:) is the same as
+%%   POLY(END-i+1,:).
+%%
+%% @seealso{reversePolygon}
+%% @end deftypefn
+function rev = reversePolyline(poly)
+
+  rev = poly(end:-1:1, :);
+
+endfunction
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main/geometry/inst/polygons2d/supportFunction.m	Mon Apr 16 10:17:46 2012 +0000
@@ -0,0 +1,77 @@
+%% Copyright (C) 2003-2011 David Legland <david.legland@grignon.inra.fr>
+%% Copyright (C) 2012 Adapted to Octave by Juan Pablo Carbajal <carbajal@ifi.uzh.ch>
+%% 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{h} = } suppportFunction (@var{polygon})
+%% @deftypefnx {Function File} {@var{h} = } suppportFunction (@var{polygon}, @var{n})
+%% @deftypefnx {Function File} {@var{h} = } suppportFunction (@var{polygon}, @var{v})
+%% Compute support function of a polygon
+%%
+%%   H = supportFunction(POLYGON, N)
+%%   uses N points for suport function approximation
+%%
+%%   H = supportFunction(POLYGON)
+%%   assume 24 points for approximation
+%%
+%%   H = supportFunction(POLYGON, V)
+%%   where V is a vector, uses vector V of angles to compute support
+%%   function.
+%%
+%% @seealso{convexification}
+%% @end deftypefn
+
+function h = supportFunction(polygon, varargin)
+  N = 24;
+  u = 0:2*pi/N:2*pi*(1-1/N);
+
+  if length(varargin)==1
+      var = varargin{1};
+      if length(var)==1
+          N = var;
+          u = 0:2*pi/N:2*pi*(1-1/N);
+      else
+          u = var;
+      end
+  end
+
+  % ensure u vertical vector
+  if size(u, 1)==1
+      u=u';
+  end
+
+
+  h = zeros(size(u));
+
+  for i=1:length(u)
+
+      v = repmat([cos(u(i)) sin(u(i))], [size(polygon, 1), 1]);
+
+      h(i) = max(dot(polygon, v, 2));
+  end
+
+endfunction