Mercurial > hg > octave-lyh
annotate scripts/plot/scatter.m @ 13141:e81ddf9cacd5
maint: untabify and remove trailing whitespace from source files
* bicg.m, gmres.m, pkg.m: Untabify and remove trailing whitespace.
* libcruft/Makefile.am, libcruft/blas-xtra/cdotc3.f,
libcruft/blas-xtra/cmatm3.f, libcruft/blas-xtra/ddot3.f,
libcruft/blas-xtra/dmatm3.f, libcruft/blas-xtra/sdot3.f,
libcruft/blas-xtra/smatm3.f, libcruft/blas-xtra/zdotc3.f,
libcruft/blas-xtra/zmatm3.f, libcruft/lapack-xtra/crsf2csf.f,
libcruft/lapack-xtra/zrsf2csf.f, liboctave/Array.cc,
liboctave/DASPK-opts.in, liboctave/DASRT-opts.in,
liboctave/DASSL-opts.in, liboctave/LSODE-opts.in,
liboctave/Makefile.a,mliboctave/Quad-opts.in,
liboctave/Sparse-perm-op-defs.h,
scripts/Makefile.a,mscripts/deprecated/glpkmex.m,
scripts/general/blkdiag.m, scripts/general/interp1.m,
scripts/general/profshow.m, scripts/general/quadl.m,
scripts/general/triplequad.m, scripts/help/__makeinfo__.m,
scripts/io/strread.m, scripts/io/textread.m, scripts/io/textscan.m,
scripts/linear-algebra/rank.m, scripts/miscellaneous/gzip.m,
scripts/miscellaneous/private/__xzip__.m,
scripts/miscellaneous/tempdir.m, scripts/miscellaneous/unpack.m,
scripts/pkg/pkg.m, scripts/plot/allchild.m, scripts/plot/ancestor.m,
scripts/plot/cla.m, scripts/plot/clf.m, scripts/plot/findall.m,
scripts/plot/findobj.m, scripts/plot/gca.m, scripts/plot/gcf.m,
scripts/plot/hggroup.m, scripts/plot/isfigure.m,
scripts/plot/ishghandle.m, scripts/plot/legend.m,
scripts/plot/line.m, scripts/plot/loglog.m, scripts/plot/patch.m,
scripts/plot/print.m, scripts/plot/private/__quiver__.m,
scripts/plot/private/__scatter__.m, scripts/plot/rectangle.m,
scripts/plot/semilogx.m, scripts/plot/semilogy.m,
scripts/plot/surface.m, scripts/plot/text.m, scripts/plot/title.m,
scripts/plot/trisurf.m, scripts/plot/view.m, scripts/plot/whitebg.m,
scripts/plot/xlabel.m, scripts/plot/xlim.m, scripts/plot/ylabel.m,
scripts/plot/ylim.m, scripts/plot/zlabel.m, scripts/plot/zlim.m,
scripts/polynomial/mkpp.m, scripts/polynomial/polygcd.m,
scripts/polynomial/ppint.m, scripts/polynomial/ppjumps.m,
scripts/polynomial/ppval.m, scripts/set/setxor.m,
scripts/sparse/bicgstab.m, scripts/sparse/cgs.m,
scripts/sparse/spconvert.m, scripts/specfun/nthroot.m,
scripts/strings/strmatch.m, scripts/strings/untabify.m,
scripts/testfun/demo.m, scripts/testfun/example.m,
src/DLD-FUNCTIONS/filter.cc, src/DLD-FUNCTIONS/mgorth.cc,
src/DLD-FUNCTIONS/quadcc.cc, src/DLD-FUNCTIONS/str2double.cc,
src/Makefile.a,msrc/gl-render.cc, src/gl2ps-renderer.cc,
src/graphics.cc, src/octave-config.cc.in, src/octave-config.in,
src/ov-class.h, src/ov-fcn.h, src/profiler.cc, src/profiler.h,
src/pt-binop.cc, src/pt-unop.cc, src/symtab.cc, src/txt-eng-ft.cc:
Remove trailing whitespace.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 15 Sep 2011 12:51:10 -0400 |
| parents | cd82f5933c73 |
| children | 7ab497513c1a |
| rev | line source |
|---|---|
| 11523 | 1 ## Copyright (C) 2007-2011 David Bateman |
| 7189 | 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:
10701
diff
changeset
|
20 ## @deftypefn {Function File} {} scatter (@var{x}, @var{y}) |
|
10699
da51afafca80
scatter.m: Add new calling forms of function to documentation.
Rik <octave@nomad.inbox5.com>
parents:
10697
diff
changeset
|
21 ## @deftypefnx {Function File} {} scatter (@var{x}, @var{y}, @var{s}) |
|
da51afafca80
scatter.m: Add new calling forms of function to documentation.
Rik <octave@nomad.inbox5.com>
parents:
10697
diff
changeset
|
22 ## @deftypefnx {Function File} {} scatter (@var{x}, @var{y}, @var{c}) |
|
da51afafca80
scatter.m: Add new calling forms of function to documentation.
Rik <octave@nomad.inbox5.com>
parents:
10697
diff
changeset
|
23 ## @deftypefnx {Function File} {} scatter (@var{x}, @var{y}, @var{s}, @var{c}) |
|
da51afafca80
scatter.m: Add new calling forms of function to documentation.
Rik <octave@nomad.inbox5.com>
parents:
10697
diff
changeset
|
24 ## @deftypefnx {Function File} {} scatter (@var{x}, @var{y}, @var{s}, @var{c}, @var{style}) |
|
da51afafca80
scatter.m: Add new calling forms of function to documentation.
Rik <octave@nomad.inbox5.com>
parents:
10697
diff
changeset
|
25 ## @deftypefnx {Function File} {} scatter (@var{x}, @var{y}, @var{s}, @var{c}, @var{prop}, @var{val}) |
|
12124
cd82f5933c73
scatter: don't recognize 'filled' as a color
John W. Eaton <jwe@octave.org>
parents:
11587
diff
changeset
|
26 ## @deftypefnx {Function File} {} scatter (@dots{}, "filled") |
| 7189 | 27 ## @deftypefnx {Function File} {} scatter (@var{h}, @dots{}) |
| 28 ## @deftypefnx {Function File} {@var{h} =} scatter (@dots{}) | |
| 29 ## | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
30 ## Plot a scatter plot of the data. A marker is plotted at each point |
|
9040
dbd0c77e575e
Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents:
7245
diff
changeset
|
31 ## defined by the points in the vectors @var{x} and @var{y}. The size of |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
32 ## the markers used is determined by the @var{s}, which can be a scalar, |
|
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
33 ## a vector of the same length of @var{x} and @var{y}. If @var{s} is not |
| 7189 | 34 ## given or is an empty matrix, then the default value of 8 points is used. |
| 35 ## | |
| 36 ## The color of the markers is determined by @var{c}, which can be a string | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
37 ## defining a fixed color; a 3-element vector giving the red, green,and blue |
|
11563
3c6e8aaa9555
Grammarcheck m-files before 3.4 release.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
38 ## components of the color; a vector of the same length as @var{x} that gives |
|
3c6e8aaa9555
Grammarcheck m-files before 3.4 release.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
39 ## a scaled index into the current colormap; or a @var{n}-by-3 matrix defining |
| 7189 | 40 ## the colors of each of the markers individually. |
| 41 ## | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
42 ## The marker to use can be changed with the @var{style} argument, that is a |
|
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
43 ## string defining a marker in the same manner as the @code{plot} command. |
|
12124
cd82f5933c73
scatter: don't recognize 'filled' as a color
John W. Eaton <jwe@octave.org>
parents:
11587
diff
changeset
|
44 ## If the argument @code{"filled"} is given then the markers as filled. All |
| 7189 | 45 ## additional arguments are passed to the underlying patch command. |
| 46 ## | |
| 47 ## The optional return value @var{h} provides a handle to the patch object | |
| 48 ## | |
| 49 ## @example | |
| 50 ## @group | |
| 51 ## x = randn (100, 1); | |
| 52 ## y = randn (100, 1); | |
| 53 ## scatter (x, y, [], sqrt(x.^2 + y.^2)); | |
| 54 ## @end group | |
| 55 ## @end example | |
| 56 ## | |
| 57 ## @seealso{plot, patch, scatter3} | |
| 58 ## @end deftypefn | |
| 59 | |
| 60 function retval = scatter (varargin) | |
| 61 | |
| 7215 | 62 [h, varargin, nargin] = __plt_get_axis_arg__ ("scatter", varargin{:}); |
| 63 | |
| 7189 | 64 if (nargin < 2) |
| 65 print_usage (); | |
| 7215 | 66 else |
| 7189 | 67 oldh = gca (); |
| 68 unwind_protect | |
| 69 axes (h); | |
| 70 newplot (); | |
| 7215 | 71 tmp = __scatter__ (h, 2, "scatter", varargin{:}); |
| 7189 | 72 unwind_protect_cleanup |
| 73 axes (oldh); | |
| 74 end_unwind_protect | |
| 75 endif | |
| 76 | |
| 77 if (nargout > 0) | |
| 78 retval = tmp; | |
| 79 endif | |
| 80 | |
| 81 endfunction | |
| 7245 | 82 |
|
11363
a0dfd7e8e3e2
Assign data used in demo plots for reproducibility between runs
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
83 |
| 7245 | 84 %!demo |
| 85 %! x = randn (100, 1); | |
| 86 %! y = randn (100, 1); | |
|
11363
a0dfd7e8e3e2
Assign data used in demo plots for reproducibility between runs
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
87 %! scatter (x, y, "r"); |
|
10697
1215ab6f3491
Honor Matlab color settings for scatter().
Ben Abbott <bpabbott@mac.com>
parents:
9245
diff
changeset
|
88 |
|
1215ab6f3491
Honor Matlab color settings for scatter().
Ben Abbott <bpabbott@mac.com>
parents:
9245
diff
changeset
|
89 %!demo |
|
1215ab6f3491
Honor Matlab color settings for scatter().
Ben Abbott <bpabbott@mac.com>
parents:
9245
diff
changeset
|
90 %! x = randn (100, 1); |
|
1215ab6f3491
Honor Matlab color settings for scatter().
Ben Abbott <bpabbott@mac.com>
parents:
9245
diff
changeset
|
91 %! y = randn (100, 1); |
| 7245 | 92 %! scatter (x, y, [], sqrt(x.^2 + y.^2)); |
|
10697
1215ab6f3491
Honor Matlab color settings for scatter().
Ben Abbott <bpabbott@mac.com>
parents:
9245
diff
changeset
|
93 |
|
1215ab6f3491
Honor Matlab color settings for scatter().
Ben Abbott <bpabbott@mac.com>
parents:
9245
diff
changeset
|
94 %!demo |
|
11363
a0dfd7e8e3e2
Assign data used in demo plots for reproducibility between runs
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
95 %! rand_10x1_data1 = [0.171577, 0.404796, 0.025469, 0.335309, 0.047814, 0.898480, 0.639599, 0.700247, 0.497798, 0.737940]; |
|
a0dfd7e8e3e2
Assign data used in demo plots for reproducibility between runs
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
96 %! rand_10x1_data2 = [0.75495, 0.83991, 0.80850, 0.73603, 0.19360, 0.72573, 0.69371, 0.74388, 0.13837, 0.54143]; |
|
a0dfd7e8e3e2
Assign data used in demo plots for reproducibility between runs
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
97 %! x = rand_10x1_data1; |
|
a0dfd7e8e3e2
Assign data used in demo plots for reproducibility between runs
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
98 %! y = rand_10x1_data2; |
|
a0dfd7e8e3e2
Assign data used in demo plots for reproducibility between runs
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
99 %! s = 10 - 10*log (x.^2 + y.^2); |
|
10697
1215ab6f3491
Honor Matlab color settings for scatter().
Ben Abbott <bpabbott@mac.com>
parents:
9245
diff
changeset
|
100 %! h = scatter (x, y, s, s, "s", "filled"); |
|
1215ab6f3491
Honor Matlab color settings for scatter().
Ben Abbott <bpabbott@mac.com>
parents:
9245
diff
changeset
|
101 |
|
10701
657e63dcfd88
scatter.m: Properly set default value markersize and marker type.
Ben Abbott <bpabbott@mac.com>
parents:
10699
diff
changeset
|
102 %!demo |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
103 %! rand_10x1_data3 = [0.42262, 0.51623, 0.65992, 0.14999, 0.68385, 0.55929, 0.52251, 0.92204, 0.19762, 0.93726]; |
|
11363
a0dfd7e8e3e2
Assign data used in demo plots for reproducibility between runs
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
104 %! rand_10x1_data4 = [0.020207, 0.527193, 0.443472, 0.061683, 0.370277, 0.947349, 0.249591, 0.666304, 0.134247, 0.920356]; |
|
a0dfd7e8e3e2
Assign data used in demo plots for reproducibility between runs
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
105 %! x = rand_10x1_data3; |
|
a0dfd7e8e3e2
Assign data used in demo plots for reproducibility between runs
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
106 %! y = rand_10x1_data4; |
|
a0dfd7e8e3e2
Assign data used in demo plots for reproducibility between runs
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
107 %! s = 10 - 10*log (x.^2 + y.^2); |
|
10701
657e63dcfd88
scatter.m: Properly set default value markersize and marker type.
Ben Abbott <bpabbott@mac.com>
parents:
10699
diff
changeset
|
108 %! h = scatter (x, y, [], "r", "s", "filled"); |
|
657e63dcfd88
scatter.m: Properly set default value markersize and marker type.
Ben Abbott <bpabbott@mac.com>
parents:
10699
diff
changeset
|
109 |
|
657e63dcfd88
scatter.m: Properly set default value markersize and marker type.
Ben Abbott <bpabbott@mac.com>
parents:
10699
diff
changeset
|
110 %!demo |
|
11363
a0dfd7e8e3e2
Assign data used in demo plots for reproducibility between runs
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
111 %! rand_10x1_data5 = [0.777753, 0.093848, 0.183162, 0.399499, 0.337997, 0.686724, 0.073906, 0.651808, 0.869273, 0.137949]; |
|
a0dfd7e8e3e2
Assign data used in demo plots for reproducibility between runs
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
112 %! rand_10x1_data6 = [0.37460, 0.25027, 0.19510, 0.51182, 0.54704, 0.56087, 0.24853, 0.75443, 0.42712, 0.44273]; |
|
a0dfd7e8e3e2
Assign data used in demo plots for reproducibility between runs
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
113 %! x = rand_10x1_data5; |
|
a0dfd7e8e3e2
Assign data used in demo plots for reproducibility between runs
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
114 %! y = rand_10x1_data6; |
|
a0dfd7e8e3e2
Assign data used in demo plots for reproducibility between runs
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
115 %! s = 10 - 10*log (x.^2 + y.^2); |
|
10701
657e63dcfd88
scatter.m: Properly set default value markersize and marker type.
Ben Abbott <bpabbott@mac.com>
parents:
10699
diff
changeset
|
116 %! h = scatter (x, y, [], "r", "s"); |
|
657e63dcfd88
scatter.m: Properly set default value markersize and marker type.
Ben Abbott <bpabbott@mac.com>
parents:
10699
diff
changeset
|
117 |