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

comparison src/sparse-xpow.cc @ 5953:164214586706

[project @ 2006-08-22 15:31:32 by jwe]

author	jwe
date	Tue, 22 Aug 2006 15:31:32 +0000
parents	6b9cec830d72
children	93c65f2a5668

comparison

equal deleted inserted replaced

-:7dc99bfdd87a
+:164214586706
 for (octave_idx_type j = 0; j < nc; j++)
 	{
 	  for (octave_idx_type i = 0; i < nr; i++)
 	    {
 	      OCTAVE_QUIT;
-	      result (i, j) = pow (atmp, b(i,j));
+	      result (i, j) = std::pow (atmp, b(i,j));
 	    }
 	}
 retval = result;
 }
 for (octave_idx_type j = 0; j < nc; j++)
 	{
 	  for (octave_idx_type i = 0; i < nr; i++)
 	    {
 	      OCTAVE_QUIT;
-	      result (i, j) = pow (a, b(i,j));
+	      result (i, j) = std::pow (a, b(i,j));
 	    }
 	}
 retval = result;
 }
 for (octave_idx_type j = 0; j < nc; j++)
 {
 for (octave_idx_type i = 0; i < nr; i++)
 	{
 	  OCTAVE_QUIT;
-	  result (i, j) = pow (atmp, b(i,j));
+	  result (i, j) = std::pow (atmp, b(i,j));
 	}
 }
 return result;
 }
 octave_idx_type nr = a.rows ();
 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)));
+	  ComplexMatrix result (nr, nc, Complex (std::pow (0.0, b)));
 	  // FIXME -- avoid apparent GNU libm bug by
 	  // converting A and B to complex instead of just A.
 	  Complex btmp (b);
 	      {
 		OCTAVE_QUIT;
 		Complex atmp (a.data (i));
-		result (a.ridx(i), j) = pow (atmp, btmp);
+		result (a.ridx(i), j) = std::pow (atmp, btmp);
 	      }
 	  retval = octave_value (result);
 	}
 else
 	{
-	  Matrix result (nr, nc, (pow (0.0, b)));
+	  Matrix result (nr, nc, (std::pow (0.0, b)));
 	  for (octave_idx_type j = 0; j < nc; j++)
 	    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);
+		result (a.ridx(i), j) = std::pow (a.data (i), b);
 	      }
 	  retval = octave_value (result);
 	}
 }
 	  // converting A and B to complex instead of just A.
 	  Complex atmp (a.data (i));
 	  Complex btmp (b);
-	  result.data (i) = pow (atmp, btmp);
+	  result.data (i) = std::pow (atmp, btmp);
 	}
 result.maybe_compress (true);
 retval = result;
 SparseMatrix result (a);
 for (octave_idx_type i = 0; i < nz; i++)
 	{
 	  OCTAVE_QUIT;
-	  result.data (i) = pow (a.data (i), b);
+	  result.data (i) = std::pow (a.data (i), b);
 	}
 result.maybe_compress (true);
 retval = result;
 return octave_value ();
 }
 int convert_to_complex = 0;
 for (octave_idx_type j = 0; j < nc; j++)
-for (octave_idx_type i = 0; i < nr; i++)
+for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++)
 {
-	OCTAVE_QUIT;
+	if (a.data(i) < 0.0)
-	double atmp = a (i, j);
-	double btmp = b (i, j);
-	if (atmp < 0.0 && static_cast<int> (btmp) != btmp)
 	  {
-	    convert_to_complex = 1;
+	    double btmp = b (a.ridx(i), j);
-	    goto done;
+	    if (static_cast<int> (btmp) != btmp)
+	      {
+		convert_to_complex = 1;
+		goto done;
+	      }
 	  }
 }
 done:
