octave-lyh: src/xpow.cc comparison

comparison src/xpow.cc @ 4153:6b96ce9f5743

[project @ 2002-11-06 20:38:49 by jwe]

author	jwe
date	Wed, 06 Nov 2002 20:38:50 +0000
parents	7690958e7726
children	79df15d4470c

comparison

equal deleted inserted replaced

-:f14251d33b01
+:6b96ce9f5743
 #include "EIG.h"
 #include "dDiagMatrix.h"
 #include "dMatrix.h"
 #include "mx-cm-cdm.h"
 #include "oct-cmplx.h"
+#include "quit.h"
 #include "error.h"
 #include "oct-obj.h"
 #include "utils.h"
 #include "xpow.h"
 {
 Complex atmp (a);
 ComplexMatrix result (nr, nc);
 for (int j = 0; j < nc; j++)
 	for (int i = 0; i < nr; i++)
-	  result (i, j) = pow (atmp, b (i, j));
+	  {
+	    OCTAVE_QUIT;
+	    result (i, j) = pow (atmp, b (i, j));
+	  }
 retval = result;
 }
 else
 {
 Matrix result (nr, nc);
 for (int j = 0; j < nc; j++)
 	for (int i = 0; i < nr; i++)
-	  result (i, j) = pow (a, b (i, j));
+	  {
+	    OCTAVE_QUIT;
+	    result (i, j) = pow (a, b (i, j));
+	  }
 retval = result;
 }
 return retval;
 ComplexMatrix result (nr, nc);
 Complex atmp (a);
 for (int j = 0; j < nc; j++)
 for (int i = 0; i < nr; i++)
