octave-nkf: liboctave/CMatrix.cc comparison

[project @ 2006-03-02 03:40:00 by jwe]

comparison

equal deleted inserted replaced

-:92f8b2723c8c
+:4b45b2bcda89
 octave_idx_type nr = rows ();
 octave_idx_type nc = cols ();
 if (nr == 0 || nc == 0)
 {
-Complex d[2];
+retval = ComplexDET (1.0, 0);
-d[0] = 1.0;
-d[1] = 0.0;
-retval = ComplexDET (d);
 }
 else
 {
 Array<octave_idx_type> ipvt (nr);
 octave_idx_type *pipvt = ipvt.fortran_vec ();
 		  info = -1;
 		  retval = ComplexDET ();
 		}
 	      else
 		{
-		  Complex d[2] = { 1., 0.};
+		  Complex c = 1.0;
-		  for (octave_idx_type i=0; i<nc; i++)
+		  int e = 0;
+		  for (octave_idx_type i = 0; i < nc; i++)
 		    {
-		      if (ipvt(i) != (i+1)) d[0] = -d[0];
+		      if (ipvt(i) != (i+1))
-		      d[0] = d[0] * atmp(i,i);
+			c = -c;
-		      if (d[0] == 0.) break;
-		      while (std::abs(d[0]) < 1.)
+		      c *= atmp(i,i);
+		      if (c == 0.0)
+			break;
+		      while (std::abs(c) < 0.5)
 			{
-			  d[0] = 10. * d[0];
+			  c *= 2.0;
-			  d[1] = d[1] - 1.0;
+			  e--;
 			}
-		      while (std::abs(d[0]) >= 10.)
+		      while (std::abs(c) >= 2.0)
 			{
-			  d[0] = 0.1 * d[0];
+			  c /= 2.0;
-			  d[1] = d[1] + 1.0;
+			  e++;
 			}
 		    }
-		  retval = ComplexDET (d);
+		  retval = ComplexDET (c, e);
 		}
 	    }
 	}
 }

Mercurial > hg > octave-nkf