octave-nkf: liboctave/CMatrix.cc comparison

comparison liboctave/CMatrix.cc @ 3504:5eef8a2294bd

[project @ 2000-02-01 10:06:51 by jwe]

author	jwe
date	Tue, 01 Feb 2000 10:07:26 +0000
parents	d14c483b3c12
children	8d641545e006

comparison

equal deleted inserted replaced

-:d14c483b3c12
+:5eef8a2294bd
 	  for (int i = 0; i < ndiag; i++)
 	    d.elem (i) = elem (i, i);
 	}
 }
 else
-cerr << "diag: requested diagonal out of range\n";
+std::cerr << "diag: requested diagonal out of range\n";
 return d;
 }
 bool
 result.resize (nr);
 index.resize (nr);
 for (int i = 0; i < nr; i++)
 {
-	  int idx = 0;
+	  int idx_j = 0;
-	  Complex tmp_min = elem (i, idx);
+	  Complex tmp_min = elem (i, idx_j);
 	  bool real_only = row_is_real_only (i);
 	  double abs_min = real_only ? real (tmp_min) : abs (tmp_min);
 	  if (xisnan (tmp_min))
-	    idx = -1;
+	    idx_j = -1;
 	  else
 	    {
 	      for (int j = 1; j < nc; j++)
 		{
 		  Complex tmp = elem (i, j);
 		  double abs_tmp = real_only ? real (tmp) : abs (tmp);
 		  if (xisnan (tmp))
 		    {
-		      idx = -1;
+		      idx_j = -1;
 		      break;
 		    }
 		  else if (abs_tmp < abs_min)
 		    {
-		      idx = j;
+		      idx_j = j;
 		      tmp_min = tmp;
 		      abs_min = abs_tmp;
 		    }
 		}
-	      result.elem (i) = (idx < 0) ? Complex_NaN_result : tmp_min;
+	      result.elem (i) = (idx_j < 0) ? Complex_NaN_result : tmp_min;
-	      index.elem (i) = idx;
+	      index.elem (i) = idx_j;
 	    }
 }
 }
 return result;
 result.resize (nr);
 index.resize (nr);
 for (int i = 0; i < nr; i++)
 {
-	  int idx = 0;
+	  int idx_j = 0;
-	  Complex tmp_max = elem (i, idx);
+	  Complex tmp_max = elem (i, idx_j);
 	  bool real_only = row_is_real_only (i);
 	  double abs_max = real_only ? real (tmp_max) : abs (tmp_max);
 	  if (xisnan (tmp_max))
-	    idx = -1;
+	    idx_j = -1;
 	  else
 	    {
 	      for (int j = 1; j < nc; j++)
 		{
 		  Complex tmp = elem (i, j);
 		  double abs_tmp = real_only ? real (tmp) : abs (tmp);
 		  if (xisnan (tmp))
 		    {
-		      idx = -1;
+		      idx_j = -1;
 		      break;
 		    }
 		  else if (abs_tmp > abs_max)
 		    {
-		      idx = j;
+		      idx_j = j;
 		      tmp_max = tmp;
 		      abs_max = abs_tmp;
 		    }
 		}
-	      result.elem (i) = (idx < 0) ? Complex_NaN_result : tmp_max;
+	      result.elem (i) = (idx_j < 0) ? Complex_NaN_result : tmp_max;
-	      index.elem (i) = idx;
+	      index.elem (i) = idx_j;
 	    }
 }
 }
 return result;
 result.resize (nc);
 index.resize (nc);
 for (int j = 0; j < nc; j++)
 {
-	  int idx = 0;
+	  int idx_i = 0;
-	  Complex tmp_min = elem (idx, j);
+	  Complex tmp_min = elem (idx_i, j);
 	  bool real_only = column_is_real_only (j);
 	  double abs_min = real_only ? real (tmp_min) : abs (tmp_min);
 	  if (xisnan (tmp_min))
-	    idx = -1;
+	    idx_i = -1;
 	  else
 	    {
 	      for (int i = 1; i < nr; i++)
 		{
 		  Complex tmp = elem (i, j);
 		  double abs_tmp = real_only ? real (tmp) : abs (tmp);
 		  if (xisnan (tmp))
 		    {
-		      idx = -1;
+		      idx_i = -1;
 		      break;
 		    }
 		  else if (abs_tmp < abs_min)
 		    {
-		      idx = i;
+		      idx_i = i;
 		      tmp_min = tmp;
 		      abs_min = abs_tmp;
 		    }
 		}
-	      result.elem (j) = (idx < 0) ? Complex_NaN_result : tmp_min;
+	      result.elem (j) = (idx_i < 0) ? Complex_NaN_result : tmp_min;
-	      index.elem (j) = idx;
+	      index.elem (j) = idx_i;
 	    }
 }
 }
 return result;
 result.resize (nc);
 index.resize (nc);
 for (int j = 0; j < nc; j++)
 {
-	  int idx = 0;
+	  int idx_i = 0;
-	  Complex tmp_max = elem (idx, j);
+	  Complex tmp_max = elem (idx_i, j);
 	  bool real_only = column_is_real_only (j);
 	  double abs_max = real_only ? real (tmp_max) : abs (tmp_max);
 	  if (xisnan (tmp_max))
-	    idx = -1;
+	    idx_i = -1;
 	  else
 	    {
 	      for (int i = 1; i < nr; i++)
 		{
 		  Complex tmp = elem (i, j);
 		  double abs_tmp = real_only ? real (tmp) : abs (tmp);
 		  if (xisnan (tmp))
 		    {
-		      idx = -1;
+		      idx_i = -1;
 		      break;
 		    }
 		  else if (abs_tmp > abs_max)
 		    {
-		      idx = i;
+		      idx_i = i;
 		      tmp_max = tmp;
 		      abs_max = abs_tmp;
 		    }
 		}
-	      result.elem (j) = (idx < 0) ? Complex_NaN_result : tmp_max;
+	      result.elem (j) = (idx_i < 0) ? Complex_NaN_result : tmp_max;
-	      index.elem (j) = idx;
+	      index.elem (j) = idx_i;
 	    }
 }
 }
 return result;
 }
 // i/o