-result (i, j) = pow (atmp, b (i, j));
+{
+	OCTAVE_QUIT;
+	result (i, j) = pow (atmp, b (i, j));
+}
 return result;
 }
 // -*- 3 -*-
 {
 ComplexMatrix result (nr, nc);
 for (int j = 0; j < nc; j++)
 	for (int i = 0; i < nr; i++)
 	  {
+	    OCTAVE_QUIT;
 	    Complex atmp (a (i, j));
 	    result (i, j) = pow (atmp, b);
 	  }
 retval = result;
 else
 {
 Matrix result (nr, nc);
 for (int j = 0; j < nc; j++)
 	for (int i = 0; i < nr; i++)
-	  result (i, j) = pow (a (i, j), b);
+	  {
+	    OCTAVE_QUIT;
+	    result (i, j) = pow (a (i, j), b);
+	  }
 retval = result;
 }
 return retval;
 int convert_to_complex = 0;
 for (int j = 0; j < nc; j++)
 for (int i = 0; i < nr; i++)
 {
+	OCTAVE_QUIT;
 	double atmp = a (i, j);
 	double btmp = b (i, j);
 	if (atmp < 0.0 && static_cast<int> (btmp) != btmp)
 	  {
 	    convert_to_complex = 1;
 ComplexMatrix complex_result (nr, nc);
 for (int j = 0; j < nc; j++)
 	for (int i = 0; i < nr; i++)
 	  {
+	    OCTAVE_QUIT;
 	    Complex atmp (a (i, j));
 	    Complex btmp (b (i, j));
 	    complex_result (i, j) = pow (atmp, btmp);
 	  }
 {
 Matrix result (nr, nc);
 for (int j = 0; j < nc; j++)
 	for (int i = 0; i < nr; i++)
-	  result (i, j) = pow (a (i, j), b (i, j));
+	  {
+	    OCTAVE_QUIT;
+	    result (i, j) = pow (a (i, j), b (i, j));
+	  }
 retval = result;
 }
 return retval;
 octave_value
 elem_xpow (const Matrix& a, const Complex& b)
 {
 int nr = a.rows ();
 int nc = a.cols ();
-ComplexMatrix result (nr, nc);
-for (int j = 0; j < nc; j++)
-for (int i = 0; i < nr; i++)
-result (i, j) = pow (Complex (a (i, j)), b);
-return result;
-}
-// -*- 6 -*-
-octave_value
-elem_xpow (const Matrix& a, const ComplexMatrix& b)
-{
-int nr = a.rows ();
-int nc = a.cols ();
-int b_nr = b.rows ();
-int b_nc = b.cols ();
-if (nr != b_nr || nc != b_nc)
-{
-gripe_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
-return octave_value ();
-}
-ComplexMatrix result (nr, nc);
-for (int j = 0; j < nc; j++)
-for (int i = 0; i < nr; i++)
-result (i, j) = pow (Complex (a (i, j)), b (i, j));
-return result;
-}
-// -*- 7 -*-
-octave_value
-elem_xpow (const Complex& a, const Matrix& b)
-{
-int nr = b.rows ();
-int nc = b.cols ();
 ComplexMatrix result (nr, nc);
 for (int j = 0; j < nc; j++)
 for (int i = 0; i < nr; i++)
 {
+	OCTAVE_QUIT;
+	result (i, j) = pow (Complex (a (i, j)), b);
+}
+return result;
+}
+// -*- 6 -*-
+octave_value
+elem_xpow (const Matrix& a, const ComplexMatrix& b)
+{
+int nr = a.rows ();
+int nc = a.cols ();
+int b_nr = b.rows ();
+int b_nc = b.cols ();
+if (nr != b_nr || nc != b_nc)
+{
+gripe_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
+return octave_value ();
+}
+ComplexMatrix result (nr, nc);
+for (int j = 0; j < nc; j++)
+for (int i = 0; i < nr; i++)
+{
+	OCTAVE_QUIT;
+	result (i, j) = pow (Complex (a (i, j)), b (i, j));
+}
+return result;
+}
+// -*- 7 -*-
+octave_value
+elem_xpow (const Complex& a, const Matrix& b)
+{
+int nr = b.rows ();
+int nc = b.cols ();
+ComplexMatrix result (nr, nc);
+for (int j = 0; j < nc; j++)
+for (int i = 0; i < nr; i++)
+{
+	OCTAVE_QUIT;
 	double btmp = b (i, j);
 	if (xisint (btmp))
 	  result (i, j) = pow (a, static_cast<int> (btmp));
 	else
 	  result (i, j) = pow (a, btmp);
 int nc = b.cols ();
 ComplexMatrix result (nr, nc);
 for (int j = 0; j < nc; j++)
 for (int i = 0; i < nr; i++)
-result (i, j) = pow (a, b (i, j));
+{
+	OCTAVE_QUIT;
+	result (i, j) = pow (a, b (i, j));
+}
 return result;
 }
 // -*- 9 -*-
 if (xisint (b))
 {
 for (int j = 0; j < nc; j++)
 	for (int i = 0; i < nr; i++)
-	  result (i, j) = pow (a (i, j), static_cast<int> (b));
+	  {
+	    OCTAVE_QUIT;
+	    result (i, j) = pow (a (i, j), static_cast<int> (b));
+	  }
 }
 else
 {
 for (int j = 0; j < nc; j++)
 	for (int i = 0; i < nr; i++)
-	  result (i, j) = pow (a (i, j), b);
+	  {
+	    OCTAVE_QUIT;
+	    result (i, j) = pow (a (i, j), b);
+	  }
 }
 return result;
 }
 ComplexMatrix result (nr, nc);
 for (int j = 0; j < nc; j++)
 for (int i = 0; i < nr; i++)
 {
+	OCTAVE_QUIT;
 	double btmp = b (i, j);
 	if (xisint (btmp))
 	  result (i, j) = pow (a (i, j), static_cast<int> (btmp));
 	else
 	  result (i, j) = pow (a (i, j), btmp);
 int nc = a.cols ();
 ComplexMatrix result (nr, nc);
 for (int j = 0; j < nc; j++)
 for (int i = 0; i < nr; i++)
-result (i, j) = pow (a (i, j), b);
+{
+	OCTAVE_QUIT;
+	result (i, j) = pow (a (i, j), b);
+}
 return result;
 }
 // -*- 12 -*-
 }
 ComplexMatrix result (nr, nc);
 for (int j = 0; j < nc; j++)
 for (int i = 0; i < nr; i++)
-result (i, j) = pow (a (i, j), b (i, j));
+{
+	OCTAVE_QUIT;
+	result (i, j) = pow (a (i, j), b (i, j));
+}
 return result;
 }
 /*

Mercurial > hg > octave-lyh

comparison src/xpow.cc @ 4153:6b96ce9f5743