Mercurial > octave-nkf

changeset 5953:164214586706

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-08-22 15:31:32 by jwe]
author jwe
date Tue, 22 Aug 2006 15:31:32 +0000
parents 7dc99bfdd87a
children 250e062c3393
files src/ChangeLog src/sparse-xpow.cc test/ChangeLog test/build_sparse_tests.sh
diffstat 4 files changed, 86 insertions(+), 135 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Aug 22 05:37:06 2006 +0000
+++ b/src/ChangeLog	Tue Aug 22 15:31:32 2006 +0000
@@ -1,3 +1,8 @@
+2006-08-22  David Bateman  <dbateman@free.fr>
+
+	* sparse-xpow.cc: Replace all uses of pow by std::pow.
+	(elem_pow): Simplify for two sparse matrices arguments.
+
 2006-08-22  John W. Eaton  <jwe@octave.org>
 
 	* ls-oct-ascii.cc: Increase default value of save_precision to 16.
--- a/src/sparse-xpow.cc	Tue Aug 22 05:37:06 2006 +0000
+++ b/src/sparse-xpow.cc	Tue Aug 22 15:31:32 2006 +0000
@@ -249,7 +249,7 @@
 	  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));
 	    }
 	}
 
@@ -264,7 +264,7 @@
 	  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));
 	    }
 	}
 
@@ -289,7 +289,7 @@
       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));
 	}
     }
 
@@ -315,7 +315,7 @@
 
       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.
@@ -328,20 +328,20 @@
 	      
 		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);
@@ -361,7 +361,7 @@
 	  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);
@@ -375,7 +375,7 @@
       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);
@@ -406,75 +406,56 @@
 
   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;
-	double atmp = a (i, j);
-	double btmp = b (i, j);
-	if (atmp < 0.0 && static_cast<int> (btmp) != btmp)
+	if (a.data(i) < 0.0)
 	  {
-	    convert_to_complex = 1;
-	    goto done;
+	    double btmp = b (a.ridx(i), j);
+	    if (static_cast<int> (btmp) != btmp)
+	      {
+		convert_to_complex = 1;
+		goto done;
+	      }
 	  }
       }
 
 done:
 
-  octave_idx_type nel = 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++;
+  // This is a dumb operator for sparse matrices anyway, and there is
+  // no sensible way to handle the 0.^0 versus the 0.^x cases. Therefore
+  // allocate a full matrix filled for the 0.^0 case and shrink it later
+  // as needed
 
   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 btmp (b (i, j));
-	      Complex tmp =  pow (atmp, btmp);
-	      if (tmp != 0.)
-		{
-		  complex_result.data (ii) = tmp;
-		  complex_result.ridx (ii++) = i;
-		}
+	      complex_result.xelem(a.ridx(i), j) =
+		std::pow (Complex(a.data(i)), Complex(b(a.ridx(i), j)));
 	    }
-	  complex_result.cidx (j+1) = ii;
 	}
-      complex_result.maybe_compress ();
-
+      complex_result.maybe_compress (true);
       retval = complex_result;
     }
   else
     {
-      SparseMatrix result (nr, nc, nel);
-      octave_idx_type ii = 0;
+      SparseMatrix result (nr, nc, 1.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));
-	      if (tmp != 0.)
-		{
-		  result.data (ii) = tmp;
-		  result.ridx (ii++) = i;
-		}
+	      result.xelem(a.ridx(i), j) = std::pow (a.data(i), 
+						     b (a.ridx(i), j));
 	    }
-	  result.cidx (j+1) = ii;
 	}
-
-      result.maybe_compress ();
-
+      result.maybe_compress (true);
       retval = result;
     }
 
@@ -498,7 +479,7 @@
       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);
@@ -525,32 +506,17 @@
       return octave_value ();
     }
 
-  octave_idx_type nel = 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;
+  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++)
+      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));
-	  if (tmp != 0.)
-	    {
-	      result.data (ii) = tmp; 
-	      result.ridx (ii++) = i; 
-	    }
+	  result.xelem(a.ridx(i), j) = std::pow (a.data(i), b (a.ridx(i), j));
 	}
-      result.cidx (j+1) = ii;
     }
 
-  result.maybe_compress ();
+  result.maybe_compress (true);
 
   return result;
 }
@@ -571,9 +537,9 @@
 	  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);
 	}
     }
 
