Mercurial > forge

changeset 8637:136af6d81666 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
geometry. All create* functions
author jpicarbajal
date Fri, 21 Oct 2011 18:51:49 +0000
parents 9efa95ad18cf
children 4fc1ed468c8a
files main/geometry/doc/NEWS main/geometry/geom2d/inst/createVector.m main/geometry/matGeom_raw/geom2d/createMedian.m main/geometry/matGeom_raw/geom2d/createVector.m
diffstat 4 files changed, 55 insertions(+), 154 deletions(-) [+]
line wrap: on
line diff
--- a/main/geometry/doc/NEWS	Fri Oct 21 18:45:35 2011 +0000
+++ b/main/geometry/doc/NEWS	Fri Oct 21 18:51:49 2011 +0000
@@ -127,5 +127,6 @@
  drawShape.m
  circles2d.m
  ellipses2d.m
+ 
 ===============================================================================
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main/geometry/geom2d/inst/createVector.m	Fri Oct 21 18:51:49 2011 +0000
@@ -0,0 +1,54 @@
+%% Copyright (c) 2011, INRA
+%% 2010-2011, David Legland <david.legland@grignon.inra.fr>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <carbajal@ifi.uzh.ch>
+%%
+%% All rights reserved.
+%% (simplified BSD License)
+%%
+%% 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 COPYRIGHT HOLDER 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 copyright holder.
+
+%% -*- texinfo -*-
+%% @deftypefn {Function File} {@var{vect} = } createVector (@var{p1}, @var{p2})
+%% Create a vector from two points.
+%%
+%%   V12 = createVector(P1, P2)
+%%   Creates the vector V12, defined as the difference between coordinates
+%%   of points P1 and P2.
+%%   P1 and P2 are row vectors with ND elements, ND being the space
+%%   dimension.
+%%
+%%   If one of the inputs is a N-by-Nd array, the other input is
+%%   automatically repeated, and the result is N-by-Nd.
+%%
+%%   If both inputs have the same size, the result also have the same size.
+%%
+%%   @seealso{vectors2d, vectors3d, points2d}
+%% @end deftypefn
+function vect = createVector(p1, p2)
+  vect = bsxfun(@minus, p2, p1);
+endfunction
+
--- a/main/geometry/matGeom_raw/geom2d/createMedian.m	Fri Oct 21 18:45:35 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-%% Copyright (c) 2011, INRA
-%% 2007-2011, David Legland <david.legland@grignon.inra.fr>
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <carbajal@ifi.uzh.ch>
-%%
-%% All rights reserved.
-%% (simplified BSD License)
-%%
-%% 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 COPYRIGHT HOLDER 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 copyright holder.
-
-
-function line = createMedian(varargin)
-%CREATEMEDIAN create a median line
-%
-%   DEPRECATED: use medianLine instead
-%
-%   l = CREATEMEDIAN(P1, P2) create the median line of points P1 and P2, 
-%   that is the line containing all points located at equal distance of 
-%   P1 and P2.
-%
-%   l = CREATEMEDIAN(points) create the median line of 2 points, given as
-%   a 2*2 array. array has the form :
-%   [ [ x1 y1 ] ; [ x2 y2 ] ]
-%
-%   l = CREATEMEDIAN(edge) create the median of the edge. Edge is a 1*4
-%   array, containing [x0 y0] coordiantes of first point, and [dx dy],
-%   the vector from first point to second point.
-% 
-%   
-%
-%   ---------
-%
-%   author : David Legland 
-%   INRA - TPV URPOI - BIA IMASTE
-%   created the 31/10/2003.
-%
-
-% deprecation warning
-warning('geom2d:deprecated', ...
-    '''createMedian'' is deprecated, use ''medianLine'' instead');
-
-
-nargs = length(varargin);
-x0=0;
-y0=0;
-dx=0;
-dy=0;
-
-if nargs == 1
-    tab = varargin{1};
-    if size(tab, 2)==2
-        % array of two points
-        x0 = tab(1,1); y0 = tab(1,2);
-        dx = tab(2,1)-x0; dy = tab(2,2)-y0;
-    else
-        % edge equation
-        x0 = tab(1); y0 = tab(2);
-        dx = tab(3); dy = tab(4);
-    end
-elseif nargs==2
-    % two points
-    p1 = varargin{1};
-    p2 = varargin{2};
-    x0 = p1(1); y0 = p1(2);
-    dx = p2(1)-x0; dy = p2(2)-y0;
-end
-    
-        
-line = [x0+dx/2, y0+dy/2, -dy, dx];
--- a/main/geometry/matGeom_raw/geom2d/createVector.m	Fri Oct 21 18:45:35 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-%% Copyright (c) 2011, INRA
-%% 2007-2011, David Legland <david.legland@grignon.inra.fr>
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <carbajal@ifi.uzh.ch>
-%%
-%% All rights reserved.
-%% (simplified BSD License)
-%%
-%% 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 COPYRIGHT HOLDER 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 copyright holder.
-
-
-function vect = createVector(p1, p2)
-%CREATEVECTOR Create a vector from two points
-%
-%   V12 = createVector(P1, P2)
-%   Creates the vector V12, defined as the difference between coordinates
-%   of points P1 and P2.
-%   P1 and P2 are row vectors with ND elements, ND being the space
-%   dimension.
-%
-%   If one of the inputs is a N-by-Nd array, the other input is
-%   automatically repeated, and the result is N-by-Nd.
-%
-%   If both inputs have the same size, the result also have the same size.
-%
-%
-%   Example
-%
-%   See also
-%   vectors2d, vectors3d, points2d
-%
-%
-% ------
-% Author: David Legland
-% e-mail: david.legland@grignon.inra.fr
-% Created: 2010-12-07,    using Matlab 7.9.0.529 (R2009b)
-% Copyright 2010 INRA - Cepia Software Platform.
-
-vect = bsxfun(@minus, p2, p1);