Mercurial > hg > octave-nkf
changeset 6555:69e864d21c11
[project @ 2007-04-20 18:16:08 by jwe]
author | jwe |
---|---|
date | Fri, 20 Apr 2007 18:16:08 +0000 |
parents | 5dde4dc2bcaf |
children | 8810bbf321ce |
files | scripts/deprecated/Makefile.in scripts/deprecated/meshdom.m scripts/general/int2str.m scripts/general/num2str.m scripts/miscellaneous/flops.m scripts/miscellaneous/license.m scripts/miscellaneous/pack.m scripts/miscellaneous/warning_ids.m scripts/optimization/glpkmex.m scripts/plot/Makefile.in scripts/plot/meshdom.m scripts/time/datestr.m |
diffstat | 12 files changed, 56 insertions(+), 61 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/deprecated/Makefile.in +++ b/scripts/deprecated/Makefile.in @@ -31,7 +31,7 @@ hypergeometric_rnd.m intersection.m is_bool.m is_complex.m \ is_list.m is_matrix.m is_scalar.m is_square.m is_stream.m \ is_struct.m is_symmetric.m is_vector.m isstr.m lognormal_cdf.m \ - lognormal_inv.m lognormal_pdf.m lognormal_rnd.m normal_cdf.m \ + lognormal_inv.m lognormal_pdf.m lognormal_rnd.m meshdom.m normal_cdf.m \ normal_inv.m normal_pdf.m normal_rnd.m pascal_cdf.m \ pascal_inv.m pascal_pdf.m pascal_rnd.m poisson_cdf.m \ poisson_inv.m poisson_pdf.m poisson_rnd.m setstr.m \
new file mode 100644 --- /dev/null +++ b/scripts/deprecated/meshdom.m @@ -0,0 +1,40 @@ +## Copyright (C) 1996, 1997 John W. Eaton +## +## This file is part of Octave. +## +## Octave is free software; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2, or (at your option) +## any later version. +## +## Octave is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +## 02110-1301, USA. + +## -*- texinfo -*- +## @deftypefn {Function File} {} meshdom (@var{x}, @var{y}) +## This function has been deprecated. Use @code{meshgrid} instead. +## @end deftypefn + +## Author: jwe + +function [xx, yy] = meshdom (x, y) + + if (nargin == 2) + if (isvector (x) && isvector (y)) + xx = ones (length (y), 1) * x(:).'; + yy = flipud (y(:)) * ones (1, length (x)); + else + error ("meshdom: arguments must be vectors"); + endif + else + print_usage (); + endif + +endfunction
--- a/scripts/general/int2str.m +++ b/scripts/general/int2str.m @@ -21,9 +21,9 @@ ## @deftypefn {Function File} {} int2str (@var{n}) ## @deftypefnx {Function File} {} num2str (@var{x}, @var{precision}) ## @deftypefnx {Function File} {} num2str (@var{x}, @var{format}) -## Convert a number to a string. These functions are not very flexible, -## but are provided for compatibility with @sc{Matlab}. For better control -## over the results, use @code{sprintf} (@pxref{Formatted Output}). +## Convert a number to a string. This function is not very flexible. +## For better control over the results, use @code{sprintf} +## (@pxref{Formatted Output}). ## @seealso{sprintf, num2str} ## @end deftypefn
--- a/scripts/general/num2str.m +++ b/scripts/general/num2str.m @@ -21,9 +21,9 @@ ## @deftypefn {Function File} {} num2str (@var{n}) ## @deftypefnx {Function File} {} num2str (@var{x}, @var{precision}) ## @deftypefnx {Function File} {} num2str (@var{x}, @var{format}) -## Convert a number to a string. These functions are not very flexible, -## but are provided for compatibility with @sc{Matlab}. For better control -## over the results, use @code{sprintf} (@pxref{Formatted Output}). +## Convert a number to a string. This function is not very flexible. +## For better control over the results, use @code{sprintf} +## (@pxref{Formatted Output}). ## @seealso{sprintf, int2str} ## @end deftypefn
--- a/scripts/miscellaneous/flops.m +++ b/scripts/miscellaneous/flops.m @@ -19,7 +19,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} flops () -## This function is provided for Matlab compatibility, but it doesn't +## This function is provided for @sc{Matlab} compatibility, but it doesn't ## actually do anything. ## @end deftypefn
--- a/scripts/miscellaneous/license.m +++ b/scripts/miscellaneous/license.m @@ -61,7 +61,7 @@ if (isempty (__octave_licenses__)) __octave_licenses__ = cell (); __octave_licenses__{1,1} = "Octave"; - __octave_licenses__{1,2} = "GNU General Public License, Version 2"; + __octave_licenses__{1,2} = "GNU General Public License"; __octave_licenses__{1,3} = true; if (exist ("OCTAVE_FORGE_VERSION")) __octave_licenses__{2,1} = "octave-forge";
--- a/scripts/miscellaneous/pack.m +++ b/scripts/miscellaneous/pack.m @@ -19,7 +19,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} pack () -## This function is provided for compatibility with Matlab, but it +## This function is provided for compatibility with @sc{Matlab}, but it ## doesn't actually do anything. ## @end deftypefn
--- a/scripts/miscellaneous/warning_ids.m +++ b/scripts/miscellaneous/warning_ids.m @@ -77,7 +77,7 @@ ## If the @code{Octave:associativity-change} warning is ## enabled, Octave will warn about possible changes in the meaning of ## some code due to changes in associativity for some operators. -## Associativity changes have typically been made for Matlab +## Associativity changes have typically been made for @sc{Matlab} ## compatibility. By default, the @code{Octave:associativity-change} ## warning is enabled. ## @@ -124,7 +124,7 @@ ## ## @item Octave:matlab-incompatible ## Print warnings for Octave language features that may cause -## compatibility problems with Matlab. +## compatibility problems with @sc{Matlab}. ## ## @item Octave:missing-semicolon ## If the @code{Octave:missing-semicolon} warning is enabled, Octave @@ -162,7 +162,7 @@ ## If the @code{Octave:precedence-change} warning is enabled, Octave ## will warn about possible changes in the meaning of some code due to ## changes in precedence for some operators. Precedence changes have -## typically been made for Matlab compatibility. By default, the +## typically been made for @sc{Matlab} compatibility. By default, the ## @code{Octave:precedence-change} warning is enabled. ## ## @item Octave:reload-forces-clear
--- a/scripts/optimization/glpkmex.m +++ b/scripts/optimization/glpkmex.m @@ -18,7 +18,7 @@ ## 02110-1301, USA. ## -*- texinfo -*- -## @deftypefn {Function File} {[@var{xopt}, @var{fmin}, @var{status}, @var{extra}] =} glpk (@var{sense}, @var{c}, @var{a}, @var{b}, @var{ctype}, @var{lb}, @var{ub}, @var{vartype}, @var{param}, @var{lpsolver}, @var{save_pb}) +## @deftypefn {Function File} {[@var{xopt}, @var{fmin}, @var{status}, @var{extra}] =} glpkmex (@var{sense}, @var{c}, @var{a}, @var{b}, @var{ctype}, @var{lb}, @var{ub}, @var{vartype}, @var{param}, @var{lpsolver}, @var{save_pb}) ## This function is provided for compatibility with the old @sc{Matlab} ## interface to the GNU GLPK library. For Octave code, you should use ## the @code{glpk} function instead.
--- a/scripts/plot/Makefile.in +++ b/scripts/plot/Makefile.in @@ -72,7 +72,6 @@ loglog.m \ loglogerr.m \ mesh.m \ - meshdom.m \ meshgrid.m \ ndgrid.m \ newplot.m \
deleted file mode 100644 --- a/scripts/plot/meshdom.m +++ /dev/null @@ -1,44 +0,0 @@ -## Copyright (C) 1996, 1997 John W. Eaton -## -## This file is part of Octave. -## -## Octave is free software; you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2, or (at your option) -## any later version. -## -## Octave is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, write to the Free -## Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -## 02110-1301, USA. - -## -*- texinfo -*- -## @deftypefn {Function File} {} meshdom (@var{x}, @var{y}) -## Given vectors of @var{x} and @var{y} coordinates, return two matrices -## corresponding to the @var{x} and @var{y} coordinates of the mesh. -## -## Note: this function is provided for compatibility with older versions -## of @sc{Matlab}. You should use @code{meshgrid} instead. -## @end deftypefn - -## Author: jwe - -function [xx, yy] = meshdom (x, y) - - if (nargin == 2) - if (isvector (x) && isvector (y)) - xx = ones (length (y), 1) * x(:).'; - yy = flipud (y(:)) * ones (1, length (x)); - else - error ("meshdom: arguments must be vectors"); - endif - else - print_usage (); - endif - -endfunction
--- a/scripts/time/datestr.m +++ b/scripts/time/datestr.m @@ -21,8 +21,8 @@ ## @deftypefn {Function File} {@var{str} =} datestr (@var{date}, [@var{f}, [@var{p}]]) ## Format the given date/time according to the format @code{f} and return ## the result in @var{str}. @var{date} is a serial date number (see -## @code{datenum}) or a date vector (see @code{datevec}). For compatibility -## with Matlab, @var{date} may also be a string or cell array of strings. +## @code{datenum}) or a date vector (see @code{datevec}). The value of +## @var{date} may also be a string or cell array of strings. ## ## @var{f} can be an integer which corresponds to one of the codes in ## the table below, or a date format string.