octave-dspies: liboctave/array/MatrixType.cc annotate

annotate liboctave/array/MatrixType.cc @ 18676:5bd1ca29c5f0

Clean up questionable code bits identified by clang sanitize. * data.cc (Fnorm): in %!test, don't test with a single value which exceeds range of single. * find.cc (find_nonzero_elem_idx): Remove unused variable assignment to n_to_find. * load-save.cc (Fsave): Declare argc just before usage. * ls-hdf5.cc (hdf5_read_next_data): Return from function immediately if type is unrecognized. * oct-stream.cc (octave_stream::read): Eliminate unnecessary initialization of elts_to_read. * octave-link.cc (F__octave_link_file_dialog__): Eliminate unnecessary initialization of nel. * pr-output.cc (set_real_format): Don't assign to function input variable digits. * str2double.cc (single_num): Initialize return value num at start of function. * ov-complex.cc (octave_complex::double_value, octave_complex::float_value): Eliminate unnecessary initialization of retval. * ov-flt-complex.cc (octave_float_complex::double_value, octave_float_complex::float_value): Eliminate unnecessary initialization of retval. * CSparse.cc (SparseComplexMatrix::inverse): Remove useless asignment to typ. * CSparse.cc (SparseComplexMatrix::bsolve): Initialize anorm before using in comparison. * MatrixType.cc (matrix_complex_probe): Initialize typ to MatrixType::Unknown. * dSparse.cc (SparseMatrix::inverse): Remove useless assignment to typ. * dSparse.cc (SparseMatrix::bsolve): Initialize anorm before using in comparison. * lo-specfun.cc (gammainc): Remove useless assignment to err. * data-conv.cc (oct_data_conv::string_to_data_type): Remove useless assignment to input_is_output. * str-vec.cc (string_vector::list_in_columns): Remove useless assignment to nc.

author	Rik <rik@octave.org>
date	Fri, 25 Apr 2014 10:02:10 -0700
parents	8e056300994b
children

