Mercurial > forge
changeset 10035:f056896cc06f octave-forge
Changed all occurences of "ismatrix" to "insnumeric" because of Matlab compatibility.
| author | treichl |
|---|---|
| date | Sun, 15 Apr 2012 09:32:33 +0000 |
| parents | fdb2ed080606 |
| children | 37d9084c34c8 |
| files | main/odepkg/inst/ode23.m main/odepkg/inst/ode23d.m main/odepkg/inst/ode45.m main/odepkg/inst/ode45d.m main/odepkg/inst/ode54.m main/odepkg/inst/ode54d.m main/odepkg/inst/ode78.m main/odepkg/inst/ode78d.m main/odepkg/inst/odepkg_structure_check.m main/odepkg/inst/odeplot.m main/odepkg/inst/odeprint.m |
| diffstat | 11 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/main/odepkg/inst/ode23.m Sun Apr 15 09:15:55 2012 +0000 +++ b/main/odepkg/inst/ode23.m Sun Apr 15 09:32:33 2012 +0000 @@ -223,7 +223,7 @@ %# Implementation of the option Mass has been finished. This option %# can be set by the user to another value than default value. - if (~isempty (vodeoptions.Mass) && ismatrix (vodeoptions.Mass)) + if (~isempty (vodeoptions.Mass) && isnumeric (vodeoptions.Mass)) vhavemasshandle = false; vmass = vodeoptions.Mass; %# constant mass elseif (isa (vodeoptions.Mass, 'function_handle')) vhavemasshandle = true; %# mass defined by a function handle
--- a/main/odepkg/inst/ode23d.m Sun Apr 15 09:15:55 2012 +0000 +++ b/main/odepkg/inst/ode23d.m Sun Apr 15 09:32:33 2012 +0000 @@ -260,7 +260,7 @@ %# Implementation of the option Mass has been finished. This option %# can be set by the user to another value than default value. - if (~isempty (vodeoptions.Mass) && ismatrix (vodeoptions.Mass)) + if (~isempty (vodeoptions.Mass) && isnumeric (vodeoptions.Mass)) vhavemasshandle = false; vmass = vodeoptions.Mass; %# constant mass elseif (isa (vodeoptions.Mass, 'function_handle')) vhavemasshandle = true; %# mass defined by a function handle
--- a/main/odepkg/inst/ode45.m Sun Apr 15 09:15:55 2012 +0000 +++ b/main/odepkg/inst/ode45.m Sun Apr 15 09:32:33 2012 +0000 @@ -223,7 +223,7 @@ %# Implementation of the option Mass has been finished. This option %# can be set by the user to another value than default value. - if (~isempty (vodeoptions.Mass) && ismatrix (vodeoptions.Mass)) + if (~isempty (vodeoptions.Mass) && isnumeric (vodeoptions.Mass)) vhavemasshandle = false; vmass = vodeoptions.Mass; %# constant mass elseif (isa (vodeoptions.Mass, 'function_handle')) vhavemasshandle = true; %# mass defined by a function handle
--- a/main/odepkg/inst/ode45d.m Sun Apr 15 09:15:55 2012 +0000 +++ b/main/odepkg/inst/ode45d.m Sun Apr 15 09:32:33 2012 +0000 @@ -260,7 +260,7 @@ %# Implementation of the option Mass has been finished. This option %# can be set by the user to another value than default value. - if (~isempty (vodeoptions.Mass) && ismatrix (vodeoptions.Mass)) + if (~isempty (vodeoptions.Mass) && isnumeric (vodeoptions.Mass)) vhavemasshandle = false; vmass = vodeoptions.Mass; %# constant mass elseif (isa (vodeoptions.Mass, 'function_handle')) vhavemasshandle = true; %# mass defined by a function handle
--- a/main/odepkg/inst/ode54.m Sun Apr 15 09:15:55 2012 +0000 +++ b/main/odepkg/inst/ode54.m Sun Apr 15 09:32:33 2012 +0000 @@ -224,7 +224,7 @@ %# Implementation of the option Mass has been finished. This option %# can be set by the user to another value than default value. - if (~isempty (vodeoptions.Mass) && ismatrix (vodeoptions.Mass)) + if (~isempty (vodeoptions.Mass) && isnumeric (vodeoptions.Mass)) vhavemasshandle = false; vmass = vodeoptions.Mass; %# constant mass elseif (isa (vodeoptions.Mass, 'function_handle')) vhavemasshandle = true; %# mass defined by a function handle
--- a/main/odepkg/inst/ode54d.m Sun Apr 15 09:15:55 2012 +0000 +++ b/main/odepkg/inst/ode54d.m Sun Apr 15 09:32:33 2012 +0000 @@ -260,7 +260,7 @@ %# Implementation of the option Mass has been finished. This option %# can be set by the user to another value than default value. - if (~isempty (vodeoptions.Mass) && ismatrix (vodeoptions.Mass)) + if (~isempty (vodeoptions.Mass) && isnumeric (vodeoptions.Mass)) vhavemasshandle = false; vmass = vodeoptions.Mass; %# constant mass elseif (isa (vodeoptions.Mass, 'function_handle')) vhavemasshandle = true; %# mass defined by a function handle
--- a/main/odepkg/inst/ode78.m Sun Apr 15 09:15:55 2012 +0000 +++ b/main/odepkg/inst/ode78.m Sun Apr 15 09:32:33 2012 +0000 @@ -224,7 +224,7 @@ %# Implementation of the option Mass has been finished. This option %# can be set by the user to another value than default value. - if (~isempty (vodeoptions.Mass) && ismatrix (vodeoptions.Mass)) + if (~isempty (vodeoptions.Mass) && isnumeric (vodeoptions.Mass)) vhavemasshandle = false; vmass = vodeoptions.Mass; %# constant mass elseif (isa (vodeoptions.Mass, 'function_handle')) vhavemasshandle = true; %# mass defined by a function handle
--- a/main/odepkg/inst/ode78d.m Sun Apr 15 09:15:55 2012 +0000 +++ b/main/odepkg/inst/ode78d.m Sun Apr 15 09:32:33 2012 +0000 @@ -260,7 +260,7 @@ %# Implementation of the option Mass has been finished. This option %# can be set by the user to another value than default value. - if (~isempty (vodeoptions.Mass) && ismatrix (vodeoptions.Mass)) + if (~isempty (vodeoptions.Mass) && isnumeric (vodeoptions.Mass)) vhavemasshandle = false; vmass = vodeoptions.Mass; %# constant mass elseif (isa (vodeoptions.Mass, 'function_handle')) vhavemasshandle = true; %# mass defined by a function handle
--- a/main/odepkg/inst/odepkg_structure_check.m Sun Apr 15 09:15:55 2012 +0000 +++ b/main/odepkg/inst/odepkg_structure_check.m Sun Apr 15 09:32:33 2012 +0000 @@ -186,7 +186,7 @@ case 'Jacobian' if (isempty (vret.(vfld{vcntarg})) || ... - ismatrix (vret.(vfld{vcntarg})) || ... + isnumeric (vret.(vfld{vcntarg})) || ... isa (vret.(vfld{vcntarg}), 'function_handle') || ... iscell (vret.(vfld{vcntarg}))) else @@ -198,7 +198,7 @@ case 'JPattern' if (isempty (vret.(vfld{vcntarg})) || ... isvector (vret.(vfld{vcntarg})) || ... - ismatrix (vret.(vfld{vcntarg}))) + isnumeric (vret.(vfld{vcntarg}))) else error ('OdePkg:InvalidParameter', ... 'Unknown parameter name "%s" or no valid parameter value', ... @@ -216,7 +216,7 @@ case 'Mass' if (isempty (vret.(vfld{vcntarg})) || ... - ismatrix (vret.(vfld{vcntarg})) || ... + isnumeric (vret.(vfld{vcntarg})) || ... isa (vret.(vfld{vcntarg}), 'function_handle')) else error ('OdePkg:InvalidParameter', ... @@ -237,7 +237,7 @@ case 'MvPattern' if (isempty (vret.(vfld{vcntarg})) || ... isvector (vret.(vfld{vcntarg})) || ... - ismatrix (vret.(vfld{vcntarg}))) + isnumeric (vret.(vfld{vcntarg}))) else error ('OdePkg:InvalidParameter', ... 'Unknown parameter name "%s" or no valid parameter value', ...