-octave_idx_type nel = 0;
+// This is a dumb operator for sparse matrices anyway, and there is
-for (octave_idx_type j = 0; j < nc; j++)
+// no sensible way to handle the 0.^0 versus the 0.^x cases. Therefore
-for (octave_idx_type i = 0; i < nr; i++)
+// allocate a full matrix filled for the 0.^0 case and shrink it later
-if (!(a.elem (i, j) == 0. && b.elem (i, j) != 0.))
+// as needed
-	nel++;
 if (convert_to_complex)
 {
-SparseComplexMatrix complex_result (nr, nc, nel);
+SparseComplexMatrix complex_result (nr, nc, Complex(1.0, 0.0));
-octave_idx_type ii = 0;
-complex_result.cidx(0) = 0;
 for (octave_idx_type j = 0; j < nc; j++)
 	{
-	  for (octave_idx_type i = 0; i < nr; i++)
+	  for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++)
 	    {
 	      OCTAVE_QUIT;
-	      Complex atmp (a (i, j));
+	      complex_result.xelem(a.ridx(i), j) =
-	      Complex btmp (b (i, j));
+		std::pow (Complex(a.data(i)), Complex(b(a.ridx(i), j)));
-	      Complex tmp =  pow (atmp, btmp);
+	    }
-	      if (tmp != 0.)
+	}
-		{
+complex_result.maybe_compress (true);
-		  complex_result.data (ii) = tmp;
-		  complex_result.ridx (ii++) = i;
-		}
-	    }
-	  complex_result.cidx (j+1) = ii;
-	}
-complex_result.maybe_compress ();
 retval = complex_result;
 }
 else
 {
-SparseMatrix result (nr, nc, nel);
+SparseMatrix result (nr, nc, 1.0);
-octave_idx_type ii = 0;
-result.cidx (0) = 0;
 for (octave_idx_type j = 0; j < nc; j++)
 	{
-	  for (octave_idx_type i = 0; i < nr; i++)
+	  for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++)
 	    {
 	      OCTAVE_QUIT;
-	      double tmp = pow (a (i, j), b (i, j));
+	      result.xelem(a.ridx(i), j) = std::pow (a.data(i),
-	      if (tmp != 0.)
+						     b (a.ridx(i), j));
-		{
+	    }
-		  result.data (ii) = tmp;
+	}
-		  result.ridx (ii++) = i;
+result.maybe_compress (true);
-		}
-	    }
-	  result.cidx (j+1) = ii;
-	}
-result.maybe_compress ();
 retval = result;
 }
 return retval;
 }
 SparseComplexMatrix result (a);
 for (octave_idx_type i = 0; i < nz; i++)
 	{
 	  OCTAVE_QUIT;
-	  result.data (i) = pow (Complex (a.data (i)), b);
+	  result.data (i) = std::pow (Complex (a.data (i)), b);
 	}
 result.maybe_compress (true);
 retval = result;
 {
 gripe_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
 return octave_value ();
 }
-octave_idx_type nel = 0;
+SparseComplexMatrix result (nr, nc, Complex(1.0, 0.0));
-for (octave_idx_type j = 0; j < nc; j++)
-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);
-octave_idx_type ii = 0;
-result.cidx(0) = 0;
 for (octave_idx_type j = 0; j < nc; j++)
 {
-for (octave_idx_type i = 0; i < nr; i++)
+for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++)
 	{
 	  OCTAVE_QUIT;
-	  Complex tmp = pow (Complex (a (i, j)), b (i, j));
+	  result.xelem(a.ridx(i), j) = std::pow (a.data(i), b (a.ridx(i), j));
-	  if (tmp != 0.)
+	}
-	    {
+}
-	      result.data (ii) = tmp;
-	      result.ridx (ii++) = i;
+result.maybe_compress (true);
-	    }
-	}
-result.cidx (j+1) = ii;
-}
-result.maybe_compress ();
 return result;
 }
 // -*- 7 -*-
 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));
+	    result (i, j) = std::pow (a, static_cast<int> (btmp));
 	  else
-	    result (i, j) = pow (a, btmp);
+	    result (i, j) = std::pow (a, btmp);
 	}
 }
 return result;
 }
 ComplexMatrix result (nr, nc);
 for (octave_idx_type j = 0; j < nc; j++)
 for (octave_idx_type i = 0; i < nr; i++)
 {
 	OCTAVE_QUIT;
-	result (i, j) = pow (a, b (i, j));
+	result (i, j) = std::pow (a, b (i, j));
 }
 return result;
 }
 if (b <= 0)
 {
 octave_idx_type nr = a.rows ();
 octave_idx_type nc = a.cols ();
-ComplexMatrix result (nr, nc, Complex (pow (0.0, b)));
+ComplexMatrix result (nr, nc, Complex (std::pow (0.0, b)));
 if (xisint (b))
 	{
 	  for (octave_idx_type j = 0; j < nc; j++)
 	    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));