rev	line source
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1 /*
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	2
17744 d63878346099 maint: Update copyright notices for release. John W. Eaton <jwe@octave.org> parents: 15271 diff changeset	3 Copyright (C) 2006-2013 David Bateman
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	4 Copyright (C) 2006 Andy Adler
10521 4d1fc073fbb7 add some missing copyright stmts Jaroslav Hajek <highegg@gmail.com> parents: 10506 diff changeset	5 Copyright (C) 2009 VZLU Prague
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	6
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6460 diff changeset	7 This file is part of Octave.
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6460 diff changeset	8
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	9 Octave is free software; you can redistribute it and/or modify it
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	10 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6460 diff changeset	11 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6460 diff changeset	12 option) any later version.
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	13
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	14 Octave is distributed in the hope that it will be useful, but WITHOUT
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	17 for more details.
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	18
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	19 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6460 diff changeset	20 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6460 diff changeset	21 <http://www.gnu.org/licenses/>.
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	22
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	23 */
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	24
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	25 #ifdef HAVE_CONFIG_H
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	26 #include <config.h>
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	27 #endif
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	28
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	29 #include <vector>
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	30
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	31 #include "MatrixType.h"
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	32 #include "dMatrix.h"
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	33 #include "CMatrix.h"
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	34 #include "dSparse.h"
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	35 #include "CSparse.h"
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	36 #include "oct-spparms.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 7798 diff changeset	37 #include "oct-locbuf.h"
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	38
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	39 // FIXME: There is a large code duplication here
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	40
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	41 MatrixType::MatrixType (void)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	42 : typ (MatrixType::Unknown),
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	43 sp_bandden (octave_sparse_params::get_bandden ()),
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	44 bandden (0), upper_band (0),
6452 7e90124eddba [project @ 2007-03-24 22:18:14 by dbateman] dbateman parents: 6027 diff changeset	45 lower_band (0), dense (false), full (false), nperm (0), perm (0) { }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	46
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	47 MatrixType::MatrixType (const MatrixType &a)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	48 : typ (a.typ), sp_bandden (a.sp_bandden), bandden (a.bandden),
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	49 upper_band (a.upper_band), lower_band (a.lower_band),
11501 331fcc41ca23 data member initialization fixes John W. Eaton <jwe@octave.org> parents: 10713 diff changeset	50 dense (a.dense), full (a.full), nperm (a.nperm), perm (0)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	51 {
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	52 if (nperm != 0)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	53 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	54 perm = new octave_idx_type [nperm];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	55 for (octave_idx_type i = 0; i < nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	56 perm[i] = a.perm[i];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	57 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	58 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	59
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	60 template<class T>
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	61 MatrixType::matrix_type
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	62 matrix_real_probe (const MArray<T>& a)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	63 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	64 MatrixType::matrix_type typ;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	65 octave_idx_type nrows = a.rows ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	66 octave_idx_type ncols = a.cols ();
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	67
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	68 const T zero = 0;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	69
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	70 if (ncols == nrows)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	71 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	72 bool upper = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	73 bool lower = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	74 bool hermitian = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	75
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	76 // do the checks for lower/upper/hermitian all in one pass.
15022 e47b4e8c2714 maint: Use space after OCTAVE_LOCAL_BUFFER invocation in liboctave source code. Rik <rik@octave.org> parents: 15020 diff changeset	77 OCTAVE_LOCAL_BUFFER (T, diag, ncols);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	78
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	79 for (octave_idx_type j = 0;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	80 j < ncols && upper; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	81 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	82 T d = a.elem (j,j);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	83 upper = upper && (d != zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	84 lower = lower && (d != zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	85 hermitian = hermitian && (d > zero);
10713 0e05ed9f2a62 improve some MatrixType code Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	86 diag[j] = d;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	87 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	88
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	89 for (octave_idx_type j = 0;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	90 j < ncols && (upper \|\| lower \|\| hermitian); j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	91 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	92 for (octave_idx_type i = 0; i < j; i++)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	93 {
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 17769 diff changeset	94 double aij = a.elem (i,j);
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 17769 diff changeset	95 double aji = a.elem (j,i);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	96 lower = lower && (aij == zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	97 upper = upper && (aji == zero);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	98 hermitian = hermitian && (aij == aji
10713 0e05ed9f2a62 improve some MatrixType code Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	99 && aijaij < diag[i]diag[j]);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	100 }
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	101 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	102
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	103 if (upper)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	104 typ = MatrixType::Upper;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	105 else if (lower)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	106 typ = MatrixType::Lower;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	107 else if (hermitian)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	108 typ = MatrixType::Hermitian;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	109 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	110 typ = MatrixType::Full;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	111 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	112 else
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	113 typ = MatrixType::Rectangular;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	114
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	115 return typ;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	116 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	117
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	118 template<class T>
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	119 MatrixType::matrix_type
10713 0e05ed9f2a62 improve some MatrixType code Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	120 matrix_complex_probe (const MArray<std::complex<T> >& a)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	121 {
18676 5bd1ca29c5f0 Clean up questionable code bits identified by clang sanitize. Rik <rik@octave.org> parents: 18084 diff changeset	122 MatrixType::matrix_type typ = MatrixType::Unknown;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	123 octave_idx_type nrows = a.rows ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	124 octave_idx_type ncols = a.cols ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	125
10713 0e05ed9f2a62 improve some MatrixType code Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	126 const T zero = 0;
0e05ed9f2a62 improve some MatrixType code Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	127 // get the real type
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	128
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	129 if (ncols == nrows)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	130 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	131 bool upper = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	132 bool lower = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	133 bool hermitian = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	134
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	135 // do the checks for lower/upper/hermitian all in one pass.
15022 e47b4e8c2714 maint: Use space after OCTAVE_LOCAL_BUFFER invocation in liboctave source code. Rik <rik@octave.org> parents: 15020 diff changeset	136 OCTAVE_LOCAL_BUFFER (T, diag, ncols);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	137
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	138 for (octave_idx_type j = 0;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	139 j < ncols && upper; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	140 {
10713 0e05ed9f2a62 improve some MatrixType code Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	141 std::complex<T> d = a.elem (j,j);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	142 upper = upper && (d != zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	143 lower = lower && (d != zero);
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	144 hermitian = hermitian && (d.real () > zero && d.imag () == zero);
460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	145 diag[j] = d.real ();
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	146 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	147
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	148 for (octave_idx_type j = 0;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	149 j < ncols && (upper \|\| lower \|\| hermitian); j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	150 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	151 for (octave_idx_type i = 0; i < j; i++)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	152 {
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 17769 diff changeset	153 std::complex<T> aij = a.elem (i,j);
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 17769 diff changeset	154 std::complex<T> aji = a.elem (j,i);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	155 lower = lower && (aij == zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	156 upper = upper && (aji == zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	157 hermitian = hermitian && (aij == std::conj (aji)
10713 0e05ed9f2a62 improve some MatrixType code Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	158 && std::norm (aij) < diag[i]*diag[j]);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	159 }
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	160 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	161
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	162
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	163 if (upper)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	164 typ = MatrixType::Upper;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	165 else if (lower)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	166 typ = MatrixType::Lower;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	167 else if (hermitian)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	168 typ = MatrixType::Hermitian;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	169 else if (ncols == nrows)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	170 typ = MatrixType::Full;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	171 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	172 else
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	173 typ = MatrixType::Rectangular;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	174
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	175 return typ;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	176 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	177
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	178 MatrixType::MatrixType (const Matrix &a)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	179 : typ (MatrixType::Unknown),
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	180 sp_bandden (0), bandden (0), upper_band (0), lower_band (0),
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	181 dense (false), full (true), nperm (0), perm (0)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	182 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	183 typ = matrix_real_probe (a);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	184 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	185
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	186 MatrixType::MatrixType (const ComplexMatrix &a)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	187 : typ (MatrixType::Unknown),
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	188 sp_bandden (0), bandden (0), upper_band (0), lower_band (0),
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	189 dense (false), full (true), nperm (0), perm (0)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	190 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	191 typ = matrix_complex_probe (a);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	192 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	193
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	194
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	195 MatrixType::MatrixType (const FloatMatrix &a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	196 : typ (MatrixType::Unknown),
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	197 sp_bandden (0), bandden (0), upper_band (0), lower_band (0),
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	198 dense (false), full (true), nperm (0), perm (0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	199 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	200 typ = matrix_real_probe (a);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	201 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	202
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	203 MatrixType::MatrixType (const FloatComplexMatrix &a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	204 : typ (MatrixType::Unknown),
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	205 sp_bandden (0), bandden (0), upper_band (0), lower_band (0),
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	206 dense (false), full (true), nperm (0), perm (0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	207 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	208 typ = matrix_complex_probe (a);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	209 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	210
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	211 MatrixType::MatrixType (const SparseMatrix &a)
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	212 : typ (MatrixType::Unknown),
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	213 sp_bandden (0), bandden (0), upper_band (0), lower_band (0),
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	214 dense (false), full (false), nperm (0), perm (0)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	215 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	216 octave_idx_type nrows = a.rows ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	217 octave_idx_type ncols = a.cols ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	218 octave_idx_type nm = (ncols < nrows ? ncols : nrows);
10506 bdf5d85cfc5e replace nzmax by nnz where appropriate in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	219 octave_idx_type nnz = a.nnz ();
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	220
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	221 if (octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	222 (*current_liboctave_warning_handler)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	223 ("Calculating Sparse Matrix Type");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	224
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	225 sp_bandden = octave_sparse_params::get_bandden ();
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	226 bool maybe_hermitian = false;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	227 typ = MatrixType::Full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	228
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	229 if (nnz == nm)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	230 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	231 matrix_type tmp_typ = MatrixType::Diagonal;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	232 octave_idx_type i;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	233 // Maybe the matrix is diagonal
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	234 for (i = 0; i < nm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	235 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	236 if (a.cidx (i+1) != a.cidx (i) + 1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	237 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	238 tmp_typ = MatrixType::Full;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	239 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	240 }
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	241 if (a.ridx (i) != i)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	242 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	243 tmp_typ = MatrixType::Permuted_Diagonal;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	244 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	245 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	246 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	247
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	248 if (tmp_typ == MatrixType::Permuted_Diagonal)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	249 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	250 std::vector<bool> found (nrows);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	251
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	252 for (octave_idx_type j = 0; j < i; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	253 found[j] = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	254 for (octave_idx_type j = i; j < nrows; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	255 found[j] = false;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	256
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	257 for (octave_idx_type j = i; j < nm; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	258 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	259 if ((a.cidx (j+1) > a.cidx (j) + 1) \|\|
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	260 ((a.cidx (j+1) == a.cidx (j) + 1) && found[a.ridx (j)]))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	261 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	262 tmp_typ = MatrixType::Full;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	263 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	264 }
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	265 found[a.ridx (j)] = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	266 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	267 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	268 typ = tmp_typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	269 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	270
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	271 if (typ == MatrixType::Full)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	272 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	273 // Search for banded, upper and lower triangular matrices
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	274 bool singular = false;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	275 upper_band = 0;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	276 lower_band = 0;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	277 for (octave_idx_type j = 0; j < ncols; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	278 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	279 bool zero_on_diagonal = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	280 if (j < nrows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	281 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	282 zero_on_diagonal = true;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	283 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	284 if (a.ridx (i) == j)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	285 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	286 zero_on_diagonal = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	287 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	288 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	289 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	290
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	291 if (zero_on_diagonal)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	292 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	293 singular = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	294 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	295 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	296
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	297 if (a.cidx (j+1) != a.cidx (j))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	298 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	299 octave_idx_type ru = a.ridx (a.cidx (j));
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	300 octave_idx_type rl = a.ridx (a.cidx (j+1)-1);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	301
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	302 if (j - ru > upper_band)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	303 upper_band = j - ru;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	304
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	305 if (rl - j > lower_band)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	306 lower_band = rl - j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	307 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	308 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	309
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	310 if (!singular)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	311 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	312 bandden = double (nnz) /
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	313 (double (ncols) * (double (lower_band) +
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	314 double (upper_band)) -
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	315 0.5 * double (upper_band + 1) * double (upper_band) -
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	316 0.5 * double (lower_band + 1) * double (lower_band));
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	317
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	318 if (nrows == ncols && sp_bandden != 1. && bandden > sp_bandden)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	319 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	320 if (upper_band == 1 && lower_band == 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	321 typ = MatrixType::Tridiagonal;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	322 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	323 typ = MatrixType::Banded;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	324
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	325 octave_idx_type nnz_in_band =
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	326 (upper_band + lower_band + 1) * nrows -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	327 (1 + upper_band) * upper_band / 2 -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	328 (1 + lower_band) * lower_band / 2;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	329 if (nnz_in_band == nnz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	330 dense = true;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	331 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	332 dense = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	333 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	334 else if (upper_band == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	335 typ = MatrixType::Lower;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	336 else if (lower_band == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	337 typ = MatrixType::Upper;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	338
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	339 if (upper_band == lower_band && nrows == ncols)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	340 maybe_hermitian = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	341 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	342
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	343 if (typ == MatrixType::Full)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	344 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	345 // Search for a permuted triangular matrix, and test if
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	346 // permutation is singular
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	347
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	348 // FIXME: Perhaps this should be based on a dmperm algorithm?
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	349 bool found = false;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	350
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	351 nperm = ncols;
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	352 perm = new octave_idx_type [ncols];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	353
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	354 for (octave_idx_type i = 0; i < ncols; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	355 perm[i] = -1;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	356
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	357 for (octave_idx_type i = 0; i < nm; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	358 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	359 found = false;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	360
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	361 for (octave_idx_type j = 0; j < ncols; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	362 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	363 if ((a.cidx (j+1) - a.cidx (j)) > 0 &&
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	364 (a.ridx (a.cidx (j+1)-1) == i))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	365 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	366 perm[i] = j;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	367 found = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	368 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	369 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	370 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	371
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	372 if (!found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	373 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	374 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	375
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	376 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	377 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	378 typ = MatrixType::Permuted_Upper;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	379 if (ncols > nrows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	380 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	381 octave_idx_type k = nrows;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	382 for (octave_idx_type i = 0; i < ncols; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	383 if (perm[i] == -1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	384 perm[i] = k++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	385 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	386 }
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	387 else if (a.cidx (nm) == a.cidx (ncols))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	388 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	389 nperm = nrows;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	390 delete [] perm;
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	391 perm = new octave_idx_type [nrows];
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	392 OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, nrows);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	393
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	394 for (octave_idx_type i = 0; i < nrows; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	395 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	396 perm[i] = -1;
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	397 tmp[i] = -1;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	398 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	399
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	400 for (octave_idx_type j = 0; j < ncols; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	401 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	402 perm[a.ridx (i)] = j;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	403
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	404 found = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	405 for (octave_idx_type i = 0; i < nm; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	406 if (perm[i] == -1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	407 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	408 found = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	409 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	410 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	411 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	412 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	413 tmp[perm[i]] = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	414 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	415
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	416 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	417 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	418 octave_idx_type k = ncols;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	419 for (octave_idx_type i = 0; i < nrows; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	420 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	421 if (tmp[i] == -1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	422 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	423 if (k < nrows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	424 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	425 perm[k++] = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	426 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	427 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	428 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	429 found = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	430 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	431 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	432 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	433 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	434 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	435
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	436 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	437 typ = MatrixType::Permuted_Lower;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	438 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	439 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	440 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	441 nperm = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	442 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	443 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	444 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	445 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	446 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	447 nperm = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	448 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	449 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	450
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	451 // FIXME: Disable lower under-determined and upper over-determined
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	452 // problems as being detected, and force to treat as singular
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	453 // as this seems to cause issues.
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	454 if (((typ == MatrixType::Lower \|\| typ == MatrixType::Permuted_Lower)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	455 && nrows > ncols) \|\|
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	456 ((typ == MatrixType::Upper \|\| typ == MatrixType::Permuted_Upper)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	457 && nrows < ncols))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	458 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	459 if (typ == MatrixType::Permuted_Upper \|\|
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	460 typ == MatrixType::Permuted_Lower)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	461 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	462 nperm = 0;
14097 4804ad4ce0de Plug memory leak in Matrixtype for sparse permuted matrices. Rik <octave@nomad.inbox5.com> parents: 12564 diff changeset	463 typ = MatrixType::Rectangular;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	464 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	465
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	466 if (typ == MatrixType::Full && ncols != nrows)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	467 typ = MatrixType::Rectangular;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	468
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	469 if (maybe_hermitian && (typ == MatrixType::Full \|\|
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	470 typ == MatrixType::Tridiagonal \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	471 typ == MatrixType::Banded))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	472 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	473 bool is_herm = true;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	474
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	475 // first, check whether the diagonal is positive & extract it
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	476 ColumnVector diag (ncols);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	477
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	478 for (octave_idx_type j = 0; is_herm && j < ncols; j++)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	479 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	480 is_herm = false;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	481 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	482 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	483 if (a.ridx (i) == j)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	484 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	485 double d = a.data (i);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	486 is_herm = d > 0.;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	487 diag(j) = d;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	488 break;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	489 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	490 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	491 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	492
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	493
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	494 // next, check symmetry and 2x2 positiveness
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	495
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	496 for (octave_idx_type j = 0; is_herm && j < ncols; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	497 for (octave_idx_type i = a.cidx (j); is_herm && i < a.cidx (j+1); i++)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	498 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	499 octave_idx_type k = a.ridx (i);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	500 is_herm = k == j;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	501 if (is_herm)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	502 continue;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	503 double d = a.data (i);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	504 if (dd < diag(j)diag(k))
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	505 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	506 for (octave_idx_type l = a.cidx (k); l < a.cidx (k+1); l++)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	507 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	508 if (a.ridx (l) == j)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	509 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	510 is_herm = a.data (l) == d;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	511 break;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	512 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	513 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	514 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	515 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	516
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	517 if (is_herm)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	518 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	519 if (typ == MatrixType::Full)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	520 typ = MatrixType::Hermitian;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	521 else if (typ == MatrixType::Banded)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	522 typ = MatrixType::Banded_Hermitian;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	523 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	524 typ = MatrixType::Tridiagonal_Hermitian;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	525 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	526 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	527 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	528 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	529
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	530 MatrixType::MatrixType (const SparseComplexMatrix &a)
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	531 : typ (MatrixType::Unknown),
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	532 sp_bandden (0), bandden (0), upper_band (0), lower_band (0),
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	533 dense (false), full (false), nperm (0), perm (0)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	534 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	535 octave_idx_type nrows = a.rows ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	536 octave_idx_type ncols = a.cols ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	537 octave_idx_type nm = (ncols < nrows ? ncols : nrows);
10506 bdf5d85cfc5e replace nzmax by nnz where appropriate in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	538 octave_idx_type nnz = a.nnz ();
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	539
5996 bd0507994409 [project @ 2006-09-22 19:38:52 by dbateman] dbateman parents: 5893 diff changeset	540 if (octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	541 (*current_liboctave_warning_handler)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	542 ("Calculating Sparse Matrix Type");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	543
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	544 sp_bandden = octave_sparse_params::get_bandden ();
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	545 bool maybe_hermitian = false;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	546 typ = MatrixType::Full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	547
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	548 if (nnz == nm)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	549 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	550 matrix_type tmp_typ = MatrixType::Diagonal;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	551 octave_idx_type i;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	552 // Maybe the matrix is diagonal
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	553 for (i = 0; i < nm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	554 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	555 if (a.cidx (i+1) != a.cidx (i) + 1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	556 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	557 tmp_typ = MatrixType::Full;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	558 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	559 }
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	560 if (a.ridx (i) != i)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	561 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	562 tmp_typ = MatrixType::Permuted_Diagonal;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	563 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	564 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	565 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	566
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	567 if (tmp_typ == MatrixType::Permuted_Diagonal)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	568 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	569 std::vector<bool> found (nrows);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	570
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	571 for (octave_idx_type j = 0; j < i; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	572 found[j] = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	573 for (octave_idx_type j = i; j < nrows; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	574 found[j] = false;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	575
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	576 for (octave_idx_type j = i; j < nm; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	577 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	578 if ((a.cidx (j+1) > a.cidx (j) + 1) \|\|
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	579 ((a.cidx (j+1) == a.cidx (j) + 1) && found[a.ridx (j)]))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	580 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	581 tmp_typ = MatrixType::Full;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	582 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	583 }
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	584 found[a.ridx (j)] = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	585 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	586 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	587 typ = tmp_typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	588 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	589
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	590 if (typ == MatrixType::Full)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	591 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	592 // Search for banded, upper and lower triangular matrices
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	593 bool singular = false;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	594 upper_band = 0;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	595 lower_band = 0;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	596 for (octave_idx_type j = 0; j < ncols; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	597 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	598 bool zero_on_diagonal = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	599 if (j < nrows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	600 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	601 zero_on_diagonal = true;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	602 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	603 if (a.ridx (i) == j)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	604 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	605 zero_on_diagonal = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	606 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	607 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	608 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	609
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	610 if (zero_on_diagonal)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	611 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	612 singular = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	613 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	614 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	615
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	616 if (a.cidx (j+1) != a.cidx (j))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	617 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	618 octave_idx_type ru = a.ridx (a.cidx (j));
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	619 octave_idx_type rl = a.ridx (a.cidx (j+1)-1);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	620
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	621 if (j - ru > upper_band)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	622 upper_band = j - ru;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	623
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	624 if (rl - j > lower_band)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	625 lower_band = rl - j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	626 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	627 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	628
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	629 if (!singular)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	630 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	631 bandden = double (nnz) /
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	632 (double (ncols) * (double (lower_band) +
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	633 double (upper_band)) -
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	634 0.5 * double (upper_band + 1) * double (upper_band) -
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	635 0.5 * double (lower_band + 1) * double (lower_band));
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	636
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	637 if (nrows == ncols && sp_bandden != 1. && bandden > sp_bandden)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	638 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	639 if (upper_band == 1 && lower_band == 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	640 typ = MatrixType::Tridiagonal;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	641 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	642 typ = MatrixType::Banded;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	643
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	644 octave_idx_type nnz_in_band =
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	645 (upper_band + lower_band + 1) * nrows -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	646 (1 + upper_band) * upper_band / 2 -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	647 (1 + lower_band) * lower_band / 2;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	648 if (nnz_in_band == nnz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	649 dense = true;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	650 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	651 dense = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	652 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	653 else if (upper_band == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	654 typ = MatrixType::Lower;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	655 else if (lower_band == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	656 typ = MatrixType::Upper;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	657
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	658 if (upper_band == lower_band && nrows == ncols)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	659 maybe_hermitian = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	660 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	661
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	662 if (typ == MatrixType::Full)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	663 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	664 // Search for a permuted triangular matrix, and test if
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	665 // permutation is singular
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	666
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	667 // FIXME: Perhaps this should be based on a dmperm algorithm?
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	668 bool found = false;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	669
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	670 nperm = ncols;
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	671 perm = new octave_idx_type [ncols];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	672
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	673 for (octave_idx_type i = 0; i < ncols; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	674 perm[i] = -1;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	675
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	676 for (octave_idx_type i = 0; i < nm; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	677 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	678 found = false;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	679
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	680 for (octave_idx_type j = 0; j < ncols; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	681 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	682 if ((a.cidx (j+1) - a.cidx (j)) > 0 &&
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	683 (a.ridx (a.cidx (j+1)-1) == i))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	684 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	685 perm[i] = j;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	686 found = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	687 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	688 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	689 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	690
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	691 if (!found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	692 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	693 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	694
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	695 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	696 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	697 typ = MatrixType::Permuted_Upper;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	698 if (ncols > nrows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	699 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	700 octave_idx_type k = nrows;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	701 for (octave_idx_type i = 0; i < ncols; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	702 if (perm[i] == -1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	703 perm[i] = k++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	704 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	705 }
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	706 else if (a.cidx (nm) == a.cidx (ncols))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	707 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	708 nperm = nrows;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	709 delete [] perm;
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	710 perm = new octave_idx_type [nrows];
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	711 OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, nrows);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	712
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	713 for (octave_idx_type i = 0; i < nrows; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	714 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	715 perm[i] = -1;
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	716 tmp[i] = -1;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	717 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	718
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	719 for (octave_idx_type j = 0; j < ncols; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	720 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	721 perm[a.ridx (i)] = j;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	722
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	723 found = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	724 for (octave_idx_type i = 0; i < nm; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	725 if (perm[i] == -1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	726 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	727 found = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	728 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	729 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	730 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	731 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	732 tmp[perm[i]] = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	733 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	734
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	735 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	736 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	737 octave_idx_type k = ncols;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	738 for (octave_idx_type i = 0; i < nrows; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	739 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	740 if (tmp[i] == -1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	741 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	742 if (k < nrows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	743 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	744 perm[k++] = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	745 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	746 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	747 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	748 found = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	749 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	750 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	751 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	752 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	753 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	754
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	755 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	756 typ = MatrixType::Permuted_Lower;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	757 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	758 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	759 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	760 nperm = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	761 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	762 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	763 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	764 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	765 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	766 nperm = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	767 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	768 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	769
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	770 // FIXME: Disable lower under-determined and upper over-determined
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	771 // problems as being detected, and force to treat as singular
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	772 // as this seems to cause issues.
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	773 if (((typ == MatrixType::Lower \|\| typ == MatrixType::Permuted_Lower)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	774 && nrows > ncols) \|\|
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	775 ((typ == MatrixType::Upper \|\| typ == MatrixType::Permuted_Upper)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	776 && nrows < ncols))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	777 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	778 if (typ == MatrixType::Permuted_Upper \|\|
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	779 typ == MatrixType::Permuted_Lower)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	780 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	781 nperm = 0;
14097 4804ad4ce0de Plug memory leak in Matrixtype for sparse permuted matrices. Rik <octave@nomad.inbox5.com> parents: 12564 diff changeset	782 typ = MatrixType::Rectangular;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	783 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	784
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	785 if (typ == MatrixType::Full && ncols != nrows)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	786 typ = MatrixType::Rectangular;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	787
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	788 if (maybe_hermitian && (typ == MatrixType::Full \|\|
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	789 typ == MatrixType::Tridiagonal \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	790 typ == MatrixType::Banded))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	791 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	792 bool is_herm = true;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	793
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	794 // first, check whether the diagonal is positive & extract it
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	795 ColumnVector diag (ncols);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	796
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	797 for (octave_idx_type j = 0; is_herm && j < ncols; j++)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	798 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	799 is_herm = false;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	800 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	801 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	802 if (a.ridx (i) == j)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	803 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	804 Complex d = a.data (i);
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	805 is_herm = d.real () > 0. && d.imag () == 0.;
460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	806 diag(j) = d.real ();
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	807 break;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	808 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	809 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	810 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	811
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	812 // next, check symmetry and 2x2 positiveness
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	813
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	814 for (octave_idx_type j = 0; is_herm && j < ncols; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	815 for (octave_idx_type i = a.cidx (j); is_herm && i < a.cidx (j+1); i++)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	816 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	817 octave_idx_type k = a.ridx (i);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	818 is_herm = k == j;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	819 if (is_herm)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	820 continue;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	821 Complex d = a.data (i);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	822 if (std::norm (d) < diag(j)*diag(k))
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	823 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	824 d = std::conj (d);
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	825 for (octave_idx_type l = a.cidx (k); l < a.cidx (k+1); l++)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	826 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	827 if (a.ridx (l) == j)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	828 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	829 is_herm = a.data (l) == d;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	830 break;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	831 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	832 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	833 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	834 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	835
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	836
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	837 if (is_herm)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	838 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	839 if (typ == MatrixType::Full)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	840 typ = MatrixType::Hermitian;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	841 else if (typ == MatrixType::Banded)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	842 typ = MatrixType::Banded_Hermitian;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	843 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	844 typ = MatrixType::Tridiagonal_Hermitian;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	845 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	846 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	847 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	848 }
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	849 MatrixType::MatrixType (const matrix_type t, bool _full)
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	850 : typ (MatrixType::Unknown),
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	851 sp_bandden (octave_sparse_params::get_bandden ()),
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	852 bandden (0), upper_band (0), lower_band (0),
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	853 dense (false), full (_full), nperm (0), perm (0)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	854 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	855 if (t == MatrixType::Unknown \|\| t == MatrixType::Full
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	856 \|\| t == MatrixType::Diagonal \|\| t == MatrixType::Permuted_Diagonal
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	857 \|\| t == MatrixType::Upper \|\| t == MatrixType::Lower
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	858 \|\| t == MatrixType::Tridiagonal \|\| t == MatrixType::Tridiagonal_Hermitian
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	859 \|\| t == MatrixType::Rectangular)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	860 typ = t;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	861 else
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	862 (*current_liboctave_warning_handler) ("Invalid matrix type");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	863 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	864
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	865 MatrixType::MatrixType (const matrix_type t, const octave_idx_type np,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	866 const octave_idx_type *p, bool _full)
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	867 : typ (MatrixType::Unknown),
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	868 sp_bandden (octave_sparse_params::get_bandden ()),
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	869 bandden (0), upper_band (0), lower_band (0),
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	870 dense (false), full (_full), nperm (0), perm (0)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	871 {
6027 068e52f1c005 [project @ 2006-10-03 20:07:56 by jwe] jwe parents: 5997 diff changeset	872 if ((t == MatrixType::Permuted_Upper \|\| t == MatrixType::Permuted_Lower) &&
068e52f1c005 [project @ 2006-10-03 20:07:56 by jwe] jwe parents: 5997 diff changeset	873 np > 0 && p != 0)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	874 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	875 typ = t;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	876 nperm = np;
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	877 perm = new octave_idx_type [nperm];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	878 for (octave_idx_type i = 0; i < nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	879 perm[i] = p[i];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	880 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	881 else
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	882 (*current_liboctave_warning_handler) ("Invalid matrix type");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	883 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	884
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	885 MatrixType::MatrixType (const matrix_type t, const octave_idx_type ku,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	886 const octave_idx_type kl, bool _full)
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	887 : typ (MatrixType::Unknown),
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	888 sp_bandden (octave_sparse_params::get_bandden ()),
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	889 bandden (0), upper_band (0), lower_band (0),
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	890 dense (false), full (_full), nperm (0), perm (0)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	891 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	892 if (t == MatrixType::Banded \|\| t == MatrixType::Banded_Hermitian)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	893 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	894 typ = t;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	895 upper_band = ku;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	896 lower_band = kl;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	897 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	898 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	899 (*current_liboctave_warning_handler) ("Invalid sparse matrix type");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	900 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	901
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	902 MatrixType::~MatrixType (void)
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	903 {
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	904 if (nperm != 0)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	905 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	906 delete [] perm;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	907 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	908 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	909
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	910 MatrixType&
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	911 MatrixType::operator = (const MatrixType& a)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	912 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	913 if (this != &a)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	914 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	915 typ = a.typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	916 sp_bandden = a.sp_bandden;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	917 bandden = a.bandden;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	918 upper_band = a.upper_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	919 lower_band = a.lower_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	920 dense = a.dense;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	921 full = a.full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	922
12564 61cd086e9aeb Correct slight logical mistake in memleak patch (bug #32804) Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12563 diff changeset	923 if (nperm)
61cd086e9aeb Correct slight logical mistake in memleak patch (bug #32804) Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12563 diff changeset	924 {
61cd086e9aeb Correct slight logical mistake in memleak patch (bug #32804) Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12563 diff changeset	925 delete[] perm;
61cd086e9aeb Correct slight logical mistake in memleak patch (bug #32804) Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12563 diff changeset	926 }
61cd086e9aeb Correct slight logical mistake in memleak patch (bug #32804) Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12563 diff changeset	927
12563 681bb733f4f4 MatrixType:: plug memory leak (bug #32804). Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	928 if (a.nperm != 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	929 {
12563 681bb733f4f4 MatrixType:: plug memory leak (bug #32804). Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	930 perm = new octave_idx_type [a.nperm];
681bb733f4f4 MatrixType:: plug memory leak (bug #32804). Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	931 for (octave_idx_type i = 0; i < a.nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	932 perm[i] = a.perm[i];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	933 }
12563 681bb733f4f4 MatrixType:: plug memory leak (bug #32804). Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	934
681bb733f4f4 MatrixType:: plug memory leak (bug #32804). Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	935 nperm = a.nperm;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	936 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	937
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	938 return *this;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	939 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	940
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	941 int
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	942 MatrixType::type (bool quiet)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	943 {
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	944 if (typ != MatrixType::Unknown
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	945 && (full \|\| sp_bandden == octave_sparse_params::get_bandden ()))
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	946 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	947 if (!quiet &&
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	948 octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	949 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	950 ("Using Cached Matrix Type");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	951
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	952 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	953 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	954
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	955 if (typ != MatrixType::Unknown &&
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	956 octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	957 (*current_liboctave_warning_handler)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	958 ("Invalidating Matrix Type");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	959
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	960 typ = MatrixType::Unknown;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	961
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	962 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	963 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	964
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	965 int
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	966 MatrixType::type (const SparseMatrix &a)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	967 {
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	968 if (typ != MatrixType::Unknown
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	969 && (full \|\| sp_bandden == octave_sparse_params::get_bandden ()))
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	970 {
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	971 if (octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	972 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	973 ("Using Cached Matrix Type");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	974
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	975 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	976 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	977
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	978 MatrixType tmp_typ (a);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	979 typ = tmp_typ.typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	980 sp_bandden = tmp_typ.sp_bandden;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	981 bandden = tmp_typ.bandden;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	982 upper_band = tmp_typ.upper_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	983 lower_band = tmp_typ.lower_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	984 dense = tmp_typ.dense;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	985 full = tmp_typ.full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	986 nperm = tmp_typ.nperm;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	987
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	988 if (nperm != 0)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	989 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	990 perm = new octave_idx_type [nperm];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	991 for (octave_idx_type i = 0; i < nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	992 perm[i] = tmp_typ.perm[i];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	993 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	994
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	995 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	996 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	997
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	998 int
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	999 MatrixType::type (const SparseComplexMatrix &a)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1000 {
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1001 if (typ != MatrixType::Unknown
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1002 && (full \|\| sp_bandden == octave_sparse_params::get_bandden ()))
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1003 {
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	1004 if (octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1005 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1006 ("Using Cached Matrix Type");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1007
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1008 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1009 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1010
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1011 MatrixType tmp_typ (a);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1012 typ = tmp_typ.typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1013 sp_bandden = tmp_typ.sp_bandden;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1014 bandden = tmp_typ.bandden;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1015 upper_band = tmp_typ.upper_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1016 lower_band = tmp_typ.lower_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1017 dense = tmp_typ.dense;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1018 full = tmp_typ.full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1019 nperm = tmp_typ.nperm;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1020
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1021 if (nperm != 0)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1022 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	1023 perm = new octave_idx_type [nperm];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1024 for (octave_idx_type i = 0; i < nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1025 perm[i] = tmp_typ.perm[i];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1026 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1027
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1028 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1029 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1030
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1031 int
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1032 MatrixType::type (const Matrix &a)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1033 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1034 if (typ != MatrixType::Unknown)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1035 {
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	1036 if (octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1037 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1038 ("Using Cached Matrix Type");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1039
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1040 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1041 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1042
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1043 MatrixType tmp_typ (a);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1044 typ = tmp_typ.typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1045 full = tmp_typ.full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1046 nperm = tmp_typ.nperm;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1047
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1048 if (nperm != 0)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1049 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	1050 perm = new octave_idx_type [nperm];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1051 for (octave_idx_type i = 0; i < nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1052 perm[i] = tmp_typ.perm[i];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1053 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1054
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1055 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1056 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1057
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1058 int
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1059 MatrixType::type (const ComplexMatrix &a)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1060 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1061 if (typ != MatrixType::Unknown)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1062 {
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	1063 if (octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1064 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1065 ("Using Cached Matrix Type");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1066
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1067 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1068 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1069
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1070 MatrixType tmp_typ (a);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1071 typ = tmp_typ.typ;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1072 full = tmp_typ.full;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1073 nperm = tmp_typ.nperm;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1074
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1075 if (nperm != 0)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1076 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	1077 perm = new octave_idx_type [nperm];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1078 for (octave_idx_type i = 0; i < nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1079 perm[i] = tmp_typ.perm[i];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1080 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1081
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1082 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1083 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1084
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1085 int
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1086 MatrixType::type (const FloatMatrix &a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1087 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1088 if (typ != MatrixType::Unknown)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1089 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1090 if (octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1091 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1092 ("Using Cached Matrix Type");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1093
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1094 return typ;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1095 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1096
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1097 MatrixType tmp_typ (a);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1098 typ = tmp_typ.typ;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1099 full = tmp_typ.full;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1100 nperm = tmp_typ.nperm;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1101
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1102 if (nperm != 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1103 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	1104 perm = new octave_idx_type [nperm];
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1105 for (octave_idx_type i = 0; i < nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1106 perm[i] = tmp_typ.perm[i];
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1107 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1108
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1109 return typ;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1110 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1111
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1112 int
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1113 MatrixType::type (const FloatComplexMatrix &a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1114 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1115 if (typ != MatrixType::Unknown)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1116 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1117 if (octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1118 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1119 ("Using Cached Matrix Type");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1120
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1121 return typ;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1122 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1123
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1124 MatrixType tmp_typ (a);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1125 typ = tmp_typ.typ;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1126 full = tmp_typ.full;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1127 nperm = tmp_typ.nperm;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1128
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1129 if (nperm != 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1130 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	1131 perm = new octave_idx_type [nperm];
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1132 for (octave_idx_type i = 0; i < nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1133 perm[i] = tmp_typ.perm[i];
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1134 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1135
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1136 return typ;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1137 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1138
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1139 void
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1140 MatrixType::info () const
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1141 {
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	1142 if (octave_sparse_params::get_key ("spumoni") != 0.)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1143 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1144 if (typ == MatrixType::Unknown)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1145 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1146 ("Unknown Matrix Type");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1147 else if (typ == MatrixType::Diagonal)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1148 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1149 ("Diagonal Sparse Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1150 else if (typ == MatrixType::Permuted_Diagonal)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1151 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1152 ("Permuted Diagonal Sparse Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1153 else if (typ == MatrixType::Upper)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1154 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1155 ("Upper Triangular Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1156 else if (typ == MatrixType::Lower)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1157 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1158 ("Lower Triangular Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1159 else if (typ == MatrixType::Permuted_Upper)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1160 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1161 ("Permuted Upper Triangular Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1162 else if (typ == MatrixType::Permuted_Lower)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1163 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1164 ("Permuted Lower Triangular Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1165 else if (typ == MatrixType::Banded)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1166 (*current_liboctave_warning_handler)
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1167 ("Banded Sparse Matrix %d-1-%d (Density %f)", lower_band,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1168 upper_band, bandden);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1169 else if (typ == MatrixType::Banded_Hermitian)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1170 (*current_liboctave_warning_handler)
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1171 ("Banded Hermitian/Symmetric Sparse Matrix %d-1-%d (Density %f)",
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1172 lower_band, upper_band, bandden);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1173 else if (typ == MatrixType::Hermitian)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1174 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1175 ("Hermitian/Symmetric Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1176 else if (typ == MatrixType::Tridiagonal)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1177 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1178 ("Tridiagonal Sparse Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1179 else if (typ == MatrixType::Tridiagonal_Hermitian)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1180 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1181 ("Hermitian/Symmetric Tridiagonal Sparse Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1182 else if (typ == MatrixType::Rectangular)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1183 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1184 ("Rectangular/Singular Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1185 else if (typ == MatrixType::Full)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1186 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1187 ("Full Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1188 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1189 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1190
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1191 void
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1192 MatrixType::mark_as_symmetric (void)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1193 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1194 if (typ == MatrixType::Tridiagonal \|\|
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1195 typ == MatrixType::Tridiagonal_Hermitian)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1196 typ = MatrixType::Tridiagonal_Hermitian;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1197 else if (typ == MatrixType::Banded \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1198 typ == MatrixType::Banded_Hermitian)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1199 typ = MatrixType::Banded_Hermitian;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1200 else if (typ == MatrixType::Full \|\| typ == MatrixType::Hermitian \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1201 typ == MatrixType::Unknown)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1202 typ = MatrixType::Hermitian;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1203 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1204 (*current_liboctave_error_handler)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1205 ("Can not mark current matrix type as symmetric");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1206 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1207
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1208 void
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1209 MatrixType::mark_as_unsymmetric (void)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1210 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1211 if (typ == MatrixType::Tridiagonal \|\|
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1212 typ == MatrixType::Tridiagonal_Hermitian)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1213 typ = MatrixType::Tridiagonal;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1214 else if (typ == MatrixType::Banded \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1215 typ == MatrixType::Banded_Hermitian)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1216 typ = MatrixType::Banded;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1217 else if (typ == MatrixType::Full \|\| typ == MatrixType::Hermitian \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1218 typ == MatrixType::Unknown)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1219 typ = MatrixType::Full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1220 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1221
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1222 void
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1223 MatrixType::mark_as_permuted (const octave_idx_type np,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1224 const octave_idx_type *p)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1225 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1226 nperm = np;
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	1227 perm = new octave_idx_type [nperm];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1228 for (octave_idx_type i = 0; i < nperm; i++)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1229 perm[i] = p[i];
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1230
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1231 if (typ == MatrixType::Diagonal \|\| typ == MatrixType::Permuted_Diagonal)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1232 typ = MatrixType::Permuted_Diagonal;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1233 else if (typ == MatrixType::Upper \|\| typ == MatrixType::Permuted_Upper)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1234 typ = MatrixType::Permuted_Upper;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1235 else if (typ == MatrixType::Lower \|\| typ == MatrixType::Permuted_Lower)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1236 typ = MatrixType::Permuted_Lower;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1237 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1238 (*current_liboctave_error_handler)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1239 ("Can not mark current matrix type as symmetric");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1240 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1241
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1242 void
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1243 MatrixType::mark_as_unpermuted (void)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1244 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1245 if (nperm)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1246 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1247 nperm = 0;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1248 delete [] perm;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1249 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1250
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1251 if (typ == MatrixType::Diagonal \|\| typ == MatrixType::Permuted_Diagonal)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1252 typ = MatrixType::Diagonal;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1253 else if (typ == MatrixType::Upper \|\| typ == MatrixType::Permuted_Upper)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1254 typ = MatrixType::Upper;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1255 else if (typ == MatrixType::Lower \|\| typ == MatrixType::Permuted_Lower)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1256 typ = MatrixType::Lower;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1257 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1258
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1259 MatrixType
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1260 MatrixType::transpose (void) const
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1261 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1262 MatrixType retval (*this);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1263 if (typ == MatrixType::Upper)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1264 retval.typ = MatrixType::Lower;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1265 else if (typ == MatrixType::Permuted_Upper)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1266 retval.typ = MatrixType::Permuted_Lower;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1267 else if (typ == MatrixType::Lower)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1268 retval.typ = MatrixType::Upper;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1269 else if (typ == MatrixType::Permuted_Lower)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1270 retval.typ = MatrixType::Permuted_Upper;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1271 else if (typ == MatrixType::Banded)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1272 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1273 retval.upper_band = lower_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1274 retval.lower_band = upper_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1275 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1276
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1277 return retval;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1278 }

Mercurial > octave-dspies

annotate liboctave/array/MatrixType.cc @ 18676:5bd1ca29c5f0