Menu
▾
▴
[Octave-cvsupdate] SF.net SVN: octave:[8665] trunk/octave-forge/main/geometry
|
From: <jpi...@us...> - 2011-10-03 21:52:57
|
Revision: 8665
http://octave.svn.sourceforge.net/octave/?rev=8665&view=rev
Author: jpicarbajal
Date: 2011-10-03 21:52:47 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
geomtry. Full bsd header
Modified Paths:
--------------
trunk/octave-forge/main/geometry/geom2d/angle2Points.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/Contents.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angle3Points.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angleAbsDiff.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angleDiff.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angleSort.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angles2d.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/bisector.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/boxes2d.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/cartesianLine.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/centroid.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/changelog.txt
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/circleArcAsCurve.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/circleAsPolygon.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/circles2d.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/clipEdge.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/clipLine.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/clipLineRect.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/clipPoints.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/clipRay.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/crackPattern.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/crackPattern2.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/createBasisTransform.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/createCircle.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/createDirectedCircle.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/createEdge.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/createHomothecy.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/createLine.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/createLineReflection.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/createMedian.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/createRay.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/createRotation.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/createScaling.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/createTranslation.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/createVector.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/deg2rad.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/distancePointEdge.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/distancePointLine.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/distancePoints.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawArrow.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawBezierCurve.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawBox.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawCenteredEdge.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawCircle.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawCircleArc.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawEdge.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawEllipse.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawEllipseArc.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawLabels.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawLine.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawOrientedBox.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawParabola.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawPoint.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawRay.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawRect.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawRect2.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/drawShape.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/edgeAngle.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/edgeLength.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/edgePosition.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/edgeToLine.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/edges2d.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/ellipseAsPolygon.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/ellipses2d.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/enclosingCircle.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/fitAffineTransform2d.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/formatAngle.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/hexagonalGrid.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/homothecy.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/inCircle.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/inertiaEllipse.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/intersectBoxes.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/intersectCircles.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/intersectEdges.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/intersectLineCircle.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/intersectLineEdge.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/intersectLines.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/invertLine.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/isCounterClockwise.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/isLeftOriented.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/isParallel.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/isPerpendicular.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/isPointInCircle.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/isPointInEllipse.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/isPointOnCircle.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/isPointOnEdge.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/isPointOnLine.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/isPointOnRay.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/lineAngle.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/lineFit.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/linePosition.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/lineSymmetry.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/lines2d.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/medianLine.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/mergeBoxes.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/midPoint.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/minDistance.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/minDistancePoints.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/normalize.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/normalizeAngle.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/normalizeVector.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/onCircle.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/onEdge.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/onLine.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/onRay.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/orthogonalLine.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/parallelLine.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/pointOnLine.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/points2d.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/polarPoint.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/projPointOnLine.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/rad2deg.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/radicalAxis.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/randomPointInBox.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/rays2d.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/readme.txt
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/reverseEdge.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/reverseLine.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/rotateVector.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/rotation.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/scaling.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/squareGrid.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/transformEdge.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/transformLine.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/transformPoint.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/transformVector.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/transforms2d.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/translation.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/triangleGrid.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/vecnorm.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/vectorAngle.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/vectorNorm.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/vectors2d.m
Modified: trunk/octave-forge/main/geometry/geom2d/angle2Points.m
===================================================================
--- trunk/octave-forge/main/geometry/geom2d/angle2Points.m 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/geom2d/angle2Points.m 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,86 +1,109 @@
-%% Copyright (c) 2007-2011, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
-%% -*- texinfo -*-
-%% @deftypefn {Function File} {@var{alpha} =} angle2Points (@var{p1}, @var{p2})
-%% Compute horizontal angle between 2 points
-%%
-%% @var{p1} and @var{p2} are either [1x2] arrays, or [Nx2] arrays, in this case
-%% @var{alpha} is a [Nx1] array. The angle computed is the horizontal angle of
-%% the line (@var{p1},@var{p2}).
-%%
-%% Result is always given in radians, between 0 and 2*pi.
-%%
-%% @seealso{points2d, angles2d, angle3points, normalizeAngle, vectorAngle}
-%%
-%% @end deftypefn
-
-function theta = angle2Points(varargin)
-
- % process input arguments
- if length(varargin)==2
- p1 = varargin{1};
- p2 = varargin{2};
- elseif length(varargin)==1
- var = varargin{1};
- p1 = var(1,:);
- p2 = var(2,:);
- end
-
- % ensure data have correct size
- n1 = size(p1, 1);
- n2 = size(p2, 1);
- if n1~=n2 && min(n1, n2)>1
- error('angle2Points: wrong size for inputs');
- end
-
- % angle of line (P2 P1), between 0 and 2*pi.
- dp = bsxfun(@minus, p2, p1);
- theta = mod(atan2(dp(:,2), dp(:,1)) + 2*pi, 2*pi);
-
-endfunction
-
-%!test
-%! % all points inside window, possibly touching edges
-%! p1 = [0 0];
-%! p2 = [10 0];
-%! angle_ = angle2Points (p1, p2);
-%! assert (angle_,0,1e-6);
-%! angle_ = angle2Points (p2, p1);
-%! assert (angle_,pi,1e-6);
-
-
-%!test
-%! % all points inside window, possibly touching edges
-%! p1 = [0 0];
-%! p2 = [0 10];
-%! angle_ = angle2Points (p1, p2);
-%! assert (pi/2, angle_,1e-6);
-%! angle_ = angle2Points (p2, p1);
-%! assert (3*pi/2, angle_,1e-6);
-
-%!test
-%! % all points inside window, possibly touching edges
-%! p1 = [0 0;0 0;0 0;0 0];
-%! p2 = [10 0;10 10;0 10;-10 10];
-%! angle_ = angle2Points (p1, p2);
-%! assert (size (p1, 1), size (angle_, 1));
-%! res = [0;pi/4;pi/2;3*pi/4];
-%! assert (res, angle_, 1e-6);
-
-%!test
-%! % all points inside window, possibly touching edges
-%! p1 = [0 0];
-%! p2 = [10 0;10 10;0 10;-10 10];
-%! angle_ = angle2Points (p1, p2);
-%! assert(size (p2, 1), size (angle_, 1));
-%! res = [0;pi/4;pi/2;3*pi/4];
-%! assert(res, angle_,1e-6);
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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{alpha} =} angle2Points (@var{p1}, @var{p2})
+%% Compute horizontal angle between 2 points
+%%
+%% @var{p1} and @var{p2} are either [1x2] arrays, or [Nx2] arrays, in this case
+%% @var{alpha} is a [Nx1] array. The angle computed is the horizontal angle of
+%% the line (@var{p1},@var{p2}).
+%%
+%% Result is always given in radians, between 0 and 2*pi.
+%%
+%% @seealso{points2d, angles2d, angle3points, normalizeAngle, vectorAngle}
+%%
+%% @end deftypefn
+
+function theta = angle2Points(varargin)
+
+ % process input arguments
+ if length(varargin)==2
+ p1 = varargin{1};
+ p2 = varargin{2};
+ elseif length(varargin)==1
+ var = varargin{1};
+ p1 = var(1,:);
+ p2 = var(2,:);
+ end
+
+ % ensure data have correct size
+ n1 = size(p1, 1);
+ n2 = size(p2, 1);
+ if n1~=n2 && min(n1, n2)>1
+ error('angle2Points: wrong size for inputs');
+ end
+
+ % angle of line (P2 P1), between 0 and 2*pi.
+ dp = bsxfun(@minus, p2, p1);
+ theta = mod(atan2(dp(:,2), dp(:,1)) + 2*pi, 2*pi);
+
+endfunction
+
+%!test
+%! % all points inside window, possibly touching edges
+%! p1 = [0 0];
+%! p2 = [10 0];
+%! angle_ = angle2Points (p1, p2);
+%! assert (angle_,0,1e-6);
+%! angle_ = angle2Points (p2, p1);
+%! assert (angle_,pi,1e-6);
+
+
+%!test
+%! % all points inside window, possibly touching edges
+%! p1 = [0 0];
+%! p2 = [0 10];
+%! angle_ = angle2Points (p1, p2);
+%! assert (pi/2, angle_,1e-6);
+%! angle_ = angle2Points (p2, p1);
+%! assert (3*pi/2, angle_,1e-6);
+
+%!test
+%! % all points inside window, possibly touching edges
+%! p1 = [0 0;0 0;0 0;0 0];
+%! p2 = [10 0;10 10;0 10;-10 10];
+%! angle_ = angle2Points (p1, p2);
+%! assert (size (p1, 1), size (angle_, 1));
+%! res = [0;pi/4;pi/2;3*pi/4];
+%! assert (res, angle_, 1e-6);
+
+%!test
+%! % all points inside window, possibly touching edges
+%! p1 = [0 0];
+%! p2 = [10 0;10 10;0 10;-10 10];
+%! angle_ = angle2Points (p1, p2);
+%! assert(size (p2, 1), size (angle_, 1));
+%! res = [0;pi/4;pi/2;3*pi/4];
+%! assert(res, angle_,1e-6);
+
Modified: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/Contents.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/Contents.m 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/Contents.m 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,13 +1,37 @@
-%% Copyright (c) 2010, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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.
+
+
% GEOM2D Geometry 2D Toolbox
% Version 1.0 21-Mar-2011 .
%
Modified: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angle3Points.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angle3Points.m 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angle3Points.m 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,13 +1,37 @@
-%% Copyright (c) 2010, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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 theta = angle3Points(varargin)
%ANGLE3POINTS Compute oriented angle made by 3 points
%
Modified: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angleAbsDiff.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angleAbsDiff.m 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angleAbsDiff.m 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,13 +1,37 @@
-%% Copyright (c) 2010, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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 dif = angleAbsDiff(angle1, angle2)
%ANGLEABSDIFF Absolute difference between two angles
%
Modified: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angleDiff.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angleDiff.m 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angleDiff.m 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,13 +1,37 @@
-%% Copyright (c) 2010, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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 dif = angleDiff(angle1, angle2)
%ANGLEDIFF Difference between two angles
%
Modified: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angleSort.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angleSort.m 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angleSort.m 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,13 +1,37 @@
-%% Copyright (c) 2010, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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 varargout = angleSort(pts, varargin)
%ANGLESORT Sort points in the plane according to their angle to origin
%
Modified: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angles2d.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angles2d.m 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/angles2d.m 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,13 +1,37 @@
-%% Copyright (c) 2010, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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 angles2d
%ANGLES2D Description of functions for manipulating angles
%
Modified: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/bisector.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/bisector.m 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/bisector.m 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,13 +1,37 @@
-%% Copyright (c) 2010, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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 ray = bisector(varargin)
%BISECTOR Return the bisector of two lines, or 3 points
%
Modified: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/boxes2d.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/boxes2d.m 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/boxes2d.m 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,13 +1,37 @@
-%% Copyright (c) 2010, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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 boxes2d(varargin)
%BOXES2D Description of functions operating on bounding boxes
%
Modified: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/cartesianLine.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/cartesianLine.m 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/cartesianLine.m 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,13 +1,37 @@
-%% Copyright (c) 2010, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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 = cartesianLine(varargin)
%CARTESIANLINE Create a straight line from cartesian equation coefficients
%
Modified: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/centroid.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/centroid.m 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/centroid.m 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,13 +1,37 @@
-%% Copyright (c) 2010, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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 center = centroid(varargin)
%CENTROID Compute centroid (center of mass) of a set of points
%
Modified: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/changelog.txt
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/changelog.txt 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/changelog.txt 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,13 +1,37 @@
-%% Copyright (c) 2010, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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.
+
+
change log for geom2d
geom2d, release 2011.??.??
Modified: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/circleArcAsCurve.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/circleArcAsCurve.m 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/circleArcAsCurve.m 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,13 +1,37 @@
-%% Copyright (c) 2010, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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 varargout = circleArcAsCurve(arc, N)
%CIRCLEARCASCURVE Convert a circle arc into a series of points
%
Modified: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/circleAsPolygon.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/circleAsPolygon.m 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/circleAsPolygon.m 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,13 +1,37 @@
-%% Copyright (c) 2010, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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 varargout = circleAsPolygon(circle, varargin)
%CIRCLEASPOLYGON Convert a circle into a series of points
%
Modified: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/circles2d.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/circles2d.m 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/circles2d.m 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,13 +1,37 @@
-%% Copyright (c) 2010, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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 circles2d(varargin)
%CIRCLES2D Description of functions operating on circles
%
Modified: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/clipEdge.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/clipEdge.m 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/clipEdge.m 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,13 +1,37 @@
-%% Copyright (c) 2010, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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 edge2 = clipEdge(edge, box)
%CLIPEDGE Clip an edge with a rectangular box
%
Modified: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/clipLine.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/clipLine.m 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/clipLine.m 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,13 +1,37 @@
-%% Copyright (c) 2010, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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 edge = clipLine(line, box, varargin)
%CLIPLINE Clip a line with a box
%
Modified: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/clipLineRect.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/clipLineRect.m 2011-10-03 21:03:42 UTC (rev 8664)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/clipLineRect.m 2011-10-03 21:52:47 UTC (rev 8665)
@@ -1,13 +1,37 @@
-%% Copyright (c) 2010, David Legland <dav...@gr...>
-%%
-%% All rights reserved.
-%%
-%% This program is free software; you can redistribute it and/or modify
-%% it under the terms of the BSD License. For details see the COPYING
-%% file included as part of this distribution.
-
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-
+%% Copyright (c) 2011, INRA
+%% 2007-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% 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 ...
[truncated message content] |