+		  std::pow (a.data (i), static_cast<int> (b));
 	      }
 	}
 else
 	{
 	  for (octave_idx_type j = 0; j < nc; j++)
 	    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);
+		result (a.ridx(i), j) = std::pow (a.data (i), b);
 	      }
 	}
 retval = result;
 }
 if (xisint (b))
 	{
 	  for (octave_idx_type i = 0; i < nz; i++)
 	    {
 	      OCTAVE_QUIT;
-	      result.data (i) = pow (a.data (i), static_cast<int> (b));
+	      result.data (i) = std::pow (a.data (i), static_cast<int> (b));
 	    }
 	}
 else
 	{
 	  for (octave_idx_type i = 0; i < nz; i++)
 	    {
 	      OCTAVE_QUIT;
-	      result.data (i) = pow (a.data (i), b);
+	      result.data (i) = std::pow (a.data (i), b);
 	    }
 	}
 result.maybe_compress (true);
 {
 gripe_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
 return octave_value ();
 }
-octave_idx_type nel = 0;
+SparseComplexMatrix result (nr, nc, Complex(1.0, 0.0));
-for (octave_idx_type j = 0; j < nc; j++)
-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);
-octave_idx_type ii = 0;
-result.cidx (0) = 0;
 for (octave_idx_type j = 0; j < nc; j++)
 {
-for (octave_idx_type i = 0; i < nr; i++)
+for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++)
 	{
 	  OCTAVE_QUIT;
-	  double btmp = b (i, j);
+	  double btmp = b (a.ridx(i), j);
 	  Complex tmp;
 	  if (xisint (btmp))
-	    tmp = pow (a (i, j), static_cast<int> (btmp));
+	    result.xelem(a.ridx(i), j) = std::pow (a.data (i),
+					      static_cast<int> (btmp));
 	  else
-	    tmp = pow (a (i, j), btmp);
+	    result.xelem(a.ridx(i), j) = std::pow (a.data (i), btmp);
-	  if (tmp != 0.)
+	}
-	    {
+}
-	      result.data (ii) = tmp;
-	      result.ridx (ii++) = i;
+result.maybe_compress (true);
-	    }
-	}
-result.cidx (j+1) = ii;
-}
-result.maybe_compress ();
 return result;
 }
 // -*- 11 -*-
 SparseComplexMatrix result (a);
 for (octave_idx_type i = 0; i < nz; i++)
 	{
 	  OCTAVE_QUIT;
-	  result.data (i) = pow (a.data (i), b);
+	  result.data (i) = std::pow (a.data (i), b);
 	}
 result.maybe_compress (true);
 retval = result;
 {
 gripe_nonconformant ("operator .^", nr, nc, b_nr, b_nc);
 return octave_value ();
 }
-octave_idx_type nel = 0;
+SparseComplexMatrix result (nr, nc, Complex(1.0, 0.0));
 for (octave_idx_type j = 0; j < nc; j++)
-for (octave_idx_type i = 0; i < nr; i++)
+{
-if (!(a.elem (i, j) == 0. && b.elem (i, j) != 0.))
+for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++)
-	nel++;
+	{
+	  OCTAVE_QUIT;
-SparseComplexMatrix result (nr, nc, nel);
+	  result.xelem(a.ridx(i), j) = std::pow (a.data (i), b (a.ridx(i), j));
-octave_idx_type ii = 0;
+	}
-result.cidx (0) = 0;
-for (octave_idx_type j = 0; j < nc; j++)
-{
-for (octave_idx_type i = 0; i < nr; i++)
-	{
-	  OCTAVE_QUIT;
-	  Complex tmp = pow (a (i, j), b (i, j));
-	  if (tmp != 0.)
-	    {
-	      result.data (ii) = tmp;
-	      result.ridx (ii++) = i;
-	    }
-	}
-result.cidx (j+1) = ii;
 }
 result.maybe_compress (true);
 return result;
 }

Mercurial > octave-nkf

comparison src/sparse-xpow.cc @ 5953:164214586706