Mercurial > octave-nkf

comparison liboctave/array/CMatrix.cc @ 19898:17d647821d61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: More cleanup of C++ code to follow Octave coding conventions. * gl-select.cc, betainc.cc, bitfcns.cc, bsxfun.cc, gl-render.cc, graphics.cc, load-save.cc, ls-mat-ascii.cc, ls-mat5.cc, lu.cc, oct-stream.cc, symtab.cc, variables.cc, __eigs__.cc, __magick_read__.cc, chol.cc, ov-base-sparse.cc, ov-class.cc, ov-classdef.cc, ov-fcn-inline.cc, ov-perm.cc, ov.cc, CMatrix.cc, CSparse.cc, MSparse.cc, MatrixType.cc, MatrixType.h, dMatrix.cc, dSparse.cc, fCMatrix.cc, fMatrix.cc, eigs-base.cc, lo-sysdep.cc, kpse.cc: Break long lines before && and ||.
author John W. Eaton <jwe@octave.org>
date Thu, 26 Feb 2015 13:07:04 -0500
parents 4197fc428c7d
children b2100e1659ac ffc6cdcd02c5
comparison
equal deleted inserted replaced
19897:09ed6f7538dd 19898:17d647821d61
1936 retval = ComplexMatrix (nc, b.cols (), Complex (0.0, 0.0)); 1936 retval = ComplexMatrix (nc, b.cols (), Complex (0.0, 0.0));
1937 else 1937 else
1938 { 1938 {
1939 volatile int typ = mattype.type (); 1939 volatile int typ = mattype.type ();
1940 1940
1941 if (typ == MatrixType::Permuted_Upper || 1941 if (typ == MatrixType::Permuted_Upper || typ == MatrixType::Upper)
1942 typ == MatrixType::Upper)
1943 { 1942 {
1944 octave_idx_type b_nc = b.cols (); 1943 octave_idx_type b_nc = b.cols ();
1945 rcon = 1.; 1944 rcon = 1.;
1946 info = 0; 1945 info = 0;
1947 1946
2032 retval = ComplexMatrix (nc, b.cols (), Complex (0.0, 0.0)); 2031 retval = ComplexMatrix (nc, b.cols (), Complex (0.0, 0.0));
2033 else 2032 else
2034 { 2033 {
2035 volatile int typ = mattype.type (); 2034 volatile int typ = mattype.type ();
2036 2035
2037 if (typ == MatrixType::Permuted_Lower || 2036 if (typ == MatrixType::Permuted_Lower || typ == MatrixType::Lower)
2038 typ == MatrixType::Lower)
2039 { 2037 {
2040 octave_idx_type b_nc = b.cols (); 2038 octave_idx_type b_nc = b.cols ();
2041 rcon = 1.; 2039 rcon = 1.;
2042 info = 0; 2040 info = 0;
2043 2041