-ostream&
+std::ostream&
-operator << (ostream& os, const ComplexMatrix& a)
+operator << (std::ostream& os, const ComplexMatrix& a)
 {
 //  int field_width = os.precision () + 7;
 for (int i = 0; i < a.rows (); i++)
 {
 for (int j = 0; j < a.cols (); j++)
 os << "\n";
 }
 return os;
 }
-istream&
+std::istream&
-operator >> (istream& is, ComplexMatrix& a)
+operator >> (std::istream& is, ComplexMatrix& a)
 {
 int nr = a.rows ();
 int nc = a.cols ();
 if (nr < 1 || nc < 1)
-is.clear (ios::badbit);
+is.clear (std::ios::badbit);
 else
 {
 Complex tmp;
 for (int i = 0; i < nr; i++)
 	for (int j = 0; j < nc; j++)
 return retval;
 }
 MS_CMP_OPS(ComplexMatrix, real, Complex, real)
-MS_BOOL_OPS(ComplexMatrix, Complex)
+MS_BOOL_OPS(ComplexMatrix, Complex, 0.0)
 SM_CMP_OPS(Complex, real, ComplexMatrix, real)
-SM_BOOL_OPS(Complex, ComplexMatrix)
+SM_BOOL_OPS(Complex, ComplexMatrix, 0.0)
 MM_CMP_OPS(ComplexMatrix, real, ComplexMatrix, real)
-MM_BOOL_OPS(ComplexMatrix, ComplexMatrix)
+MM_BOOL_OPS(ComplexMatrix, ComplexMatrix, 0.0)
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***
 ;;; End: ***

Mercurial > octave-nkf

comparison liboctave/CMatrix.cc @ 3504:5eef8a2294bd