Diff of /inst/geom2d/angle2Points.m [347d75] .. [fc6c4c]  Maximize  Restore

Switch to side-by-side view

--- a/inst/geom2d/angle2Points.m
+++ b/inst/geom2d/angle2Points.m
@@ -22,80 +22,80 @@
 ## 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.
-
-## -*- 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);
-
-
+
+## -*- 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);
+
+

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:

JavaScript is required for this form.





No, thanks