octave-nkf: src/sparse-xpow.cc comparison

comparison src/sparse-xpow.cc @ 5275:23b37da9fd5b

[project @ 2005-04-08 16:07:35 by jwe]

author	jwe
date	Fri, 08 Apr 2005 16:07:37 +0000
parents	57077d0ddc8e
children	4c8a2e4e0717

comparison

equal deleted inserted replaced

-:eae7b40388e9
+:23b37da9fd5b
 octave_value
 xpow (const SparseMatrix& a, double b)
 {
 octave_value retval;
-int nr = a.rows ();
+octave_idx_type nr = a.rows ();
-int nc = a.cols ();
+octave_idx_type nc = a.cols ();
 if (nr == 0 || nc == 0 || nr != nc)
 error ("for A^b, A must be square");
 else
 {
 	{
 	  int btmp = static_cast<int> (b);
 	  if (btmp == 0)
 	    {
 	      SparseMatrix tmp = SparseMatrix (nr, nr, nr);
-	      for (int i = 0; i < nr; i++)
+	      for (octave_idx_type i = 0; i < nr; i++)
 		{
 		  tmp.data (i) = 1.0;
 		  tmp.ridx (i) = i;
 		}
-	      for (int i = 0; i < nr + 1; i++)
+	      for (octave_idx_type i = 0; i < nr + 1; i++)
 		tmp.cidx (i) = i;
 	      retval = tmp;
 	    }
 	  else
 	      SparseMatrix atmp;
 	      if (btmp < 0)
 		{
 		  btmp = -btmp;
-		  int info;
+		  octave_idx_type info;
 		  double rcond = 0.0;
 		  atmp = a.inverse (info, rcond, 1);
 		  if (info == -1)
 octave_value
 xpow (const SparseComplexMatrix& a, double b)
 {
 octave_value retval;
-int nr = a.rows ();
+octave_idx_type nr = a.rows ();
-int nc = a.cols ();
+octave_idx_type nc = a.cols ();
 if (nr == 0 || nc == 0 || nr != nc)
 error ("for A^b, A must be square");
 else
 {
 	{
 	  int btmp = static_cast<int> (b);
 	  if (btmp == 0)
 	    {
 	      SparseMatrix tmp = SparseMatrix (nr, nr, nr);
-	      for (int i = 0; i < nr; i++)
+	      for (octave_idx_type i = 0; i < nr; i++)
 		{
 		  tmp.data (i) = 1.0;
 		  tmp.ridx (i) = i;
 		}
-	      for (int i = 0; i < nr + 1; i++)
+	      for (octave_idx_type i = 0; i < nr + 1; i++)
 		tmp.cidx (i) = i;
 	      retval = tmp;
 	    }
 	  else
 	      SparseComplexMatrix atmp;
 	      if (btmp < 0)
 		{
 		  btmp = -btmp;
-		  int info;
+		  octave_idx_type info;
 		  double rcond = 0.0;
 		  atmp = a.inverse (info, rcond, 1);
 		  if (info == -1)
 octave_value
 elem_xpow (double a, const SparseMatrix& b)
 {
 octave_value retval;
-int nr = b.rows ();
+octave_idx_type nr = b.rows ();
-int nc = b.cols ();
+octave_idx_type nc = b.cols ();
 double d1, d2;
 if (a < 0.0 && ! b.all_integers (d1, d2))
 {
 Complex atmp (a);
 ComplexMatrix result (nr, nc);
-for (int j = 0; j < nc; j++)
+for (octave_idx_type j = 0; j < nc; j++)
 	{
-	  for (int i = 0; i < nr; i++)
+	  for (octave_idx_type i = 0; i < nr; i++)
 	    {
 	      OCTAVE_QUIT;
 	      result (i, j) = pow (atmp, b(i,j));
 	    }
 	}
 }
 else
 {
 Matrix result (nr, nc);
-for (int j = 0; j < nc; j++)
+for (octave_idx_type j = 0; j < nc; j++)
 	{
-	  for (int i = 0; i < nr; i++)
+	  for (octave_idx_type i = 0; i < nr; i++)
 	    {
 	      OCTAVE_QUIT;
 	      result (i, j) = pow (a, b(i,j));
 	    }
 	}
 // -*- 2 -*-
 octave_value
 elem_xpow (double a, const SparseComplexMatrix& b)
 {
-int nr = b.rows ();
+octave_idx_type nr = b.rows ();
-int nc = b.cols ();
+octave_idx_type nc = b.cols ();
 Complex atmp (a);
 ComplexMatrix result (nr, nc);
-for (int j = 0; j < nc; j++)
+for (octave_idx_type j = 0; j < nc; j++)
 {
-for (int i = 0; i < nr; i++)
+for (octave_idx_type i = 0; i < nr; i++)
 	{
 	  OCTAVE_QUIT;
 	  result (i, j) = pow (atmp, b(i,j));
 	}
 }
 // sparse matrix with same structure as a, which is strictly
 // incorrect. Keep compatiability.
 octave_value retval;
-int nz = a.nnz ();
+octave_idx_type nz = a.nnz ();
 if (b <= 0.0)
 {
-int nr = a.rows ();
+octave_idx_type nr = a.rows ();
-int nc = a.cols ();
+octave_idx_type nc = a.cols ();
 if (static_cast<int> (b) != b && a.any_element_is_negative ())
 	{
 	  ComplexMatrix result (nr, nc, Complex (pow (0.0, b)));
 	  // XXX FIXME XXX -- avoid apparent GNU libm bug by
 	  // converting A and B to complex instead of just A.
 	  Complex btmp (b);
-	  for (int j = 0; j < nc; j++)
+	  for (octave_idx_type j = 0; j < nc; j++)
-	    for (int i = a.cidx(j); i < a.cidx(j+1); i++)
+	    for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++)
 	      {
 		OCTAVE_QUIT;
 		Complex atmp (a.data (i));
 	}
 else
 	{
 	  Matrix result (nr, nc, (pow (0.0, b)));
-	  for (int j = 0; j < nc; j++)
+	  for (octave_idx_type j = 0; j < nc; j++)
-	    for (int i = a.cidx(j); i < a.cidx(j+1); i++)
+	    for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++)
 	      {
 		OCTAVE_QUIT;
 		result (a.ridx(i), j) = pow (a.data (i), b);
 	      }
 }
 else if (static_cast<int> (b) != b && a.any_element_is_negative ())
 {
 SparseComplexMatrix result (a);
-for (int i = 0; i < nz; i++)
+for (octave_idx_type i = 0; i < nz; i++)
 	{
 	  OCTAVE_QUIT;
 	  // XXX FIXME XXX -- avoid apparent GNU libm bug by
 	  // converting A and B to complex instead of just A.
 }
 else
 {
 SparseMatrix result (a);
-for (int i = 0; i < nz; i++)
+for (octave_idx_type i = 0; i < nz; i++)
 	{
 	  OCTAVE_QUIT;
 	  result.data (i) = pow (a.data (i), b);
 	}
 octave_value
 elem_xpow (const SparseMatrix& a, const SparseMatrix& b)
 {
 octave_value retval;
-int nr = a.rows ();
+octave_idx_type nr = a.rows ();
-int nc = a.cols ();
+octave_idx_type nc = a.cols ();
-int b_nr = b.rows ();
+octave_idx_type b_nr = b.rows ();
-int b_nc = b.cols ();
+octave_idx_type b_nc = b.cols ();
 if (nr != b_nr || nc != b_nc)
 {
 gripe_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
 return octave_value ();
 }
 int convert_to_complex = 0;
-for (int j = 0; j < nc; j++)
+for (octave_idx_type j = 0; j < nc; j++)
-for (int i = 0; i < nr; i++)
+for (octave_idx_type 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)
 	  }
 }
 done:
-int nel = 0;
+octave_idx_type nel = 0;
-for (int j = 0; j < nc; j++)
+for (octave_idx_type j = 0; j < nc; j++)
-for (int i = 0; i < nr; i++)
+for (octave_idx_type i = 0; i < nr; i++)
 if (!(a.elem (i, j) == 0. && b.elem (i, j) != 0.))
 	nel++;
 if (convert_to_complex)
 {
 SparseComplexMatrix complex_result (nr, nc, nel);
-int ii = 0;
+octave_idx_type ii = 0;
 complex_result.cidx(0) = 0;
-for (int j = 0; j < nc; j++)
+for (octave_idx_type j = 0; j < nc; j++)
 	{
-	  for (int i = 0; i < nr; i++)
+	  for (octave_idx_type i = 0; i < nr; i++)
 	    {
 	      OCTAVE_QUIT;
 	      Complex atmp (a (i, j));
 	      Complex btmp (b (i, j));
 	      Complex tmp =  pow (atmp, btmp);
 retval = complex_result;
 }
 else
 {
 SparseMatrix result (nr, nc, nel);
-int ii = 0;
+octave_idx_type ii = 0;
 result.cidx (0) = 0;
-for (int j = 0; j < nc; j++)
+for (octave_idx_type j = 0; j < nc; j++)
 	{
-	  for (int i = 0; i < nr; i++)
+	  for (octave_idx_type i = 0; i < nr; i++)
 	    {
 	      OCTAVE_QUIT;
 	      double tmp = pow (a (i, j), b (i, j));
 	      if (tmp != 0.)
 		{
 if (b == 0.0)
 // Can this case ever happen, due to automatic retyping with maybe_mutate?
 retval = octave_value (NDArray (a.dims (), 1));
 else
 {
-int nz = a.nnz ();
+octave_idx_type nz = a.nnz ();
 SparseComplexMatrix result (a);
-for (int i = 0; i < nz; i++)
+for (octave_idx_type i = 0; i < nz; i++)
 	{
 	  OCTAVE_QUIT;
 	  result.data (i) = pow (Complex (a.data (i)), b);
 	}
 // -*- 6 -*-
 octave_value
 elem_xpow (const SparseMatrix& a, const SparseComplexMatrix& b)
 {
-int nr = a.rows ();
+octave_idx_type nr = a.rows ();
-int nc = a.cols ();
+octave_idx_type nc = a.cols ();
-int b_nr = b.rows ();
+octave_idx_type b_nr = b.rows ();
-int b_nc = b.cols ();
+octave_idx_type b_nc = b.cols ();
 if (nr != b_nr || nc != b_nc)
 {
 gripe_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
 return octave_value ();
 }
-int nel = 0;
+octave_idx_type nel = 0;
-for (int j = 0; j < nc; j++)
+for (octave_idx_type j = 0; j < nc; j++)
-for (int i = 0; i < nr; i++)
+for (octave_idx_type i = 0; i < nr; i++)
 if (!(a.elem (i, j) == 0. && b.elem (i, j) != 0.))
 	nel++;
 SparseComplexMatrix result (nr, nc, nel);
-int ii = 0;
+octave_idx_type ii = 0;
 result.cidx(0) = 0;
-for (int j = 0; j < nc; j++)
+for (octave_idx_type j = 0; j < nc; j++)
 {
-for (int i = 0; i < nr; i++)
+for (octave_idx_type i = 0; i < nr; i++)
 	{
 	  OCTAVE_QUIT;
 	  Complex tmp = pow (Complex (a (i, j)), b (i, j));
 	  if (tmp != 0.)
 	    {
 // -*- 7 -*-
 octave_value
 elem_xpow (const Complex& a, const SparseMatrix& b)
 {
-int nr = b.rows ();
+octave_idx_type nr = b.rows ();
-int nc = b.cols ();
+octave_idx_type nc = b.cols ();
 ComplexMatrix result (nr, nc);
-for (int j = 0; j < nc; j++)
+for (octave_idx_type j = 0; j < nc; j++)
 {
-for (int i = 0; i < nr; i++)
+for (octave_idx_type i = 0; i < nr; i++)
 	{
 	  OCTAVE_QUIT;
 	  double btmp = b (i, j);
 	  if (xisint (btmp))
 	    result (i, j) = pow (a, static_cast<int> (btmp));
 // -*- 8 -*-
 octave_value
 elem_xpow (const Complex& a, const SparseComplexMatrix& b)
 {
-int nr = b.rows ();
+octave_idx_type nr = b.rows ();
-int nc = b.cols ();
+octave_idx_type nc = b.cols ();
 ComplexMatrix result (nr, nc);
-for (int j = 0; j < nc; j++)
+for (octave_idx_type j = 0; j < nc; j++)
-for (int i = 0; i < nr; i++)
+for (octave_idx_type i = 0; i < nr; i++)
 {
 	OCTAVE_QUIT;
 	result (i, j) = pow (a, b (i, j));
 }
 {
 octave_value retval;
 if (b <= 0)
 {
-int nr = a.rows ();
+octave_idx_type nr = a.rows ();
-int nc = a.cols ();
+octave_idx_type nc = a.cols ();
 ComplexMatrix result (nr, nc, Complex (pow (0.0, b)));
 if (xisint (b))
 	{
-	  for (int j = 0; j < nc; j++)
+	  for (octave_idx_type j = 0; j < nc; j++)
-	    for (int i = a.cidx(j); i < a.cidx(j+1); i++)
+	    for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++)
 	      {
 		OCTAVE_QUIT;
 		result (a.ridx(i), j) =
 		  pow (a.data (i), static_cast<int> (b));
 	      }
 	}
 else
 	{
-	  for (int j = 0; j < nc; j++)
+	  for (octave_idx_type j = 0; j < nc; j++)
-	    for (int i = a.cidx(j); i < a.cidx(j+1); i++)
+	    for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++)
 	      {
 		OCTAVE_QUIT;
 		result (a.ridx(i), j) = pow (a.data (i), b);
 	      }
 	}
 retval = result;
 }
 else
 {
-int nz = a.nnz ();
+octave_idx_type nz = a.nnz ();
 SparseComplexMatrix result (a);
 if (xisint (b))
 	{
-	  for (int i = 0; i < nz; i++)
+	  for (octave_idx_type i = 0; i < nz; i++)
 	    {
 	      OCTAVE_QUIT;
 	      result.data (i) = pow (a.data (i), static_cast<int> (b));
 	    }
 	}
 else
 	{
-	  for (int i = 0; i < nz; i++)
+	  for (octave_idx_type i = 0; i < nz; i++)
 	    {
 	      OCTAVE_QUIT;
 	      result.data (i) = pow (a.data (i), b);
 	    }
 	}
 // -*- 10 -*-
 octave_value
 elem_xpow (const SparseComplexMatrix& a, const SparseMatrix& b)
 {
-int nr = a.rows ();
+octave_idx_type nr = a.rows ();
-int nc = a.cols ();
+octave_idx_type nc = a.cols ();
-int b_nr = b.rows ();
+octave_idx_type b_nr = b.rows ();
-int b_nc = b.cols ();
+octave_idx_type b_nc = b.cols ();
 if (nr != b_nr || nc != b_nc)
 {
 gripe_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
 return octave_value ();
 }
-int nel = 0;
+octave_idx_type nel = 0;
-for (int j = 0; j < nc; j++)
+for (octave_idx_type j = 0; j < nc; j++)
-for (int i = 0; i < nr; i++)
+for (octave_idx_type i = 0; i < nr; i++)
 if (!(a.elem (i, j) == 0. && b.elem (i, j) != 0.))
 	nel++;
 SparseComplexMatrix result (nr, nc, nel);
-int ii = 0;
+octave_idx_type ii = 0;
 result.cidx (0) = 0;
-for (int j = 0; j < nc; j++)
+for (octave_idx_type j = 0; j < nc; j++)
 {
-for (int i = 0; i < nr; i++)
+for (octave_idx_type i = 0; i < nr; i++)
 	{
 	  OCTAVE_QUIT;
 	  double btmp = b (i, j);
 	  Complex tmp;
 // Can this case ever happen, due to automatic retyping with maybe_mutate?
 retval = octave_value (NDArray (a.dims (), 1));
 else
 {
-int nz = a.nnz ();
+octave_idx_type nz = a.nnz ();
 SparseComplexMatrix result (a);
-for (int i = 0; i < nz; i++)
+for (octave_idx_type i = 0; i < nz; i++)
 	{
 	  OCTAVE_QUIT;
 	  result.data (i) = pow (a.data (i), b);
 	}
 // -*- 12 -*-
 octave_value
 elem_xpow (const SparseComplexMatrix& a, const SparseComplexMatrix& b)
 {
-int nr = a.rows ();
+octave_idx_type nr = a.rows ();
-int nc = a.cols ();
+octave_idx_type nc = a.cols ();
-int b_nr = b.rows ();
+octave_idx_type b_nr = b.rows ();
-int b_nc = b.cols ();
+octave_idx_type b_nc = b.cols ();
 if (nr != b_nr || nc != b_nc)
 {
 gripe_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
 return octave_value ();
 }
-int nel = 0;
+octave_idx_type nel = 0;
-for (int j = 0; j < nc; j++)
+for (octave_idx_type j = 0; j < nc; j++)
-for (int i = 0; i < nr; i++)
+for (octave_idx_type i = 0; i < nr; i++)
 if (!(a.elem (i, j) == 0. && b.elem (i, j) != 0.))
 	nel++;
 SparseComplexMatrix result (nr, nc, nel);
-int ii = 0;
+octave_idx_type ii = 0;
 result.cidx (0) = 0;
-for (int j = 0; j < nc; j++)
+for (octave_idx_type j = 0; j < nc; j++)
 {
-for (int i = 0; i < nr; i++)
+for (octave_idx_type i = 0; i < nr; i++)
 	{
 	  OCTAVE_QUIT;
 	  Complex tmp = pow (a (i, j), b (i, j));
 	  if (tmp != 0.)
 	    {

Mercurial > octave-nkf

comparison src/sparse-xpow.cc @ 5275:23b37da9fd5b