Mercurial > hg > octave-nkf
changeset 2315:bf8b1bffb58f
[project @ 1996-07-12 17:22:07 by jwe]
author | jwe |
---|---|
date | Fri, 12 Jul 1996 17:22:16 +0000 |
parents | 949ab8eba8bc |
children | fbc76f6e4893 |
files | scripts/plot/__plr1__.m scripts/plot/__plr2__.m scripts/plot/__plr__.m scripts/plot/__plt1__.m scripts/plot/__plt2__.m scripts/plot/__plt2mm__.m scripts/plot/__plt2mv__.m scripts/plot/__plt2ss__.m scripts/plot/__plt2vm__.m scripts/plot/__plt2vv__.m scripts/plot/__plt__.m scripts/plot/__pltopt__.m scripts/plot/loglog.m scripts/plot/mplot.m scripts/plot/plot.m scripts/plot/polar.m scripts/plot/semilogx.m scripts/plot/semilogy.m |
diffstat | 18 files changed, 77 insertions(+), 77 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/plot/__plr1__.m +++ b/scripts/plot/__plr1__.m @@ -19,10 +19,10 @@ ## Author: jwe -function polar_int_1 (theta, fmt) +function __plr1__ (theta, fmt) if (nargin != 2) - usage ("polar_int_1 (theta, fmt)"); + usage ("__plr1__ (theta, fmt)"); endif [nr, nc] = size (theta); @@ -41,6 +41,6 @@ theta = (1:nr)'; endif - polar_int_2 (theta, rho, fmt); + __plr2__ (theta, rho, fmt); endfunction
--- a/scripts/plot/__plr2__.m +++ b/scripts/plot/__plr2__.m @@ -19,10 +19,10 @@ ## Author: jwe -function polar_int_2 (theta, rho, fmt) +function __plr2__ (theta, rho, fmt) if (nargin != 3) - usage ("polar_int_2 (theta, rho, fmt)"); + usage ("__plr2__ (theta, rho, fmt)"); endif if (any (imag (theta))) @@ -37,7 +37,7 @@ if (is_scalar (rho)) x = rho * cos (theta); y = rho * sin (theta); - plot_2_s_s (x, y, fmt); + __plt2ss__ (x, y, fmt); endif elseif (is_vector (theta)) if (is_vector (rho)) @@ -52,7 +52,7 @@ endif x = rho .* cos (theta); y = rho .* sin (theta); - plot_2_v_v (x, y, fmt); + __plt2vv__ (x, y, fmt); elseif (is_matrix (rho)) [t_nr, t_nc] = size (theta); if (t_nr == 1) @@ -73,7 +73,7 @@ endif x = diag (cos (theta)) * rho; y = diag (sin (theta)) * rho; - plot_2_v_m (x, y, fmt); + __plt2vm__ (x, y, fmt); endif elseif (is_matrix (theta)) if (is_vector (rho)) @@ -97,14 +97,14 @@ diag_r = diag (r); x = diag_r * cos (theta); y = diag_r * sin (theta); - plot_2_m_v (x, y, fmt); + __plt2mv__ (x, y, fmt); elseif (is_matrix (rho)) if (size (rho) != size (theta)) error ("polar: matrix dimensions must match"); endif x = rho .* cos (theta); y = rho .* sin (theta); - plot_2_m_m (x, y, fmt); + __plt2mm__ (x, y, fmt); endif endif
--- a/scripts/plot/__plr__.m +++ b/scripts/plot/__plr__.m @@ -19,7 +19,7 @@ ## Author: jwe -function polar_int (theta, rho, fmt) +function __plr__ (theta, rho, fmt) if (nargin == 1) [nr, nc] = size (theta); @@ -50,7 +50,7 @@ if (is_scalar (rho)) x = rho * cos (theta); y = rho * sin (theta); - plot_2_s_s (x, y, fmt); + __plt2ss__ (x, y, fmt); endif elseif (is_vector (theta)) if (is_vector (rho)) @@ -65,7 +65,7 @@ endif x = rho .* cos (theta); y = rho .* sin (theta); - plot_2_v_v (x, y, fmt); + __plt2vv__ (x, y, fmt); elseif (is_matrix (rho)) [t_nr, t_nc] = size (theta); if (t_nr == 1) @@ -86,7 +86,7 @@ endif x = diag (cos (theta)) * rho; y = diag (sin (theta)) * rho; - plot_2_v_m (x, y, fmt); + __plt2vm__ (x, y, fmt); endif elseif (is_matrix (theta)) if (is_vector (rho)) @@ -110,18 +110,18 @@ diag_r = diag (r); x = diag_r * cos (theta); y = diag_r * sin (theta); - plot_2_m_v (x, y, fmt); + __plt2mv__ (x, y, fmt); elseif (is_matrix (rho)) if (size (rho) != size (theta)) error ("polar: matrix dimensions must match"); endif x = rho .* cos (theta); y = rho .* sin (theta); - plot_2_m_m (x, y, fmt); + __plt2mm__ (x, y, fmt); endif endif else - usage ("polar_int (x [, y])"); + usage ("__plr__ (x [, y])"); endif endfunction
--- a/scripts/plot/__plt1__.m +++ b/scripts/plot/__plt1__.m @@ -19,10 +19,10 @@ ## Author: jwe -function plot_int_1 (x1, fmt) +function __plt1__ (x1, fmt) if (nargin < 1 || nargin > 2) - usage ("plot_int_1 (x1, fmt)"); + usage ("__plt1__ (x1, fmt)"); endif if (nargin == 1) @@ -30,7 +30,7 @@ endif if (! isstr (fmt)) - error ("plot_int_1: fmt must be a string"); + error ("__plt1__: fmt must be a string"); endif [nr, nc] = size (x1); @@ -49,6 +49,6 @@ x1 = (1:nr)'; endif - plot_int_2 (x1, x2, fmt); + __plt2__ (x1, x2, fmt); endfunction
--- a/scripts/plot/__plt2__.m +++ b/scripts/plot/__plt2__.m @@ -19,10 +19,10 @@ ## Author: jwe -function plot_int_2 (x1, x2, fmt) +function __plt2__ (x1, x2, fmt) if (nargin < 2 || nargin > 3) - usage ("plot_int_2 (x1, x2, fmt)"); + usage ("__plt2__ (x1, x2, fmt)"); endif if (nargin == 2) @@ -30,7 +30,7 @@ endif if (! isstr (fmt)) - error ("plot_int_2: fmt must be a string"); + error ("__plt2__: fmt must be a string"); endif if (any (any (imag (x1)))) @@ -41,19 +41,19 @@ endif if (is_scalar (x1)) if (is_scalar (x2)) - plot_2_s_s (x1, x2, fmt); + __plt2ss__ (x1, x2, fmt); endif elseif (is_vector (x1)) if (is_vector (x2)) - plot_2_v_v (x1, x2, fmt); + __plt2vv__ (x1, x2, fmt); elseif (is_matrix (x2)) - plot_2_v_m (x1, x2, fmt); + __plt2vm__ (x1, x2, fmt); endif elseif (is_matrix (x1)) if (is_vector (x2)) - plot_2_m_v (x1, x2, fmt); + __plt2mv__ (x1, x2, fmt); elseif (is_matrix (x2)) - plot_2_m_m (x1, x2, fmt); + __plt2mm__ (x1, x2, fmt); endif endif
--- a/scripts/plot/__plt2mm__.m +++ b/scripts/plot/__plt2mm__.m @@ -19,11 +19,11 @@ ## Author: jwe -function plot_2_m_m (x, y, fmt) +function __plt2mm__ (x, y, fmt) if (nargin < 2 || nargin > 3) - msg = sprintf ("plot_2_m_m (x, y)\n"); - msg = sprintf ("%s plot_2_m_m (x, y, fmt)", msg); + msg = sprintf ("__plt2mm__ (x, y)\n"); + msg = sprintf ("%s __plt2mm__ (x, y, fmt)", msg); usage (msg); elseif (nargin == 2) fmt = ""; @@ -41,10 +41,10 @@ endfor eval (cmd); else - error ("plot_2_m_m: arguments must be a matrices"); + error ("__plt2mm__: arguments must be a matrices"); endif else - error ("plot_2_m_m: matrix dimensions must match"); + error ("__plt2mm__: matrix dimensions must match"); endif endfunction
--- a/scripts/plot/__plt2mv__.m +++ b/scripts/plot/__plt2mv__.m @@ -19,11 +19,11 @@ ## Author: jwe -function plot_2_m_v (x, y, fmt) +function __plt2mv__ (x, y, fmt) if (nargin < 2 || nargin > 3) - msg = sprintf ("plot_2_m_v (x, y)\n"); - msg = sprintf ("%s plot_2_m_v (x, y, fmt)", msg); + msg = sprintf ("__plt2mv__ (x, y)\n"); + msg = sprintf ("%s __plt2mv__ (x, y, fmt)", msg); usage (msg); elseif (nargin == 2) fmt = ""; @@ -47,7 +47,7 @@ x_nr = x_nc; x_nc = tmp; else - error ("plot_2_m_v: matrix dimensions must match"); + error ("__plt2mv__: matrix dimensions must match"); endif if (x_nc > 0) @@ -58,7 +58,7 @@ endfor eval (cmd); else - error ("plot_2_m_v: arguments must be a matrices"); + error ("__plt2mv__: arguments must be a matrices"); endif endfunction
--- a/scripts/plot/__plt2ss__.m +++ b/scripts/plot/__plt2ss__.m @@ -19,11 +19,11 @@ ## Author: jwe -function plot_2_s_s (x, y, fmt) +function __plt2ss__ (x, y, fmt) if (nargin < 2 || nargin > 3) - msg = sprintf ("plot_2_s_s (x, y)"); - msg = sprintf ("%s plot_2_s_s (x, y, fmt)", msg); + msg = sprintf ("__plt2ss__ (x, y)"); + msg = sprintf ("%s __plt2ss__ (x, y, fmt)", msg); usage (msg); elseif (nargin == 2) fmt = ""; @@ -37,7 +37,7 @@ cmd = sprintf ("gplot tmp %s", fmt); eval (cmd); else - error ("plot_2_s_s: arguments must be scalars"); + error ("__plt2ss__: arguments must be scalars"); endif endfunction
--- a/scripts/plot/__plt2vm__.m +++ b/scripts/plot/__plt2vm__.m @@ -19,11 +19,11 @@ ## Author: jwe -function plot_2_v_m (x, y, fmt) +function __plt2vm__ (x, y, fmt) if (nargin < 2 || nargin > 3) - msg = sprintf ("plot_2_v_m (x, y)\n"); - msg = sprintf ("%s plot_2_v_m (x, y, fmt)", msg); + msg = sprintf ("__plt2vm__ (x, y)\n"); + msg = sprintf ("%s __plt2vm__ (x, y, fmt)", msg); usage (msg); elseif (nargin == 2) fmt = ""; @@ -47,7 +47,7 @@ y_nr = y_nc; y_nc = tmp; else - error ("plot_2_v_m: matrix dimensions must match"); + error ("__plt2vm__: matrix dimensions must match"); endif if (y_nc > 0) @@ -58,7 +58,7 @@ endfor eval (cmd); else - error ("plot_2_v_m: arguments must be a matrices"); + error ("__plt2vm__: arguments must be a matrices"); endif endfunction
--- a/scripts/plot/__plt2vv__.m +++ b/scripts/plot/__plt2vv__.m @@ -19,11 +19,11 @@ ## Author: jwe -function plot_2_v_v (x, y, fmt) +function __plt2vv__ (x, y, fmt) if (nargin < 2 || nargin > 3) - msg = sprintf ("plot_2_v_v (x, y)\n"); - msg = sprintf ("%s plot_2_v_v (x, y, fmt)", msg); + msg = sprintf ("__plt2vv__ (x, y)\n"); + msg = sprintf ("%s __plt2vv__ (x, y, fmt)", msg); usage (msg); elseif (nargin == 2) fmt = ""; @@ -47,7 +47,7 @@ endif if (x_nr != y_nr) - error ("plot_2_v_v: vector lengths must match"); + error ("__plt2vv__: vector lengths must match"); endif tmp = [x, y];
--- a/scripts/plot/__plt__.m +++ b/scripts/plot/__plt__.m @@ -19,11 +19,11 @@ ## Author: jwe -function plot_int (caller, ...) +function __plt__ (caller, ...) if (nargin == 2) - plot_int_1 (va_arg (), ""); + __plt1__ (va_arg (), ""); elseif (nargin > 2) @@ -48,18 +48,18 @@ if (! x_set) error ("plot: no data to plot"); endif - fmt = plot_opt (caller, new); + fmt = __pltopt__ (caller, new); if (! y_set) - plot_int_1 (x, fmt); + __plt1__ (x, fmt); else - plot_int_2 (x, y, fmt); + __plt2__ (x, y, fmt); endif hold on; x_set = 0; y_set = 0; elseif (x_set) if (y_set) - plot_int_2 (x, y, fmt); + __plt2__ (x, y, fmt); hold on; x = new; y_set = 0; @@ -78,9 +78,9 @@ if (x_set) if (y_set) - plot_int_2 (x, y, fmt); + __plt2__ (x, y, fmt); else - plot_int_1 (x, fmt); + __plt1__ (x, fmt); endif endif
--- a/scripts/plot/__pltopt__.m +++ b/scripts/plot/__pltopt__.m @@ -19,7 +19,7 @@ ## Originally written by Rick Niles <niles@axp745.gsfc.nasa.gov>. -## usage: fmt = plot_opt (caller, opt) +## usage: fmt = __pltopt__ (caller, opt) ## ## Decode plot option strings. ## @@ -62,7 +62,7 @@ ## Author: jwe -function fmt = plot_opt (caller, opt) +function fmt = __pltopt__ (caller, opt) set_color = 0; set_symbol = 0; @@ -87,11 +87,11 @@ ERRORBARS = "e"; if (nargin != 2) - usage ("plot_opt (opt)"); + usage ("__pltopt__ (opt)"); endif if (! isstr (opt)) - error ("plot_opt: argument must be a string"); + error ("__pltopt__: argument must be a string"); endif while (more_opts)
--- a/scripts/plot/loglog.m +++ b/scripts/plot/loglog.m @@ -37,6 +37,6 @@ set logscale y; set nopolar; - plot_int ("loglog", all_va_args); + __plt__ ("loglog", all_va_args); endfunction
--- a/scripts/plot/mplot.m +++ b/scripts/plot/mplot.m @@ -61,7 +61,7 @@ set nologscale; set nopolar; - plot_int ("plot", all_va_args); + __plt__ ("plot", all_va_args); ## update the plot position
--- a/scripts/plot/plot.m +++ b/scripts/plot/plot.m @@ -43,7 +43,7 @@ ## coordinates and the x coordinates are taken to be the indices of the ## elements, starting with 1. ## -## To see possible options for FMT please see plot_opt. +## To see possible options for FMT please see __pltopt__. ## ## Examples: ## @@ -58,7 +58,7 @@ ## ## b will be plotted with points of type "*". ## -## See also: semilogx, semilogy, loglog, polar, mesh, contour, plot_opt +## See also: semilogx, semilogy, loglog, polar, mesh, contour, __pltopt__ ## bar, stairs, gplot, gsplot, replot, xlabel, ylabel, title ## Author: jwe @@ -68,6 +68,6 @@ set nologscale; set nopolar; - plot_int ("plot", all_va_args); + __plt__ ("plot", all_va_args); endfunction
--- a/scripts/plot/polar.m +++ b/scripts/plot/polar.m @@ -35,22 +35,22 @@ if (nargin == 3) if (isstr (fmt)) - fmt = plot_opt ("polar", fmt); + fmt = __pltopt__ ("polar", fmt); else error ("polar: third argument must be a string"); endif - polar_int_2 (x1, x2, fmt); + __plr2__ (x1, x2, fmt); elseif (nargin == 2) if (isstr (x2)) - fmt = plot_opt ("polar", x2); - polar_int_1 (x1, fmt); + fmt = __pltopt__ ("polar", x2); + __plr1__ (x1, fmt); else fmt = ""; - polar_int_2 (x1, x2, fmt); + __plr2__ (x1, x2, fmt); endif elseif (nargin == 1) fmt = ""; - polar_int_1 (x1, fmt); + __plr1__ (x1, fmt); else usage ("polar (theta, rho, fmt)"); endif