Mercurial > octave-nkf

comparison liboctave/array/CSparse.cc @ 18084:8e056300994b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Follow coding convention of defining and initializing only 1 variable per line in liboctave. * liboctave/array/Array-b.cc, liboctave/array/Array-util.cc, liboctave/array/Array.cc, liboctave/array/CDiagMatrix.cc, liboctave/array/CMatrix.cc, liboctave/array/CSparse.cc, liboctave/array/MDiagArray2.cc, liboctave/array/MatrixType.cc, liboctave/array/PermMatrix.cc, liboctave/array/Sparse.cc, liboctave/array/Sparse.h, liboctave/array/boolSparse.cc, liboctave/array/dDiagMatrix.cc, liboctave/array/dMatrix.cc, liboctave/array/dSparse.cc, liboctave/array/dim-vector.cc, liboctave/array/fCDiagMatrix.cc, liboctave/array/fCMatrix.cc, liboctave/array/fDiagMatrix.cc, liboctave/array/fMatrix.cc, liboctave/array/idx-vector.cc, liboctave/array/idx-vector.h, liboctave/numeric/CmplxLU.cc, liboctave/numeric/CmplxQR.cc, liboctave/numeric/base-qr.cc, liboctave/numeric/bsxfun-defs.cc, liboctave/numeric/bsxfun.h, liboctave/numeric/dbleLU.cc, liboctave/numeric/dbleQR.cc, liboctave/numeric/fCmplxLU.cc, liboctave/numeric/fCmplxQR.cc, liboctave/numeric/floatLU.cc, liboctave/numeric/floatQR.cc, liboctave/numeric/lo-specfun.cc, liboctave/numeric/oct-convn.cc, liboctave/numeric/oct-norm.cc, liboctave/numeric/sparse-dmsolve.cc, liboctave/operators/mx-inlines.cc, liboctave/operators/mx-op-defs.h, liboctave/util/caseless-str.h, liboctave/util/kpse.cc, liboctave/util/lo-utils.cc, liboctave/util/oct-binmap.h, liboctave/util/oct-cmplx.h, liboctave/util/oct-inttypes.cc, liboctave/util/oct-inttypes.h, liboctave/util/oct-sort.cc: Follow coding convention of defining and initializing only 1 variable per line in liboctave.
author Rik <rik@octave.org>
date Wed, 04 Dec 2013 22:13:18 -0800
parents 938f01339043
children b3f443b4802b
comparison
equal deleted inserted replaced
18083:938f01339043 18084:8e056300994b
158 } 158 }
159 159
160 SparseComplexMatrix::SparseComplexMatrix (const ComplexDiagMatrix& a) 160 SparseComplexMatrix::SparseComplexMatrix (const ComplexDiagMatrix& a)
161 : MSparse<Complex> (a.rows (), a.cols (), a.length ()) 161 : MSparse<Complex> (a.rows (), a.cols (), a.length ())
162 { 162 {
163 octave_idx_type j = 0, l = a.length (); 163 octave_idx_type j = 0;
164 octave_idx_type l = a.length ();
164 for (octave_idx_type i = 0; i < l; i++) 165 for (octave_idx_type i = 0; i < l; i++)
165 { 166 {
166 cidx (i) = j; 167 cidx (i) = j;
167 if (a(i, i) != 0.0) 168 if (a(i, i) != 0.0)
168 { 169 {
775 // Force make_unique to be called 776 // Force make_unique to be called
776 Complex *v = retval.data (); 777 Complex *v = retval.data ();
777 778
778 if (calccond) 779 if (calccond)
779 { 780 {
780 double dmax = 0., dmin = octave_Inf; 781 double dmax = 0.;
782 double dmin = octave_Inf;
781 for (octave_idx_type i = 0; i < nr; i++) 783 for (octave_idx_type i = 0; i < nr; i++)
782 { 784 {
783 double tmp = std::abs (v[i]); 785 double tmp = std::abs (v[i]);
784 if (tmp > dmax) 786 if (tmp > dmax)
785 dmax = tmp; 787 dmax = tmp;
1319 for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) 1321 for (octave_idx_type i = cidx (k); i < cidx (k+1); i++)
1320 retval(k,j) = b(ridx (i),j) / data (i); 1322 retval(k,j) = b(ridx (i),j) / data (i);
1321 1323
1322 if (calc_cond) 1324 if (calc_cond)
1323 { 1325 {
1324 double dmax = 0., dmin = octave_Inf; 1326 double dmax = 0.;
1327 double dmin = octave_Inf;
1325 for (octave_idx_type i = 0; i < nm; i++) 1328 for (octave_idx_type i = 0; i < nm; i++)
1326 { 1329 {
1327 double tmp = std::abs (data (i)); 1330 double tmp = std::abs (data (i));
1328 if (tmp > dmax) 1331 if (tmp > dmax)
1329 dmax = tmp; 1332 dmax = tmp;
1410 retval.xcidx (j+1) = ii; 1413 retval.xcidx (j+1) = ii;
1411 } 1414 }
1412 1415
1413 if (calc_cond) 1416 if (calc_cond)
1414 { 1417 {
1415 double dmax = 0., dmin = octave_Inf; 1418 double dmax = 0.;
1419 double dmin = octave_Inf;
1416 for (octave_idx_type i = 0; i < nm; i++) 1420 for (octave_idx_type i = 0; i < nm; i++)
1417 { 1421 {
1418 double tmp = std::abs (data (i)); 1422 double tmp = std::abs (data (i));
1419 if (tmp > dmax) 1423 if (tmp > dmax)
1420 dmax = tmp; 1424 dmax = tmp;
1471 for (octave_idx_type i = cidx (k); i < cidx (k+1); i++) 1475 for (octave_idx_type i = cidx (k); i < cidx (k+1); i++)
1472 retval(k,j) = b(ridx (i),j) / data (i); 1476 retval(k,j) = b(ridx (i),j) / data (i);
1473 1477
1474 if (calc_cond) 1478 if (calc_cond)
1475 { 1479 {
1476 double dmax = 0., dmin = octave_Inf; 1480 double dmax = 0.;
1481 double dmin = octave_Inf;
1477 for (octave_idx_type i = 0; i < nr; i++) 1482 for (octave_idx_type i = 0; i < nr; i++)
1478 { 1483 {
1479 double tmp = std::abs (data (i)); 1484 double tmp = std::abs (data (i));
1480 if (tmp > dmax) 1485 if (tmp > dmax)
1481 dmax = tmp; 1486 dmax = tmp;
1562 retval.xcidx (j+1) = ii; 1567 retval.xcidx (j+1) = ii;
1563 } 1568 }
1564 1569
1565 if (calc_cond) 1570 if (calc_cond)
1566 { 1571 {
1567 double dmax = 0., dmin = octave_Inf; 1572 double dmax = 0.;
1573 double dmin = octave_Inf;
1568 for (octave_idx_type i = 0; i < nm; i++) 1574 for (octave_idx_type i = 0; i < nm; i++)
1569 { 1575 {
1570 double tmp = std::abs (data (i)); 1576 double tmp = std::abs (data (i));
1571 if (tmp > dmax) 1577 if (tmp > dmax)
1572 dmax = tmp; 1578 dmax = tmp;