Mercurial > hg > octave-lyh
annotate scripts/plot/plotmatrix.m @ 16086:f89760972bf4
plotmatrix.m: Fix bug when number of columns in 2 inputs differs (bug #38368)
* scripts/plot/plotmatrix.m (__plotmatrix__): Reverse loop bounds of inner
and outer for loops.
| author | Julien Bect <julien.bect@supelec.fr> |
|---|---|
| date | Thu, 21 Feb 2013 16:19:58 +0100 |
| parents | 5d3a684236b0 |
| children | 64e7bb01fce2 |
| rev | line source |
|---|---|
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
14092
diff
changeset
|
1 ## Copyright (C) 2008-2012 David Bateman |
| 8127 | 2 ## |
| 3 ## This file is part of Octave. | |
| 4 ## | |
| 5 ## Octave is free software; you can redistribute it and/or modify it | |
| 6 ## under the terms of the GNU General Public License as published by | |
| 7 ## the Free Software Foundation; either version 3 of the License, or (at | |
| 8 ## your option) any later version. | |
| 9 ## | |
| 10 ## Octave is distributed in the hope that it will be useful, but | |
| 11 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 ## General Public License for more details. | |
| 14 ## | |
| 15 ## You should have received a copy of the GNU General Public License | |
| 16 ## along with Octave; see the file COPYING. If not, see | |
| 17 ## <http://www.gnu.org/licenses/>. | |
| 18 | |
| 19 ## -*- texinfo -*- | |
|
10793
be55736a0783
Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents:
10549
diff
changeset
|
20 ## @deftypefn {Function File} {} plotmatrix (@var{x}, @var{y}) |
| 8127 | 21 ## @deftypefnx {Function File} {} plotmatrix (@var{x}) |
| 22 ## @deftypefnx {Function File} {} plotmatrix (@dots{}, @var{style}) | |
| 23 ## @deftypefnx {Function File} {} plotmatrix (@var{h}, @dots{}) | |
| 24 ## @deftypefnx {Function File} {[@var{h}, @var{ax}, @var{bigax}, @var{p}, @var{pax}] =} plotmatrix (@dots{}) | |
|
9040
dbd0c77e575e
Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents:
8190
diff
changeset
|
25 ## Scatter plot of the columns of one matrix against another. Given the |
| 8127 | 26 ## arguments @var{x} and @var{y}, that have a matching number of rows, |
| 27 ## @code{plotmatrix} plots a set of axes corresponding to | |
| 28 ## | |
| 29 ## @example | |
| 30 ## plot (@var{x} (:, i), @var{y} (:, j) | |
| 31 ## @end example | |
| 32 ## | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
33 ## Given a single argument @var{x}, then this is equivalent to |
| 8127 | 34 ## |
| 35 ## @example | |
| 36 ## plotmatrix (@var{x}, @var{x}) | |
| 37 ## @end example | |
| 38 ## | |
| 39 ## @noindent | |
| 40 ## except that the diagonal of the set of axes will be replaced with the | |
| 41 ## histogram @code{hist (@var{x} (:, i))}. | |
| 42 ## | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
43 ## The marker to use can be changed with the @var{style} argument, that is a |
| 8127 | 44 ## string defining a marker in the same manner as the @code{plot} |
|
9040
dbd0c77e575e
Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents:
8190
diff
changeset
|
45 ## command. If a leading axes handle @var{h} is passed to |
| 8127 | 46 ## @code{plotmatrix}, then this axis will be used for the plot. |
| 47 ## | |
| 48 ## The optional return value @var{h} provides handles to the individual | |
| 49 ## graphics objects in the scatter plots, whereas @var{ax} returns the | |
|
9040
dbd0c77e575e
Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents:
8190
diff
changeset
|
50 ## handles to the scatter plot axis objects. @var{bigax} is a hidden |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
51 ## axis object that surrounds the other axes, such that the commands |
|
9209
923c7cb7f13f
Simplify TeXinfo files by eliminating redundant @iftex followed by @tex construction.
Rik <rdrider0-list@yahoo.com>
parents:
9040
diff
changeset
|
52 ## @code{xlabel}, @code{title}, etc., will be associated with this hidden |
|
9040
dbd0c77e575e
Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents:
8190
diff
changeset
|
53 ## axis. Finally @var{p} returns the graphics objects associated with |
| 8127 | 54 ## the histogram and @var{pax} the corresponding axes objects. |
| 55 ## | |
| 56 ## @example | |
|
14327
4d917a6a858b
doc: Use Octave coding conventions in @example blocks of docstrings.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
57 ## plotmatrix (randn (100, 3), "g+") |
| 8127 | 58 ## @end example |
| 59 ## | |
| 60 ## @end deftypefn | |
| 61 | |
| 62 function [h, ax, bigax, p, pax] = plotmatrix (varargin) | |
| 63 | |
| 64 [bigax2, varargin, nargin] = __plt_get_axis_arg__ ("plotmatrix", varargin{:}); | |
| 65 | |
| 66 if (nargin > 3 || nargin < 1) | |
| 67 print_usage (); | |
| 68 else | |
| 69 oldh = gca (); | |
| 70 unwind_protect | |
| 71 axes (bigax2); | |
| 72 newplot (); | |
| 73 [h2, ax2, p2, pax2, need_usage] = __plotmatrix__ (bigax2, varargin{:}); | |
| 74 if (need_usage) | |
| 10549 | 75 print_usage (); |
| 8127 | 76 endif |
| 77 if (nargout > 0) | |
| 10549 | 78 h = h2; |
| 79 ax = ax2; | |
| 80 bigax = bigax2; | |
| 81 p = p2; | |
| 82 pax = pax2; | |
| 8127 | 83 endif |
| 84 axes (bigax2); | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
85 ctext = text (0, 0, "", "visible", "off", |
|
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
86 "handlevisibility", "off", "xliminclude", "off", |
| 10549 | 87 "yliminclude", "off", "zliminclude", "off", |
| 88 "deletefcn", {@plotmatrixdelete, [ax2; pax2]}); | |
| 8127 | 89 set (bigax2, "visible", "off"); |
| 90 unwind_protect_cleanup | |
| 91 axes (oldh); | |
| 92 end_unwind_protect | |
| 93 endif | |
| 94 endfunction | |
| 95 | |
| 96 %!demo | |
|
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
97 %! clf; |
|
14245
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
98 %! plotmatrix (randn (100, 3), 'g+'); |
| 8127 | 99 |
| 100 function plotmatrixdelete (h, d, ax) | |
| 101 for i = 1 : numel (ax) | |
| 102 hc = ax(i); | |
|
11149
fe3c3dfc07eb
style fix: break lines before && and ||, not after
John W. Eaton <jwe@octave.org>
parents:
10793
diff
changeset
|
103 if (ishandle (hc) && strcmp (get (hc, "type"), "axes") |
|
fe3c3dfc07eb
style fix: break lines before && and ||, not after
John W. Eaton <jwe@octave.org>
parents:
10793
diff
changeset
|
104 && strcmpi (get (hc, "beingdeleted"), "off")) |
| 8127 | 105 parent = get (hc, "parent"); |
| 106 ## If the parent is invalid or being deleted, then do nothing | |
|
8190
73d6b71788c0
use case-insensitive comparison for graphics properties; misc style fixes
John W. Eaton <jwe@octave.org>
parents:
8127
diff
changeset
|
107 if (ishandle (parent) && strcmpi (get (parent, "beingdeleted"), "off")) |
| 10549 | 108 delete (hc); |
| 8127 | 109 endif |
| 110 endif | |
| 111 endfor | |
| 112 endfunction | |
| 113 | |
| 114 function [h, ax, p, pax, need_usage] = __plotmatrix__ (bigax, varargin) | |
| 115 need_usage = false; | |
| 116 have_line_spec = false; | |
| 117 have_hist = false; | |
| 118 parent = get (bigax, "parent"); | |
| 119 for i = 1 : nargin - 1 | |
| 120 arg = varargin{i}; | |
| 121 if (ischar (arg) || iscell (arg)) | |
| 122 [linespec, valid] = __pltopt__ ("plotmatrix", varargin{i}, false); | |
| 123 if (valid) | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
124 have_line_spec = true; |
| 10549 | 125 linespec = varargin(i); |
| 126 varargin(i) = []; | |
| 127 nargin = nargin - 1; | |
| 128 break; | |
| 8127 | 129 else |
| 10549 | 130 need_usage = true; |
| 131 returm; | |
| 8127 | 132 endif |
| 133 endif | |
| 134 endfor | |
| 135 | |
| 136 if (nargin == 2) | |
| 137 X = varargin{1}; | |
| 138 Y = X; | |
| 139 have_hist = true; | |
| 140 elseif (nargin == 3) | |
| 141 X = varargin{1}; | |
| 142 Y = varargin{2}; | |
| 143 else | |
| 144 need_usage = true; | |
| 145 returm; | |
| 146 endif | |
| 147 | |
|
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14335
diff
changeset
|
148 if (rows (X) != rows (Y)) |
| 8127 | 149 error ("plotmatrix: dimension mismatch in the arguments"); |
| 150 endif | |
| 151 | |
| 152 [dummy, m] = size (X); | |
| 153 [dummy, n] = size (Y); | |
| 154 | |
| 155 h = []; | |
| 156 ax = []; | |
| 157 p = []; | |
| 158 pax = []; | |
| 159 | |
| 160 xsize = 0.9 / m; | |
| 161 ysize = 0.9 / n; | |
| 162 xoff = 0.05; | |
| 163 yoff = 0.05; | |
| 164 border = [0.130, 0.110, 0.225, 0.185] .* [xsize, ysize, xsize, ysize]; | |
| 165 border(3:4) = - border(3:4) - border(1:2); | |
| 166 | |
|
16086
f89760972bf4
plotmatrix.m: Fix bug when number of columns in 2 inputs differs (bug #38368)
Julien Bect <julien.bect@supelec.fr>
parents:
14868
diff
changeset
|
167 for i = 1 : m |
|
f89760972bf4
plotmatrix.m: Fix bug when number of columns in 2 inputs differs (bug #38368)
Julien Bect <julien.bect@supelec.fr>
parents:
14868
diff
changeset
|
168 for j = 1 : n |
|
f89760972bf4
plotmatrix.m: Fix bug when number of columns in 2 inputs differs (bug #38368)
Julien Bect <julien.bect@supelec.fr>
parents:
14868
diff
changeset
|
169 pos = [xsize * (i - 1) + xoff, ysize * (n - j) + yoff, xsize, ysize]; |
| 8127 | 170 tmp = axes ("outerposition", pos, "position", pos + border, |
| 10549 | 171 "parent", parent); |
| 8127 | 172 if (i == j && have_hist) |
| 10549 | 173 pax = [pax ; tmp]; |
| 174 [nn, xx] = hist (X(:, i)); | |
| 175 tmp = bar (xx, nn, 1.0); | |
| 176 p = [p; tmp]; | |
| 8127 | 177 else |
| 10549 | 178 ax = [ax ; tmp]; |
| 179 if (have_line_spec) | |
| 180 tmp = plot (X (:, i), Y (:, j), linespec); | |
| 181 else | |
| 182 tmp = plot (X (:, i), Y (:, j), "."); | |
| 183 endif | |
| 184 h = [h ; tmp]; | |
| 8127 | 185 endif |
| 186 endfor | |
| 187 endfor | |
| 188 endfunction |