annotate scripts/plot/hist.m @ 11424:bc509d5f763f

text.m: New demo for 3D plot and text with verticalalignment.
author Ben Abbott <bpabbott@mac.com>
date Wed, 29 Dec 2010 17:29:36 -0500
parents bff585d759cf
children fd0a3ac60b0e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7017
a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe]
jwe
parents: 7016
diff changeset
1 ## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003,
8920
eb63fbe60fab update copyright notices
John W. Eaton <jwe@octave.org>
parents: 8507
diff changeset
2 ## 2004, 2005, 2006, 2007, 2008, 2009 John W. Eaton
2313
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe]
jwe
parents: 2311
diff changeset
3 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe]
jwe
parents: 2311
diff changeset
4 ## This file is part of Octave.
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe]
jwe
parents: 2311
diff changeset
5 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe]
jwe
parents: 2311
diff changeset
6 ## Octave is free software; you can redistribute it and/or modify it
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe]
jwe
parents: 2311
diff changeset
7 ## under the terms of the GNU General Public License as published by
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6586
diff changeset
8 ## the Free Software Foundation; either version 3 of the License, or (at
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6586
diff changeset
9 ## your option) any later version.
2313
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe]
jwe
parents: 2311
diff changeset
10 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe]
jwe
parents: 2311
diff changeset
11 ## Octave is distributed in the hope that it will be useful, but
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe]
jwe
parents: 2311
diff changeset
12 ## WITHOUT ANY WARRANTY; without even the implied warranty of
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe]
jwe
parents: 2311
diff changeset
13 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe]
jwe
parents: 2311
diff changeset
14 ## General Public License for more details.
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe]
jwe
parents: 2311
diff changeset
15 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe]
jwe
parents: 2311
diff changeset
16 ## You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6586
diff changeset
17 ## along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6586
diff changeset
18 ## <http://www.gnu.org/licenses/>.
724
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
19
3368
a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe]
jwe
parents: 3175
diff changeset
20 ## -*- texinfo -*-
11351
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
21 ## @deftypefn {Function File} {} hist (@var{y})
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
22 ## @deftypefnx {Function File} {} hist (@var{y}, @var{x})
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
23 ## @deftypefnx {Function File} {} hist (@var{y}, @var{nbins})
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
24 ## @deftypefnx {Function File} {} hist (@var{y}, @var{x}, @var{norm})
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
25 ## @deftypefnx {Function File} {[@var{nn}, @var{xx}] =} hist (@dots{})
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
26 ## @deftypefnx {Function File} {[@dots{}] =} hist (@dots{}, @var{prop}, @var{val})
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
27 ##
2311
2b5788792cad [project @ 1996-07-11 20:18:38 by jwe]
jwe
parents: 2303
diff changeset
28 ## Produce histogram counts or plots.
3426
f8dde1807dee [project @ 2000-01-13 08:40:00 by jwe]
jwe
parents: 3407
diff changeset
29 ##
11351
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
30 ## With one vector input argument, @var{y}, plot a histogram of the values
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
31 ## with 10 bins. The range of the histogram bins is determined by the
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
32 ## range of the data. With one matrix input argument, @var{y}, plot a
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
33 ## histogram where each bin contains a bar per input column.
3426
f8dde1807dee [project @ 2000-01-13 08:40:00 by jwe]
jwe
parents: 3407
diff changeset
34 ##
11351
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
35 ## Given a second vector argument, @var{x}, use that as the centers of
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
36 ## the bins, with the width of the bins determined from the adjacent
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
37 ## values in the vector.
3426
f8dde1807dee [project @ 2000-01-13 08:40:00 by jwe]
jwe
parents: 3407
diff changeset
38 ##
11351
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
39 ## If scaler, the second argument, @var{nbins}, defines the number of bins.
3426
f8dde1807dee [project @ 2000-01-13 08:40:00 by jwe]
jwe
parents: 3407
diff changeset
40 ##
9040
dbd0c77e575e Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents: 8920
diff changeset
41 ## If third argument is provided, the histogram is normalized such that
3597
26662775f4e9 [project @ 2000-02-12 02:24:41 by jwe]
jwe
parents: 3426
diff changeset
42 ## the sum of the bars is equal to @var{norm}.
26662775f4e9 [project @ 2000-02-12 02:24:41 by jwe]
jwe
parents: 3426
diff changeset
43 ##
2311
2b5788792cad [project @ 1996-07-11 20:18:38 by jwe]
jwe
parents: 2303
diff changeset
44 ## Extreme values are lumped in the first and last bins.
3426
f8dde1807dee [project @ 2000-01-13 08:40:00 by jwe]
jwe
parents: 3407
diff changeset
45 ##
3368
a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe]
jwe
parents: 3175
diff changeset
46 ## With two output arguments, produce the values @var{nn} and @var{xx} such
a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe]
jwe
parents: 3175
diff changeset
47 ## that @code{bar (@var{xx}, @var{nn})} will plot the histogram.
11351
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
48 ##
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
49 ## The histogram's appearance may be modified by specifying property/value
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
50 ## pairs, @var{prop} and @var{val} pairs. For example the face and edge
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
51 ## color may be modified.
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
52 ##
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
53 ## @example
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
54 ## @group
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
55 ## hist (randn (1, 100), 25, "facecolor", "r", "edgecolor", "b")
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
56 ## @end group
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
57 ## @end example
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
58 ##
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
59 ## @noindent
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
60 ## The histograms colors also depend upon the colormap.
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
61 ##
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
62 ## @example
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
63 ## @group
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
64 ## hist (rand (10, 3))
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
65 ## colormap (summer ())
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
66 ## @end group
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
67 ## @end example
bff585d759cf improved the help text in hist.m
Doug Stewart <doug.dastew@gmail.com>
parents: 10549
diff changeset
68 ##
5642
2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe]
jwe
parents: 5584
diff changeset
69 ## @seealso{bar}
3368
a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe]
jwe
parents: 3175
diff changeset
70 ## @end deftypefn
724
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
71
2314
949ab8eba8bc [project @ 1996-07-12 03:58:02 by jwe]
jwe
parents: 2313
diff changeset
72 ## Author: jwe
949ab8eba8bc [project @ 1996-07-12 03:58:02 by jwe]
jwe
parents: 2313
diff changeset
73
7112
f90a8188c9c2 [project @ 2007-11-07 00:24:11 by dbateman]
dbateman
parents: 7017
diff changeset
74 function [nn, xx] = hist (y, varargin)
724
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
75
7112
f90a8188c9c2 [project @ 2007-11-07 00:24:11 by dbateman]
dbateman
parents: 7017
diff changeset
76 if (nargin < 1)
6046
34f96dd5441b [project @ 2006-10-10 16:10:25 by jwe]
jwe
parents: 5746
diff changeset
77 print_usage ();
724
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
78 endif
2325
b5568c31ee2c [project @ 1996-07-15 22:20:21 by jwe]
jwe
parents: 2314
diff changeset
79
5443
ec8c33dcd1bf [project @ 2005-09-08 01:40:57 by jwe]
jwe
parents: 5307
diff changeset
80 arg_is_vector = isvector (y);
5065
1312d3af9eb0 [project @ 2004-11-04 20:12:00 by jwe]
jwe
parents: 5053
diff changeset
81
1312d3af9eb0 [project @ 2004-11-04 20:12:00 by jwe]
jwe
parents: 5053
diff changeset
82 if (rows (y) == 1)
4880
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
83 y = y(:);
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
84 endif
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
85
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
86 if (isreal (y))
7112
f90a8188c9c2 [project @ 2007-11-07 00:24:11 by dbateman]
dbateman
parents: 7017
diff changeset
87 max_val = max (y(:));
f90a8188c9c2 [project @ 2007-11-07 00:24:11 by dbateman]
dbateman
parents: 7017
diff changeset
88 min_val = min (y(:));
724
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
89 else
8427
26b899d309f6 help and error string corrected in hist.m.
Francesco Potortì <pot@gnu.org>
parents: 7566
diff changeset
90 error ("hist: first argument must be real valued");
724
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
91 endif
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
92
7112
f90a8188c9c2 [project @ 2007-11-07 00:24:11 by dbateman]
dbateman
parents: 7017
diff changeset
93 iarg = 1;
f90a8188c9c2 [project @ 2007-11-07 00:24:11 by dbateman]
dbateman
parents: 7017
diff changeset
94 if (nargin == 1 || ischar (varargin{iarg}))
724
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
95 n = 10;
4880
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
96 x = [0.5:n]'/n;
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
97 x = x * (max_val - min_val) + ones(size(x)) * min_val;
3597
26662775f4e9 [project @ 2000-02-12 02:24:41 by jwe]
jwe
parents: 3426
diff changeset
98 else
26662775f4e9 [project @ 2000-02-12 02:24:41 by jwe]
jwe
parents: 3426
diff changeset
99 ## nargin is either 2 or 3
7208
a730e47fda4d [project @ 2007-11-28 02:32:41 by jwe]
jwe
parents: 7191
diff changeset
100 x = varargin{iarg++};
4030
22bd65326ec1 [project @ 2002-08-09 18:58:13 by jwe]
jwe
parents: 3690
diff changeset
101 if (isscalar (x))
724
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
102 n = x;
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
103 if (n <= 0)
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
104 error ("hist: number of bins must be positive");
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
105 endif
4880
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
106 x = [0.5:n]'/n;
7191
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
107 x = x * (max_val - min_val) + ones (size (x)) * min_val;
4880
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
108 elseif (isreal (x))
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
109 if (isvector (x))
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 9040
diff changeset
110 x = x(:);
4880
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
111 endif
724
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
112 tmp = sort (x);
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
113 if (any (tmp != x))
904
3470f1e25a79 [project @ 1994-11-09 21:22:15 by jwe]
jwe
parents: 736
diff changeset
114 warning ("hist: bin values not sorted on input");
724
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
115 x = tmp;
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
116 endif
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
117 else
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
118 error ("hist: second argument must be a scalar or a vector");
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
119 endif
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
120 endif
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
121
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents: 7112
diff changeset
122 ## Avoid issues with integer types for x and y
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents: 7112
diff changeset
123 x = double (x);
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents: 7112
diff changeset
124 y = double (y);
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents: 7112
diff changeset
125
4880
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
126 cutoff = (x(1:end-1,:) + x(2:end,:)) / 2;
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
127 n = rows (x);
7566
b3acdf1c41a5 hist: avoid temps; allow matrix args when number of bins > 30
John W. Eaton <jwe@octave.org>
parents: 7208
diff changeset
128 y_nc = columns (y);
4880
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
129 if (n < 30 && columns (x) == 1)
4407
16e8acbd19d5 [project @ 2003-05-05 19:00:56 by jwe]
jwe
parents: 4030
diff changeset
130 ## The following algorithm works fastest for n less than about 30.
7566
b3acdf1c41a5 hist: avoid temps; allow matrix args when number of bins > 30
John W. Eaton <jwe@octave.org>
parents: 7208
diff changeset
131 chist = zeros (n+1, y_nc);
4407
16e8acbd19d5 [project @ 2003-05-05 19:00:56 by jwe]
jwe
parents: 4030
diff changeset
132 for i = 1:n-1
4880
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
133 chist(i+1,:) = sum (y <= cutoff(i));
4407
16e8acbd19d5 [project @ 2003-05-05 19:00:56 by jwe]
jwe
parents: 4030
diff changeset
134 endfor
5746
e4e93452fd3e [project @ 2006-04-06 20:46:31 by jwe]
jwe
parents: 5642
diff changeset
135 chist(n+1,:) = sum (! isnan (y));
4407
16e8acbd19d5 [project @ 2003-05-05 19:00:56 by jwe]
jwe
parents: 4030
diff changeset
136 else
16e8acbd19d5 [project @ 2003-05-05 19:00:56 by jwe]
jwe
parents: 4030
diff changeset
137 ## The following algorithm works fastest for n greater than about 30.
16e8acbd19d5 [project @ 2003-05-05 19:00:56 by jwe]
jwe
parents: 4030
diff changeset
138 ## Put cutoff elements between boundaries, integrate over all
16e8acbd19d5 [project @ 2003-05-05 19:00:56 by jwe]
jwe
parents: 4030
diff changeset
139 ## elements, keep totals at boundaries.
7566
b3acdf1c41a5 hist: avoid temps; allow matrix args when number of bins > 30
John W. Eaton <jwe@octave.org>
parents: 7208
diff changeset
140 [s, idx] = sort ([y; repmat(cutoff, 1, y_nc)]);
4880
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
141 len = rows (y);
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
142 chist = cumsum (idx <= len);
7566
b3acdf1c41a5 hist: avoid temps; allow matrix args when number of bins > 30
John W. Eaton <jwe@octave.org>
parents: 7208
diff changeset
143 chist = [(zeros (1, y_nc));
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 9040
diff changeset
144 (reshape (chist(idx > len), rows (cutoff), y_nc));
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 9040
diff changeset
145 (chist(end,:) - sum (isnan (y)))];
4407
16e8acbd19d5 [project @ 2003-05-05 19:00:56 by jwe]
jwe
parents: 4030
diff changeset
146 endif
16e8acbd19d5 [project @ 2003-05-05 19:00:56 by jwe]
jwe
parents: 4030
diff changeset
147
4880
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
148 freq = diff (chist);
724
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
149
7191
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
150 if (nargin > 2 && ! ischar (varargin{iarg}))
3597
26662775f4e9 [project @ 2000-02-12 02:24:41 by jwe]
jwe
parents: 3426
diff changeset
151 ## Normalise the histogram.
7112
f90a8188c9c2 [project @ 2007-11-07 00:24:11 by dbateman]
dbateman
parents: 7017
diff changeset
152 norm = varargin{iarg++};
4880
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
153 freq = freq / rows (y) * norm;
3597
26662775f4e9 [project @ 2000-02-12 02:24:41 by jwe]
jwe
parents: 3426
diff changeset
154 endif
26662775f4e9 [project @ 2000-02-12 02:24:41 by jwe]
jwe
parents: 3426
diff changeset
155
6586
e4ea529efab0 [project @ 2007-04-26 19:09:26 by dbateman]
dbateman
parents: 6582
diff changeset
156 if (nargout > 0)
5065
1312d3af9eb0 [project @ 2004-11-04 20:12:00 by jwe]
jwe
parents: 5053
diff changeset
157 if (arg_is_vector)
4880
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
158 nn = freq';
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
159 xx = x';
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
160 else
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
161 nn = freq;
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
162 xx = x;
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
163 endif
7112
f90a8188c9c2 [project @ 2007-11-07 00:24:11 by dbateman]
dbateman
parents: 7017
diff changeset
164 elseif (size (freq, 2) != 1)
f90a8188c9c2 [project @ 2007-11-07 00:24:11 by dbateman]
dbateman
parents: 7017
diff changeset
165 bar (x, freq, 0.8, varargin{iarg:end});
736
c8f88bd3202b [project @ 1994-09-24 03:28:05 by jwe]
jwe
parents: 724
diff changeset
166 else
7112
f90a8188c9c2 [project @ 2007-11-07 00:24:11 by dbateman]
dbateman
parents: 7017
diff changeset
167 bar (x, freq, 1.0, varargin{iarg:end});
724
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
168 endif
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
169
86d73993eee2 [project @ 1994-09-21 19:42:34 by jwe]
jwe
parents:
diff changeset
170 endfunction
4811
198f3712c692 [project @ 2004-03-03 19:24:33 by jwe]
jwe
parents: 4430
diff changeset
171
198f3712c692 [project @ 2004-03-03 19:24:33 by jwe]
jwe
parents: 4430
diff changeset
172 %!test
4880
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
173 %! [nn,xx]=hist([1:4],3);
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
174 %! assert(xx, [1.5,2.5,3.5]);
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
175 %! assert(nn, [2,1,1]);
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
176 %!test
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
177 %! [nn,xx]=hist([1:4]',3);
5584
3d9ddfdc6d3e [project @ 2005-12-15 01:29:34 by jwe]
jwe
parents: 5443
diff changeset
178 %! assert(xx, [1.5,2.5,3.5]);
3d9ddfdc6d3e [project @ 2005-12-15 01:29:34 by jwe]
jwe
parents: 5443
diff changeset
179 %! assert(nn, [2,1,1]);
4880
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
180 %!test
5746
e4e93452fd3e [project @ 2006-04-06 20:46:31 by jwe]
jwe
parents: 5642
diff changeset
181 %! [nn,xx]=hist([1 1 1 NaN NaN NaN 2 2 3],[1 2 3]);
e4e93452fd3e [project @ 2006-04-06 20:46:31 by jwe]
jwe
parents: 5642
diff changeset
182 %! assert(xx, [1,2,3]);
e4e93452fd3e [project @ 2006-04-06 20:46:31 by jwe]
jwe
parents: 5642
diff changeset
183 %! assert(nn, [3,2,1]);
e4e93452fd3e [project @ 2006-04-06 20:46:31 by jwe]
jwe
parents: 5642
diff changeset
184 %!test
4880
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
185 %! [nn,xx]=hist([[1:4]',[1:4]'],3);
7112
f90a8188c9c2 [project @ 2007-11-07 00:24:11 by dbateman]
dbateman
parents: 7017
diff changeset
186 %! assert(xx, [1.5;2.5;3.5]);
4880
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
187 %! assert(nn, [[2,1,1]',[2,1,1]']);
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
188 %!assert(hist(1,1),1);
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
189 %!test
b9662e2ceb6b [project @ 2004-04-23 16:13:49 by jwe]
jwe
parents: 4873
diff changeset
190 %! for n = [10, 30, 100, 1000]
8507
cadc73247d65 style fixes
John W. Eaton <jwe@octave.org>
parents: 8427
diff changeset
191 %! assert(sum(hist([1:n], n)), n);
cadc73247d65 style fixes
John W. Eaton <jwe@octave.org>
parents: 8427
diff changeset
192 %! assert(sum(hist([1:n], [2:n-1])), n);
cadc73247d65 style fixes
John W. Eaton <jwe@octave.org>
parents: 8427
diff changeset
193 %! assert(sum(hist([1:n], [1:n])), n);
cadc73247d65 style fixes
John W. Eaton <jwe@octave.org>
parents: 8427
diff changeset
194 %! assert(sum(hist([1:n], 29)), n);
cadc73247d65 style fixes
John W. Eaton <jwe@octave.org>
parents: 8427
diff changeset
195 %! assert(sum(hist([1:n], 30)), n);
4811
198f3712c692 [project @ 2004-03-03 19:24:33 by jwe]
jwe
parents: 4430
diff changeset
196 %! endfor
7566
b3acdf1c41a5 hist: avoid temps; allow matrix args when number of bins > 30
John W. Eaton <jwe@octave.org>
parents: 7208
diff changeset
197 %!test
b3acdf1c41a5 hist: avoid temps; allow matrix args when number of bins > 30
John W. Eaton <jwe@octave.org>
parents: 7208
diff changeset
198 %! assert (size (hist(randn(750,240), 200)), [200,240]);