@@ -592,7 +558,7 @@
     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;
@@ -609,7 +575,7 @@
       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))
 	{
@@ -618,7 +584,7 @@
 	      {
 		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
@@ -627,7 +593,7 @@
 	    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);
 	      }
 	}  
 
@@ -644,7 +610,7 @@
 	  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
@@ -652,7 +618,7 @@
 	  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);
 	    }
 	}  
 
@@ -680,38 +646,24 @@
       return octave_value ();
     }
 
-  octave_idx_type nel = 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;
+  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++)
+      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);
-	  if (tmp != 0.)
-	    {
-	      result.data (ii) = tmp; 
-	      result.ridx (ii++) = i; 
-	    }
+	    result.xelem(a.ridx(i), j) = std::pow (a.data (i), btmp);
 	}
-      result.cidx (j+1) = ii;
     }
 
-  result.maybe_compress ();
+  result.maybe_compress (true);
 
   return result;
 }
@@ -735,7 +687,7 @@
       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);
@@ -762,29 +714,14 @@
       return octave_value ();
     }
 
-  octave_idx_type nel = 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;
+  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++)
+      for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++)
 	{
 	  OCTAVE_QUIT;
-	  Complex tmp = pow (a (i, j), b (i, j));
-	  if (tmp != 0.)
-	    {
-	      result.data (ii) = tmp;
-	      result.ridx (ii++) = i;
-	    }
+	  result.xelem(a.ridx(i), j) = std::pow (a.data (i), b (a.ridx(i), j));
 	}
-      result.cidx (j+1) = ii;
     }
   result.maybe_compress (true);
 
--- a/test/ChangeLog	Tue Aug 22 05:37:06 2006 +0000
+++ b/test/ChangeLog	Tue Aug 22 15:31:32 2006 +0000
@@ -1,3 +1,8 @@
+2006-08-22  David Bateman  <dbateman@free.fr>
+
+	* build_sparse_tests.sh: Don't force conversion to sparse boolean
+	return type for string mapper functions.
+
 2006-08-21  John W. Eaton  <jwe@octave.org>
 
 	* test_io.m: Use isequal (a, b) instead of a != b.  Use isequal
--- a/test/build_sparse_tests.sh	Tue Aug 22 05:37:06 2006 +0000
+++ b/test/build_sparse_tests.sh	Tue Aug 22 15:31:32 2006 +0000
@@ -414,7 +414,11 @@
 %! wn2s = warning ("query", "Octave:num-to-str");
 %! warning ("off", "Octave:num-to-str");
 %! if isreal(af)
-%!    assert($1(as),sparse($1(af),1))
+%!   if ($2)
+%!     assert($1(as),sparse($1(af),1))
+%!   else
+%!     assert($1(as),$1(af))
+%!   endif
 %! endif
 %! warning (wn2s.state, "Octave:num-to-str");
 
@@ -466,22 +470,22 @@
 
 gen_real_mapper_tests() {
 echo "%% Unary matrix tests (uses af,as)">>$TESTS
-print_real_mapper_test erf
-print_real_mapper_test erfc
-#print_real_mapper_test gamma
-print_real_mapper_test isalnum
-print_real_mapper_test isalpha
-print_real_mapper_test isascii
-print_real_mapper_test iscntrl
-print_real_mapper_test isdigit
-print_real_mapper_test isgraph
-print_real_mapper_test islower
-print_real_mapper_test isprint
-print_real_mapper_test ispunct
-print_real_mapper_test isspace
-print_real_mapper_test isupper
-print_real_mapper_test isxdigit
-#print_real_mapper_test lgamma
+print_real_mapper_test erf 1
+print_real_mapper_test erfc 1
+#print_real_mapper_test gamma 1
+print_real_mapper_test isalnum 0
+print_real_mapper_test isalpha 0
+print_real_mapper_test isascii 0
+print_real_mapper_test iscntrl 0
+print_real_mapper_test isdigit 0
+print_real_mapper_test isgraph 0
+print_real_mapper_test islower 0
+print_real_mapper_test isprint 0
+print_real_mapper_test ispunct 0
+print_real_mapper_test isspace 0
+print_real_mapper_test isupper 0
+print_real_mapper_test isxdigit 0
+#print_real_mapper_test lgamma 1
 
 # Specific tests for certain mapper functions
     cat >>$TESTS <<EOF