Mercurial > hg > octave-lyh

diff liboctave/dSparse.cc @ 10142:829e69ec3110

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make OCTAVE_QUIT a function
author Jaroslav Hajek <highegg@gmail.com>
date Wed, 20 Jan 2010 10:38:00 +0100
parents aabf7a8c2e57
children 4c0cdbe0acca
line wrap: on
line diff
--- a/liboctave/dSparse.cc
+++ b/liboctave/dSparse.cc
@@ -754,7 +754,7 @@
            
 	      while (ja_lt_max || jb_lt_max )
 		{
-		  OCTAVE_QUIT;
+		  octave_quit ();
 		  if ((! jb_lt_max) ||
                       (ja_lt_max && (x.ridx(ja) < y.ridx(jb))))
 		    {
@@ -922,7 +922,7 @@
 
 	      for (octave_idx_type i = 0; i < nr; i++)
 		{
-		  OCTAVE_QUIT;
+		  octave_quit ();
 		  // place the 1 in the identity position
 		  octave_idx_type cx_colstart = cx;
 	  
@@ -955,7 +955,7 @@
 
 		      do
 			{
-			  OCTAVE_QUIT;
+			  octave_quit ();
 			  rpX = retval.xridx(colXp);
 			  rpU = ridx(colUp);
 
@@ -1045,7 +1045,7 @@
 
 	      for (octave_idx_type i = 0; i < nr; i++)
 		{
-		  OCTAVE_QUIT;
+		  octave_quit ();
 		  octave_idx_type iidx = rperm[i];
 
 		  for (octave_idx_type j = 0; j < nr; j++)
@@ -1063,7 +1063,7 @@
 		      for (octave_idx_type k = cidx(jidx); 
 			   k < cidx(jidx+1); k++)
 			{
-			  OCTAVE_QUIT;
+			  octave_quit ();
 			  v -= work[ridx(k)] * data(k);
 			}
 
@@ -7573,7 +7573,7 @@
    // add one to the printed indices to go from
    //  zero-based to one-based arrays
    for (octave_idx_type j = 0; j < nc; j++)  {
-      OCTAVE_QUIT;
+      octave_quit ();
       for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) {
 	os << a.ridx(i) + 1 << " "  << j + 1 << " ";
 	octave_write_double (os, a.data(i));
@@ -7821,7 +7821,7 @@
            
 	      while (ja_lt_max || jb_lt_max )
 		{
-		  OCTAVE_QUIT;
+		  octave_quit ();
 		  if ((! jb_lt_max) ||
                       (ja_lt_max && (a.ridx(ja) < b.ridx(jb))))
 		    {
@@ -7971,7 +7971,7 @@
            
 	      while (ja_lt_max || jb_lt_max )
 		{
-		  OCTAVE_QUIT;
+		  octave_quit ();
 		  if ((! jb_lt_max) ||
                       (ja_lt_max && (a.ridx(ja) < b.ridx(jb))))
 		    {