Mercurial > hg > octave-lyh
annotate scripts/plot/contourc.m @ 11499:8f23b6757225
Correction to contourc.m
| author | Michael Godfrey <godfrey@isl.stanford.edu> |
|---|---|
| date | Thu, 13 Jan 2011 02:38:57 -0500 |
| parents | 1740012184f9 |
| children | fd0a3ac60b0e |
| rev | line source |
|---|---|
| 8920 | 1 ## Copyright (C) 2003, 2007, 2008, 2009 Shai Ayal |
| 6257 | 2 ## |
| 6440 | 3 ## This file is part of Octave. |
| 4 ## | |
| 5 ## Octave is free software; you can redistribute it and/or modify it | |
| 6257 | 6 ## under the terms of the GNU General Public License as published by |
| 7016 | 7 ## the Free Software Foundation; either version 3 of the License, or (at |
| 8 ## your option) any later version. | |
| 6257 | 9 ## |
| 6440 | 10 ## Octave is distributed in the hope that it will be useful, but |
| 6257 | 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 | |
| 7016 | 16 ## along with Octave; see the file COPYING. If not, see |
| 17 ## <http://www.gnu.org/licenses/>. | |
| 6257 | 18 |
| 19 ## -*- texinfo -*- | |
|
10793
be55736a0783
Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents:
10634
diff
changeset
|
20 ## @deftypefn {Function File} {[@var{c}, @var{lev}] =} contourc (@var{x}, @var{y}, @var{z}, @var{vn}) |
|
8325
b93ac0586e4b
spelling corrections
Brian Gough<bjg@network-theory.co.uk>
parents:
8236
diff
changeset
|
21 ## Compute isolines (contour lines) of the matrix @var{z}. |
| 6257 | 22 ## Parameters @var{x}, @var{y} and @var{vn} are optional. |
| 23 ## | |
| 24 ## The return value @var{lev} is a vector of the contour levels. | |
| 25 ## The return value @var{c} is a 2 by @var{n} matrix containing the | |
| 26 ## contour lines in the following format | |
| 27 ## | |
| 28 ## @example | |
|
9051
1bf0ce0930be
Grammar check TexInfo in all .m files
Rik <rdrider0-list@yahoo.com>
parents:
9040
diff
changeset
|
29 ## @group |
|
9758
09da0bd91412
Periodic grammar check of Octave documentation files to ensure common format
Rik <rdrider0-list@yahoo.com>
parents:
9051
diff
changeset
|
30 ## @var{c} = [lev1, x1, x2, @dots{}, levn, x1, x2, ... |
|
9040
dbd0c77e575e
Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
31 ## len1, y1, y2, @dots{}, lenn, y1, y2, @dots{}] |
|
9051
1bf0ce0930be
Grammar check TexInfo in all .m files
Rik <rdrider0-list@yahoo.com>
parents:
9040
diff
changeset
|
32 ## @end group |
| 6257 | 33 ## @end example |
| 34 ## | |
| 35 ## @noindent | |
| 36 ## in which contour line @var{n} has a level (height) of @var{levn} and | |
| 37 ## length of @var{lenn}. | |
| 38 ## | |
| 39 ## If @var{x} and @var{y} are omitted they are taken as the row/column | |
| 40 ## index of @var{z}. @var{vn} is either a scalar denoting the number of lines | |
|
9040
dbd0c77e575e
Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
41 ## to compute or a vector containing the values of the lines. If only one |
| 6257 | 42 ## value is wanted, set @code{@var{vn} = [val, val]}; |
| 43 ## If @var{vn} is omitted it defaults to 10. | |
| 44 ## | |
|
10821
693e22af08ae
Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
45 ## For example: |
|
10846
a4f482e66b65
Grammarcheck more of the documentation.
Rik <octave@nomad.inbox5.com>
parents:
10821
diff
changeset
|
46 ## |
| 6257 | 47 ## @example |
| 6592 | 48 ## @group |
| 49 ## x = 0:2; | |
| 50 ## y = x; | |
| 51 ## z = x' * y; | |
| 52 ## contourc (x, y, z, 2:3) | |
| 53 ## @result{} 2.0000 2.0000 1.0000 3.0000 1.5000 2.0000 | |
| 54 ## 2.0000 1.0000 2.0000 2.0000 2.0000 1.5000 | |
| 55 ## | |
| 56 ## @end group | |
| 6257 | 57 ## @end example |
| 58 ## @seealso{contour} | |
| 59 ## @end deftypefn | |
| 60 | |
| 7327 | 61 ## Author: Shai Ayal <shaiay@users.sourceforge.net> |
| 6257 | 62 |
| 8236 | 63 function [cout, lev] = contourc (varargin) |
| 6257 | 64 |
| 65 if (nargin == 1) | |
| 66 vn = 10; | |
| 67 z = varargin{1}; | |
|
11499
8f23b6757225
Correction to contourc.m
Michael Godfrey <godfrey@isl.stanford.edu>
parents:
11472
diff
changeset
|
68 [nr, nc] = size (z); |
|
8f23b6757225
Correction to contourc.m
Michael Godfrey <godfrey@isl.stanford.edu>
parents:
11472
diff
changeset
|
69 x = 1:nc; |
|
8f23b6757225
Correction to contourc.m
Michael Godfrey <godfrey@isl.stanford.edu>
parents:
11472
diff
changeset
|
70 y = 1:nr; |
| 6257 | 71 elseif (nargin == 2) |
| 72 vn = varargin{2}; | |
| 73 z = varargin{1}; | |
| 7327 | 74 [nr, nc] = size (z); |
| 75 x = 1:nc; | |
| 76 y = 1:nr; | |
| 6257 | 77 elseif (nargin == 3) |
| 78 vn = 10; | |
| 79 x = varargin{1}; | |
| 80 y = varargin{2}; | |
| 81 z = varargin{3}; | |
| 82 elseif (nargin == 4) | |
| 83 vn = varargin{4}; | |
| 84 x = varargin{1}; | |
| 85 y = varargin{2}; | |
| 86 z = varargin{3}; | |
| 87 else | |
| 88 print_usage (); | |
| 89 endif | |
| 90 | |
|
10634
60542efcfa2c
Check input arguments for size and type (bug #29861).
Rik <octave@nomad.inbox5.com>
parents:
9758
diff
changeset
|
91 if (!ismatrix (z) || isvector (z) || isscalar (z)) |
|
11472
1740012184f9
Use uppercase for variable names in error() strings to match Info documentation. Only m-files done.
Rik <octave@nomad.inbox5.com>
parents:
10846
diff
changeset
|
92 error ("contourc: Z argument must be a matrix"); |
|
10634
60542efcfa2c
Check input arguments for size and type (bug #29861).
Rik <octave@nomad.inbox5.com>
parents:
9758
diff
changeset
|
93 endif |
|
60542efcfa2c
Check input arguments for size and type (bug #29861).
Rik <octave@nomad.inbox5.com>
parents:
9758
diff
changeset
|
94 |
| 6257 | 95 if (isscalar (vn)) |
| 96 vv = linspace (min (z(:)), max (z(:)), vn+2)(2:end-1); | |
| 97 else | |
| 98 vv = unique (sort (vn)); | |
| 99 endif | |
| 100 | |
| 7327 | 101 if (isvector (x) && isvector (y)) |
| 102 c = __contourc__ (x(:)', y(:)', z, vv); | |
| 103 else | |
| 104 ## Indexes x,y for the purpose of __contourc__. | |
| 105 ii = 1:size (z,2); | |
| 106 jj = 1:size (z,1); | |
| 107 | |
| 108 ## Now call __contourc__ for the real work... | |
| 109 c = __contourc__ (ii, jj, z, vv); | |
| 110 | |
| 111 ## Map the contour lines from index space (i,j) back | |
| 112 ## to the original grid (x,y) | |
| 113 i = 1; | |
| 6257 | 114 |
| 7327 | 115 while (i < size (c,2)) |
| 116 clen = c(2, i); | |
| 117 ind = i + [1 : clen]; | |
| 6257 | 118 |
| 7327 | 119 ci = c(1, ind); |
| 120 cj = c(2,ind); | |
| 121 | |
| 122 ## due to rounding errors some elements of ci and cj | |
| 123 ## can fall out of the range of ii and jj and interp2 would | |
| 124 ## return NA for those values. | |
| 125 ## The permitted range is enforced here: | |
| 126 | |
| 127 ci = max (ci, 1); ci = min (ci, size (z, 2)); | |
| 128 cj = max (cj, 1); cj = min (cj, size (z, 1)); | |
| 129 | |
| 130 c(1, ind) = interp2 (ii, jj, x, ci, cj); | |
| 131 c(2, ind) = interp2 (ii, jj, y, ci, cj); | |
| 132 | |
| 133 i = i + clen + 1; | |
| 134 endwhile | |
| 6257 | 135 endif |
| 7327 | 136 |
| 8236 | 137 if (nargout > 0) |
| 138 cout = c; | |
| 6257 | 139 lev = vv; |
| 140 endif | |
| 141 | |
| 142 endfunction | |
| 7245 | 143 |
|
8790
a013ff655ca4
Trivial changes to demos to produce a more pleasant output for octave+gnuplot+aquaterm.
Ben Abbott <bpabbott@mac.com>
parents:
8325
diff
changeset
|
144 %!test |
| 7245 | 145 %! x = 0:2; |
| 146 %! y = x; | |
| 147 %! z = x' * y; | |
|
8790
a013ff655ca4
Trivial changes to demos to produce a more pleasant output for octave+gnuplot+aquaterm.
Ben Abbott <bpabbott@mac.com>
parents:
8325
diff
changeset
|
148 %! [c_actual, lev_actual]= contourc (x, y, z, 2:3); |
|
a013ff655ca4
Trivial changes to demos to produce a more pleasant output for octave+gnuplot+aquaterm.
Ben Abbott <bpabbott@mac.com>
parents:
8325
diff
changeset
|
149 %! c_expected = [2, 1, 1, 2, 2, 3, 1.5, 2; 4, 2, 2, 1, 1, 2, 2, 1.5]; |
|
a013ff655ca4
Trivial changes to demos to produce a more pleasant output for octave+gnuplot+aquaterm.
Ben Abbott <bpabbott@mac.com>
parents:
8325
diff
changeset
|
150 %! lev_expected = [2 3]; |
|
a013ff655ca4
Trivial changes to demos to produce a more pleasant output for octave+gnuplot+aquaterm.
Ben Abbott <bpabbott@mac.com>
parents:
8325
diff
changeset
|
151 %! assert (c_actual, c_expected, eps) |
|
a013ff655ca4
Trivial changes to demos to produce a more pleasant output for octave+gnuplot+aquaterm.
Ben Abbott <bpabbott@mac.com>
parents:
8325
diff
changeset
|
152 %! assert (lev_actual, lev_expected, eps) |
|
a013ff655ca4
Trivial changes to demos to produce a more pleasant output for octave+gnuplot+aquaterm.
Ben Abbott <bpabbott@mac.com>
parents:
8325
diff
changeset
|
153 |
|
a013ff655ca4
Trivial changes to demos to produce a more pleasant output for octave+gnuplot+aquaterm.
Ben Abbott <bpabbott@mac.com>
parents:
8325
diff
changeset
|
154 |