changeset 5381:75f308189a05

[project @ 2005-06-05 13:19:20 by jwe]
author jwe
date Sun, 05 Jun 2005 13:21:41 +0000
parents 1eb29d3bed2b
children 7012c2492c12
files scripts/ChangeLog scripts/plot/sombrero.m
diffstat 2 files changed, 22 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,6 +1,6 @@
-2005-05-18  Ben Barrowes  <barrowes@alum.mit.edu>
-
-	* plot/meshgrid.m: Handles 3 input arguments.
+2005-06-02  Ben Barrowes  <barrowes@alum.mit.edu>
+
+	* plot/meshgrid.m: Handle 3 input arguments.
 
 2005-06-02  Paul Kienzle  <pkienzle@users.sf.net>
 
@@ -13,6 +13,10 @@
 
 	* plot/loglog.m: Fix set commands.
 
+2005-05-25  John W. Eaton  <jwe@octave.org>
+
+	* plot/sombrero.m: Default n to 41 if nargin == 0.
+
 2005-05-24  John W. Eaton  <jwe@octave.org>
 
 	* statistics/tests/anova.m: Use mean (y(:)) to compute total_mean.
--- a/scripts/plot/sombrero.m
+++ b/scripts/plot/sombrero.m
@@ -32,19 +32,22 @@
 
 function sombrero (n)
 
-  if (nargin != 1)
+  if (nargin == 0)
+    n = 41;
+  endif
+
+  if (nargin < 2)
+    if (n > 1)
+      x = y = linspace (-8, 8, n)';
+      [xx, yy] = meshgrid (x, y);
+      r = sqrt (xx .^ 2 + yy .^ 2) + eps;
+      z = sin (r) ./ r;
+      mesh (x, y, z);
+    else
+      error ("sombrero: number of grid lines must be greater than 1");
+    endif
+  else
     usage ("sombrero (n)");
   endif
 
-  if (n > 1)
-    x = y = linspace (-8, 8, n)';
-    [xx, yy] = meshgrid (x, y);
-    r = sqrt (xx .^ 2 + yy .^ 2) + eps;
-    z = sin (r) ./ r;
-
-    mesh (x, y, z);
-  else
-    error ("sombrero: number of grid lines must be greater than 1");
-  endif
-
 endfunction