Mercurial > octave-nkf

changeset 9714:0407883e1a33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
support nocompute option to matrix_type
author Jaroslav Hajek <highegg@gmail.com>
date Mon, 12 Oct 2009 11:50:12 +0200
parents 7918eb15040c
children 9f27172fbd1e
files src/ChangeLog src/DLD-FUNCTIONS/matrix_type.cc
diffstat 2 files changed, 21 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Oct 12 10:42:49 2009 +0200
+++ b/src/ChangeLog	Mon Oct 12 11:50:12 2009 +0200
@@ -1,3 +1,8 @@
+2009-10-12  Jaroslav Hajek  <highegg@gmail.com>
+
+	* DLD-FUNCTIONS/matrix_type.cc (Fmatrix_type): Support 'nocompute'
+	option.
+
 2009-10-08  Jaroslav Hajek  <highegg@gmail.com>
 
 	* DLD-FUNCTIONS/lu.cc (Fluupdate): New DEFUN_DLD.
--- a/src/DLD-FUNCTIONS/matrix_type.cc	Mon Oct 12 10:42:49 2009 +0200
+++ b/src/DLD-FUNCTIONS/matrix_type.cc	Mon Oct 12 11:50:12 2009 +0200
@@ -39,6 +39,7 @@
 DEFUN_DLD (matrix_type, args, ,
   "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {@var{type} =} matrix_type (@var{a})\n\
+@deftypefnx {Loadable Function} {@var{type} =} matrix_type (@var{a}, 'nocompute')\n\
 @deftypefnx {Loadable Function} {@var{a} =} matrix_type (@var{a}, @var{type})\n\
 @deftypefnx {Loadable Function} {@var{a} =} matrix_type (@var{a}, 'upper', @var{perm})\n\
 @deftypefnx {Loadable Function} {@var{a} =} matrix_type (@var{a}, 'lower', @var{perm})\n\
@@ -49,6 +50,9 @@
 future use.  Called with more than one argument, @code{matrix_type} allows the type\n\
 of the matrix to be defined.\n\
 \n\
+If the option 'nocompute' is given, the function will not attempt to guess the type if it is\n\
+still unknown. This is useful for debugging purposes.\n\
+\n\
 The possible matrix types depend on whether the matrix is full or sparse, and can be\n\
 one of the following\n\
 \n\
@@ -117,10 +121,17 @@
     error ("matrix_type: incorrect number of arguments");
   else
     {
+      bool autocomp = true;
+      if (nargin == 2 && args(1).is_string () && args(1).string_value () == "nocompute")
+        {
+          nargin = 1;
+          autocomp = false;
+        }
+
       if (args(0).is_scalar_type())
 	{
 	  if (nargin == 1)
-	    retval = octave_value ("Full");
+	    retval = octave_value ("Diagonal");
 	  else
 	    retval = args(0);
 	}
@@ -134,7 +145,7 @@
 		{
 		  mattyp = args(0).matrix_type ();
 
-		  if (mattyp.is_unknown ())
+		  if (mattyp.is_unknown () && autocomp )
 		    {
 		      SparseComplexMatrix m = 
 			args(0).sparse_complex_matrix_value ();
@@ -149,7 +160,7 @@
 		{
 		  mattyp = args(0).matrix_type ();
 
-		  if (mattyp.is_unknown ())
+		  if (mattyp.is_unknown () && autocomp)
 		    {
 		      SparseMatrix m = args(0).sparse_matrix_value ();
 		      if (!error_state)
@@ -194,7 +205,6 @@
 	      else if (typ == MatrixType::Full)
 		retval = octave_value ("Full");
 	      else
-		// This should never happen!!!
 		retval = octave_value ("Unknown");
 	    }
 	  else
@@ -320,7 +330,7 @@
 		{
 		  mattyp = args(0).matrix_type ();
 
-		  if (mattyp.is_unknown ())
+		  if (mattyp.is_unknown () && autocomp)
 		    {
 		      if (args(0).is_single_type ())
 			{
@@ -346,7 +356,7 @@
 		{
 		  mattyp = args(0).matrix_type ();
 
-		  if (mattyp.is_unknown ())
+		  if (mattyp.is_unknown () && autocomp)
 		    {
 		      if (args(0).is_single_type ())
 			{
@@ -391,7 +401,6 @@
 	      else if (typ == MatrixType::Full)
 		retval = octave_value ("Full");
 	      else
-		// This should never happen!!!
 		retval = octave_value ("Unknown");
 	    }
 	  else