[Octave-cvsupdate] SF.net SVN: octave:[10221] trunk/octave-forge/main/odepkg/inst

[<tr...@us...>]

Revision: 10221
          http://octave.svn.sourceforge.net/octave/?rev=10221&view=rev
Author:   treichl
Date:     2012-04-15 09:32:33 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Changed all occurences of "ismatrix" to "insnumeric" because of Matlab compatibility.

Modified Paths:
--------------
    trunk/octave-forge/main/odepkg/inst/ode23.m
    trunk/octave-forge/main/odepkg/inst/ode23d.m
    trunk/octave-forge/main/odepkg/inst/ode45.m
    trunk/octave-forge/main/odepkg/inst/ode45d.m
    trunk/octave-forge/main/odepkg/inst/ode54.m
    trunk/octave-forge/main/odepkg/inst/ode54d.m
    trunk/octave-forge/main/odepkg/inst/ode78.m
    trunk/octave-forge/main/odepkg/inst/ode78d.m
    trunk/octave-forge/main/odepkg/inst/odepkg_structure_check.m
    trunk/octave-forge/main/odepkg/inst/odeplot.m
    trunk/octave-forge/main/odepkg/inst/odeprint.m

Modified: trunk/octave-forge/main/odepkg/inst/ode23.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/ode23.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/ode23.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -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

Modified: trunk/octave-forge/main/odepkg/inst/ode23d.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/ode23d.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/ode23d.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -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

Modified: trunk/octave-forge/main/odepkg/inst/ode45.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/ode45.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/ode45.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -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

Modified: trunk/octave-forge/main/odepkg/inst/ode45d.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/ode45d.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/ode45d.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -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

Modified: trunk/octave-forge/main/odepkg/inst/ode54.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/ode54.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/ode54.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -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

Modified: trunk/octave-forge/main/odepkg/inst/ode54d.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/ode54d.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/ode54d.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -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

Modified: trunk/octave-forge/main/odepkg/inst/ode78.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/ode78.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/ode78.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -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

Modified: trunk/octave-forge/main/odepkg/inst/ode78d.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/ode78d.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/ode78d.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -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

Modified: trunk/octave-forge/main/odepkg/inst/odepkg_structure_check.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/odepkg_structure_check.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/odepkg_structure_check.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -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', ...

Modified: trunk/octave-forge/main/odepkg/inst/odeplot.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/odeplot.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/odeplot.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -70,4 +70,4 @@
 
 %# Local Variables: ***
 %# mode: octave ***
-%# End: ***
\ No newline at end of file
+%# End: ***

Modified: trunk/octave-forge/main/odepkg/inst/odeprint.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/odeprint.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/odeprint.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -62,4 +62,4 @@
 
 %# Local Variables: ***
 %# mode: octave ***
-%# End: ***
\ No newline at end of file
+%# End: ***

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.