octave-lyh: liboctave/MatrixType.cc annotate

annotate liboctave/MatrixType.cc @ 10396:a0b51ac0f88a

optimize accumdim with summation

author	Jaroslav Hajek <highegg@gmail.com>
date	Fri, 05 Mar 2010 12:31:30 +0100
parents	12884915a8e4
children	bdf5d85cfc5e

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
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	3 Copyright (C) 2006, 2007, 2008 David Bateman
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	4 Copyright (C) 2006 Andy Adler
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	5
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6460 diff changeset	6 This file is part of Octave.
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6460 diff changeset	7
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	8 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	9 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	10 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	11 option) any later version.
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	12
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	13 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	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	15 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	16 for more details.
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	17
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	18 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	19 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	20 <http://www.gnu.org/licenses/>.
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	21
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 #ifdef HAVE_CONFIG_H
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	25 #include <config.h>
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	26 #endif
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	27
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	28 #include <vector>
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	29
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	30 #include "MatrixType.h"
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	31 #include "dMatrix.h"
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	32 #include "CMatrix.h"
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	33 #include "dSparse.h"
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	34 #include "CSparse.h"
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	35 #include "oct-spparms.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 7798 diff changeset	36 #include "oct-locbuf.h"
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	37
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	38 // FIXME There is a large code duplication here
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	39
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	40 MatrixType::MatrixType (void)
6460 fa6312d93730 [project @ 2007-03-26 21:23:00 by dbateman] dbateman parents: 6452 diff changeset	41 : typ (MatrixType::Unknown),
fa6312d93730 [project @ 2007-03-26 21:23:00 by dbateman] dbateman parents: 6452 diff changeset	42 sp_bandden (octave_sparse_params::get_bandden()),
fa6312d93730 [project @ 2007-03-26 21:23:00 by dbateman] dbateman parents: 6452 diff changeset	43 bandden (0), upper_band (0),
6452 7e90124eddba [project @ 2007-03-24 22:18:14 by dbateman] dbateman parents: 6027 diff changeset	44 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	45
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	46 MatrixType::MatrixType (const MatrixType &a)
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	47 : typ (a.typ), sp_bandden (a.sp_bandden), bandden (a.bandden),
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	48 upper_band (a.upper_band), lower_band (a.lower_band),
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	49 dense (a.dense), full (a.full), nperm (a.nperm)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	50 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	51 if (nperm != 0)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	52 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	53 perm = new octave_idx_type [nperm];
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	54 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	55 perm[i] = a.perm[i];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	56 }
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
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	59 template<class T>
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	60 MatrixType::matrix_type
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	61 matrix_real_probe (const MArray<T>& a)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	62 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	63 MatrixType::matrix_type typ;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	64 octave_idx_type nrows = a.rows ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	65 octave_idx_type ncols = a.cols ();
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	66
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	67 const T zero = 0;
5997 49dfdb54bb2b [project @ 2006-09-23 13:29:18 by dbateman] dbateman parents: 5996 diff changeset	68
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	69 if (ncols == nrows)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	70 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	71 bool upper = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	72 bool lower = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	73 bool hermitian = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	74
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	75 // do the checks for lower/upper/hermitian all in one pass.
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	76 ColumnVector diag(ncols);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	77
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	78 for (octave_idx_type j = 0;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	79 j < ncols && upper; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	80 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	81 T d = a.elem (j,j);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	82 upper = upper && (d != zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	83 lower = lower && (d != zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	84 hermitian = hermitian && (d > zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	85 diag(j) = d;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	86 }
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 for (octave_idx_type j = 0;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	89 j < ncols && (upper \|\| lower \|\| hermitian); j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	90 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	91 for (octave_idx_type i = 0; i < j; i++)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	92 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	93 double aij = a.elem (i,j), aji = a.elem (j,i);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	94 lower = lower && (aij == zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	95 upper = upper && (aji == zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	96 hermitian = hermitian && (aij == aji
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	97 && aijaij < diag(i)diag(j));
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	98 }
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	99 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	100
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	101 if (upper)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	102 typ = MatrixType::Upper;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	103 else if (lower)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	104 typ = MatrixType::Lower;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	105 else if (hermitian)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	106 typ = MatrixType::Hermitian;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	107 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	108 typ = MatrixType::Full;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	109 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	110 else
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	111 typ = MatrixType::Rectangular;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	112
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	113 return typ;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	114 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	115
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	116 template<class T>
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	117 MatrixType::matrix_type
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	118 matrix_complex_probe (const MArray<T>& a)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	119 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	120 MatrixType::matrix_type typ;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	121 octave_idx_type nrows = a.rows ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	122 octave_idx_type ncols = a.cols ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	123
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	124 const typename T::value_type zero = 0;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	125
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	126 if (ncols == nrows)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	127 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	128 bool upper = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	129 bool lower = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	130 bool hermitian = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	131
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	132 // do the checks for lower/upper/hermitian all in one pass.
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	133 ColumnVector diag(ncols);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	134
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	135 for (octave_idx_type j = 0;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	136 j < ncols && upper; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	137 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	138 T d = a.elem (j,j);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	139 upper = upper && (d != zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	140 lower = lower && (d != zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	141 hermitian = hermitian && (d.real() > zero && d.imag() == zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	142 diag (j) = d.real();
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	143 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	144
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	145 for (octave_idx_type j = 0;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	146 j < ncols && (upper \|\| lower \|\| hermitian); j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	147 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	148 for (octave_idx_type i = 0; i < j; i++)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	149 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	150 T aij = a.elem (i,j), aji = a.elem (j,i);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	151 lower = lower && (aij == zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	152 upper = upper && (aji == zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	153 hermitian = hermitian && (aij == std::conj (aji)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	154 && std::norm (aij) < diag(i)*diag(j));
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	155 }
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	156 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	157
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	158
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	159 if (upper)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	160 typ = MatrixType::Upper;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	161 else if (lower)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	162 typ = MatrixType::Lower;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	163 else if (hermitian)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	164 typ = MatrixType::Hermitian;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	165 else if (ncols == nrows)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	166 typ = MatrixType::Full;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	167 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	168 else
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	169 typ = MatrixType::Rectangular;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	170
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	171 return typ;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	172 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	173
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	174 MatrixType::MatrixType (const Matrix &a)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	175 : typ (MatrixType::Unknown),
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	176 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	177 dense (false), full (true), nperm (0), perm (0)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	178 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	179 typ = matrix_real_probe (a);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	180 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	181
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	182 MatrixType::MatrixType (const ComplexMatrix &a)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	183 : typ (MatrixType::Unknown),
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	184 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	185 dense (false), full (true), nperm (0), perm (0)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	186 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	187 typ = matrix_complex_probe (a);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	188 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	189
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	190
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	191 MatrixType::MatrixType (const FloatMatrix &a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	192 : typ (MatrixType::Unknown),
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	193 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	194 dense (false), full (true), nperm (0), perm (0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	195 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	196 typ = matrix_real_probe (a);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	197 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	198
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	199 MatrixType::MatrixType (const FloatComplexMatrix &a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	200 : typ (MatrixType::Unknown),
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	201 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	202 dense (false), full (true), nperm (0), perm (0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	203 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	204 typ = matrix_complex_probe (a);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	205 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	206
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	207 MatrixType::MatrixType (const SparseMatrix &a)
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	208 : typ (MatrixType::Unknown),
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	209 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	210 dense (false), full (false), nperm (0), perm (0)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	211 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	212 octave_idx_type nrows = a.rows ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	213 octave_idx_type ncols = a.cols ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	214 octave_idx_type nm = (ncols < nrows ? ncols : nrows);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	215 octave_idx_type nnz = a.nzmax ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	216
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	217 if (octave_sparse_params::get_key ("spumoni") != 0.)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	218 (*current_liboctave_warning_handler)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	219 ("Calculating Sparse Matrix Type");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	220
6460 fa6312d93730 [project @ 2007-03-26 21:23:00 by dbateman] dbateman parents: 6452 diff changeset	221 sp_bandden = octave_sparse_params::get_bandden();
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	222 bool maybe_hermitian = false;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	223 typ = MatrixType::Full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	224
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	225 if (nnz == nm)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	226 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	227 matrix_type tmp_typ = MatrixType::Diagonal;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	228 octave_idx_type i;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	229 // Maybe the matrix is diagonal
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	230 for (i = 0; i < nm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	231 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	232 if (a.cidx(i+1) != a.cidx(i) + 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	233 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	234 tmp_typ = MatrixType::Full;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	235 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	236 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	237 if (a.ridx(i) != i)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	238 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	239 tmp_typ = MatrixType::Permuted_Diagonal;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	240 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	241 }
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
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	244 if (tmp_typ == MatrixType::Permuted_Diagonal)
10314 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 std::vector<bool> found (nrows);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	247
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	248 for (octave_idx_type j = 0; j < i; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	249 found [j] = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	250 for (octave_idx_type j = i; j < nrows; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	251 found [j] = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	252
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	253 for (octave_idx_type j = i; j < nm; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	254 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	255 if ((a.cidx(j+1) > a.cidx(j) + 1) \|\|
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	256 ((a.cidx(j+1) == a.cidx(j) + 1) && found [a.ridx(j)]))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	257 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	258 tmp_typ = MatrixType::Full;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	259 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	260 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	261 found [a.ridx(j)] = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	262 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	263 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	264 typ = tmp_typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	265 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	266
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	267 if (typ == MatrixType::Full)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	268 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	269 // Search for banded, upper and lower triangular matrices
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	270 bool singular = false;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	271 upper_band = 0;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	272 lower_band = 0;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	273 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	274 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	275 bool zero_on_diagonal = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	276 if (j < nrows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	277 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	278 zero_on_diagonal = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	279 for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	280 if (a.ridx(i) == j)
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 = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	283 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	284 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	285 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	286
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	287 if (zero_on_diagonal)
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 singular = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	290 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	291 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	292
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	293 if (a.cidx(j+1) != a.cidx(j))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	294 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	295 octave_idx_type ru = a.ridx(a.cidx(j));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	296 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	297
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	298 if (j - ru > upper_band)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	299 upper_band = j - ru;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	300
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	301 if (rl - j > lower_band)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	302 lower_band = rl - j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	303 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	304 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	305
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	306 if (!singular)
10314 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 bandden = double (nnz) /
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	309 (double (ncols) * (double (lower_band) +
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	310 double (upper_band)) -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	311 0.5 * double (upper_band + 1) * double (upper_band) -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	312 0.5 * double (lower_band + 1) * double (lower_band));
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	313
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	314 if (nrows == ncols && sp_bandden != 1. && bandden > sp_bandden)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	315 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	316 if (upper_band == 1 && lower_band == 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	317 typ = MatrixType::Tridiagonal;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	318 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	319 typ = MatrixType::Banded;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	320
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	321 octave_idx_type nnz_in_band =
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	322 (upper_band + lower_band + 1) * nrows -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	323 (1 + upper_band) * upper_band / 2 -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	324 (1 + lower_band) * lower_band / 2;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	325 if (nnz_in_band == nnz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	326 dense = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	327 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	328 dense = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	329 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	330 else if (upper_band == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	331 typ = MatrixType::Lower;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	332 else if (lower_band == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	333 typ = MatrixType::Upper;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	334
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	335 if (upper_band == lower_band && nrows == ncols)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	336 maybe_hermitian = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	337 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	338
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	339 if (typ == MatrixType::Full)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	340 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	341 // Search for a permuted triangular matrix, and test if
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	342 // permutation is singular
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	343
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	344 // FIXME
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	345 // Perhaps this should be based on a dmperm algorithm
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	346 bool found = false;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	347
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	348 nperm = ncols;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	349 perm = new octave_idx_type [ncols];
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 for (octave_idx_type i = 0; i < ncols; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	352 perm [i] = -1;
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 < nm; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	355 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	356 found = false;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	357
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	358 for (octave_idx_type j = 0; j < ncols; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	359 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	360 if ((a.cidx(j+1) - a.cidx(j)) > 0 &&
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	361 (a.ridx(a.cidx(j+1)-1) == i))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	362 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	363 perm [i] = j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	364 found = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	365 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	366 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	367 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	368
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	369 if (!found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	370 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	371 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	372
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	373 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	374 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	375 typ = MatrixType::Permuted_Upper;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	376 if (ncols > nrows)
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 octave_idx_type k = nrows;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	379 for (octave_idx_type i = 0; i < ncols; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	380 if (perm [i] == -1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	381 perm[i] = k++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	382 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	383 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	384 else if (a.cidx(nm) == a.cidx(ncols))
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 nperm = nrows;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	387 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	388 perm = new octave_idx_type [nrows];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	389 OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, nrows);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	390
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	391 for (octave_idx_type i = 0; i < nrows; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	392 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	393 perm [i] = -1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	394 tmp [i] = -1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	395 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	396
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	397 for (octave_idx_type j = 0; j < ncols; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	398 for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	399 perm [a.ridx(i)] = j;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	400
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	401 found = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	402 for (octave_idx_type i = 0; i < nm; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	403 if (perm[i] == -1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	404 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	405 found = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	406 break;
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 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	409 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	410 tmp[perm[i]] = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	411 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	412
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	413 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	414 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	415 octave_idx_type k = ncols;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	416 for (octave_idx_type i = 0; i < nrows; i++)
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 if (tmp[i] == -1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	419 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	420 if (k < nrows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	421 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	422 perm[k++] = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	423 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	424 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	425 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	426 found = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	427 break;
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 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	430 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	431 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	432
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	433 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	434 typ = MatrixType::Permuted_Lower;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	435 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	436 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	437 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	438 nperm = 0;
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 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	441 else
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 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	444 nperm = 0;
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 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	447
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	448 // FIXME
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	449 // Disable lower under-determined and upper over-determined problems
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	450 // as being detected, and force to treat as singular. As this seems
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	451 // to cause issues
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	452 if (((typ == MatrixType::Lower \|\| typ == MatrixType::Permuted_Lower)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	453 && nrows > ncols) \|\|
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	454 ((typ == MatrixType::Upper \|\| typ == MatrixType::Permuted_Upper)
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 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	457 typ = MatrixType::Rectangular;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	458 if (typ == MatrixType::Permuted_Upper \|\|
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	459 typ == MatrixType::Permuted_Lower)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	460 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	461 nperm = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	462 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	463
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	464 if (typ == MatrixType::Full && ncols != nrows)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	465 typ = MatrixType::Rectangular;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	466
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	467 if (maybe_hermitian && (typ == MatrixType::Full \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	468 typ == MatrixType::Tridiagonal \|\|
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	469 typ == MatrixType::Banded))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	470 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	471 bool is_herm = true;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	472
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	473 // first, check whether the diagonal is positive & extract it
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	474 ColumnVector diag (ncols);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	475
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	476 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	477 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	478 is_herm = false;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	479 for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	480 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	481 if (a.ridx(i) == j)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	482 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	483 double d = a.data(i);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	484 is_herm = d > 0.;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	485 diag(j) = d;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	486 break;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	487 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	488 }
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 // next, check symmetry and 2x2 positiveness
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	493
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	494 for (octave_idx_type j = 0; is_herm && j < ncols; j++)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	495 for (octave_idx_type i = a.cidx(j); is_herm && i < a.cidx(j+1); i++)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	496 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	497 octave_idx_type k = a.ridx(i);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	498 is_herm = k == j;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	499 if (is_herm)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	500 continue;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	501 double d = a.data(i);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	502 if (dd < diag(j)diag(k))
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	503 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	504 for (octave_idx_type l = a.cidx(k); l < a.cidx(k+1); l++)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	505 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	506 if (a.ridx(l) == j)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	507 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	508 is_herm = a.data(l) == d;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	509 break;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	510 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	511 }
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 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	514
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	515 if (is_herm)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	516 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	517 if (typ == MatrixType::Full)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	518 typ = MatrixType::Hermitian;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	519 else if (typ == MatrixType::Banded)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	520 typ = MatrixType::Banded_Hermitian;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	521 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	522 typ = MatrixType::Tridiagonal_Hermitian;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	523 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	524 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	525 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	526 }
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 MatrixType::MatrixType (const SparseComplexMatrix &a)
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	529 : typ (MatrixType::Unknown),
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	530 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	531 dense (false), full (false), nperm (0), perm (0)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	532 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	533 octave_idx_type nrows = a.rows ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	534 octave_idx_type ncols = a.cols ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	535 octave_idx_type nm = (ncols < nrows ? ncols : nrows);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	536 octave_idx_type nnz = a.nzmax ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	537
5996 bd0507994409 [project @ 2006-09-22 19:38:52 by dbateman] dbateman parents: 5893 diff changeset	538 if (octave_sparse_params::get_key ("spumoni") != 0.)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	539 (*current_liboctave_warning_handler)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	540 ("Calculating Sparse Matrix Type");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	541
6460 fa6312d93730 [project @ 2007-03-26 21:23:00 by dbateman] dbateman parents: 6452 diff changeset	542 sp_bandden = octave_sparse_params::get_bandden();
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	543 bool maybe_hermitian = false;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	544 typ = MatrixType::Full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	545
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	546 if (nnz == nm)
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 matrix_type tmp_typ = MatrixType::Diagonal;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	549 octave_idx_type i;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	550 // Maybe the matrix is diagonal
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	551 for (i = 0; i < nm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	552 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	553 if (a.cidx(i+1) != a.cidx(i) + 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	554 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	555 tmp_typ = MatrixType::Full;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	556 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	557 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	558 if (a.ridx(i) != i)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	559 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	560 tmp_typ = MatrixType::Permuted_Diagonal;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	561 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	562 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	563 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	564
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	565 if (tmp_typ == MatrixType::Permuted_Diagonal)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	566 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	567 std::vector<bool> found (nrows);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	568
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	569 for (octave_idx_type j = 0; j < i; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	570 found [j] = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	571 for (octave_idx_type j = i; j < nrows; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	572 found [j] = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	573
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	574 for (octave_idx_type j = i; j < nm; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	575 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	576 if ((a.cidx(j+1) > a.cidx(j) + 1) \|\|
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	577 ((a.cidx(j+1) == a.cidx(j) + 1) && found [a.ridx(j)]))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	578 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	579 tmp_typ = MatrixType::Full;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	580 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	581 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	582 found [a.ridx(j)] = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	583 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	584 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	585 typ = tmp_typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	586 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	587
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	588 if (typ == MatrixType::Full)
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 // Search for banded, upper and lower triangular matrices
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	591 bool singular = false;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	592 upper_band = 0;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	593 lower_band = 0;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	594 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	595 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	596 bool zero_on_diagonal = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	597 if (j < nrows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	598 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	599 zero_on_diagonal = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	600 for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	601 if (a.ridx(i) == j)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	602 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	603 zero_on_diagonal = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	604 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	605 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	606 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	607
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	608 if (zero_on_diagonal)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	609 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	610 singular = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	611 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	612 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	613
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	614 if (a.cidx(j+1) != a.cidx(j))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	615 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	616 octave_idx_type ru = a.ridx(a.cidx(j));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	617 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	618
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	619 if (j - ru > upper_band)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	620 upper_band = j - ru;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	621
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	622 if (rl - j > lower_band)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	623 lower_band = rl - j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	624 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	625 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	626
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	627 if (!singular)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	628 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	629 bandden = double (nnz) /
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	630 (double (ncols) * (double (lower_band) +
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	631 double (upper_band)) -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	632 0.5 * double (upper_band + 1) * double (upper_band) -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	633 0.5 * double (lower_band + 1) * double (lower_band));
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	634
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	635 if (nrows == ncols && sp_bandden != 1. && bandden > sp_bandden)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	636 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	637 if (upper_band == 1 && lower_band == 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	638 typ = MatrixType::Tridiagonal;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	639 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	640 typ = MatrixType::Banded;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	641
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	642 octave_idx_type nnz_in_band =
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	643 (upper_band + lower_band + 1) * nrows -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	644 (1 + upper_band) * upper_band / 2 -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	645 (1 + lower_band) * lower_band / 2;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	646 if (nnz_in_band == nnz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	647 dense = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	648 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	649 dense = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	650 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	651 else if (upper_band == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	652 typ = MatrixType::Lower;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	653 else if (lower_band == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	654 typ = MatrixType::Upper;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	655
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	656 if (upper_band == lower_band && nrows == ncols)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	657 maybe_hermitian = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	658 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	659
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	660 if (typ == MatrixType::Full)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	661 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	662 // Search for a permuted triangular matrix, and test if
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	663 // permutation is singular
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	664
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	665 // FIXME
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	666 // Perhaps this should be based on a dmperm algorithm
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	667 bool found = false;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	668
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	669 nperm = ncols;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	670 perm = new octave_idx_type [ncols];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	671
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	672 for (octave_idx_type i = 0; i < ncols; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	673 perm [i] = -1;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	674
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	675 for (octave_idx_type i = 0; i < nm; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	676 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	677 found = false;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	678
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	679 for (octave_idx_type j = 0; j < ncols; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	680 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	681 if ((a.cidx(j+1) - a.cidx(j)) > 0 &&
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	682 (a.ridx(a.cidx(j+1)-1) == i))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	683 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	684 perm [i] = j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	685 found = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	686 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	687 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	688 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	689
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	690 if (!found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	691 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	692 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	693
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	694 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	695 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	696 typ = MatrixType::Permuted_Upper;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	697 if (ncols > nrows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	698 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	699 octave_idx_type k = nrows;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	700 for (octave_idx_type i = 0; i < ncols; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	701 if (perm [i] == -1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	702 perm[i] = k++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	703 }
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 else if (a.cidx(nm) == a.cidx(ncols))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	706 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	707 nperm = nrows;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	708 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	709 perm = new octave_idx_type [nrows];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	710 OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, nrows);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	711
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	712 for (octave_idx_type i = 0; i < nrows; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	713 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	714 perm [i] = -1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	715 tmp [i] = -1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	716 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	717
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	718 for (octave_idx_type j = 0; j < ncols; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	719 for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	720 perm [a.ridx(i)] = j;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	721
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	722 found = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	723 for (octave_idx_type i = 0; i < nm; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	724 if (perm[i] == -1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	725 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	726 found = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	727 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	728 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	729 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	730 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	731 tmp[perm[i]] = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	732 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	733
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	734 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	735 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	736 octave_idx_type k = ncols;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	737 for (octave_idx_type i = 0; i < nrows; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	738 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	739 if (tmp[i] == -1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	740 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	741 if (k < nrows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	742 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	743 perm[k++] = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	744 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	745 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	746 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	747 found = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	748 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	749 }
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 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	753
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	754 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	755 typ = MatrixType::Permuted_Lower;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	756 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	757 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	758 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	759 nperm = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	760 }
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 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	763 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	764 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	765 nperm = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	766 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	767 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	768
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	769 // FIXME
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	770 // Disable lower under-determined and upper over-determined problems
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	771 // as being detected, and force to treat as singular. As this seems
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	772 // to cause issues
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 typ = MatrixType::Rectangular;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	779 if (typ == MatrixType::Permuted_Upper \|\|
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	780 typ == MatrixType::Permuted_Lower)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	781 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	782 nperm = 0;
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
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	788 if (maybe_hermitian && (typ == MatrixType::Full \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	789 typ == MatrixType::Tridiagonal \|\|
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;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	800 for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	801 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	802 if (a.ridx(i) == j)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	803 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	804 Complex d = a.data(i);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	805 is_herm = d.real() > 0. && d.imag() == 0.;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	806 diag(j) = d.real();
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++)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	815 for (octave_idx_type i = a.cidx(j); is_herm && i < a.cidx(j+1); i++)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	816 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	817 octave_idx_type k = a.ridx(i);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	818 is_herm = k == j;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	819 if (is_herm)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	820 continue;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	821 Complex d = a.data(i);
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);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	825 for (octave_idx_type l = a.cidx(k); l < a.cidx(k+1); l++)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	826 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	827 if (a.ridx(l) == j)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	828 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	829 is_herm = a.data(l) == d;
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),
6460 fa6312d93730 [project @ 2007-03-26 21:23:00 by dbateman] dbateman parents: 6452 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 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	855 if (t == MatrixType::Unknown \|\| t == MatrixType::Full
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	856 \|\| t == MatrixType::Diagonal \|\| t == MatrixType::Permuted_Diagonal
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	857 \|\| t == MatrixType::Upper \|\| t == MatrixType::Lower
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),
6460 fa6312d93730 [project @ 2007-03-26 21:23:00 by dbateman] dbateman parents: 6452 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;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	877 perm = new octave_idx_type [nperm];
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),
6460 fa6312d93730 [project @ 2007-03-26 21:23:00 by dbateman] dbateman parents: 6452 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
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	899 (*current_liboctave_warning_handler) ("Invalid sparse matrix type");
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
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	902 MatrixType::~MatrixType (void)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	903 {
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 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	906 delete [] perm;
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
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	910 MatrixType&
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 nperm = a.nperm;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	923
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	924 if (nperm != 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	925 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	926 perm = new octave_idx_type [nperm];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	927 for (octave_idx_type i = 0; i < nperm; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	928 perm[i] = a.perm[i];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	929 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	930 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	931
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	932 return *this;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	933 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	934
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	935 int
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	936 MatrixType::type (bool quiet)
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 if (typ != MatrixType::Unknown && (full \|\|
6460 fa6312d93730 [project @ 2007-03-26 21:23:00 by dbateman] dbateman parents: 6452 diff changeset	939 sp_bandden == octave_sparse_params::get_bandden()))
5785 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 if (!quiet &&
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	942 octave_sparse_params::get_key ("spumoni") != 0.)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	943 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	944 ("Using Cached Matrix Type");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	945
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	946 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	947 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	948
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	949 if (typ != MatrixType::Unknown &&
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	950 octave_sparse_params::get_key ("spumoni") != 0.)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	951 (*current_liboctave_warning_handler)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	952 ("Invalidating Matrix Type");
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 typ = MatrixType::Unknown;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	955
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	956 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	957 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	958
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	959 int
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	960 MatrixType::type (const SparseMatrix &a)
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 if (typ != MatrixType::Unknown && (full \|\|
6460 fa6312d93730 [project @ 2007-03-26 21:23:00 by dbateman] dbateman parents: 6452 diff changeset	963 sp_bandden == octave_sparse_params::get_bandden()))
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	964 {
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	965 if (octave_sparse_params::get_key ("spumoni") != 0.)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	966 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	967 ("Using Cached Matrix Type");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	968
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	969 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	970 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	971
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	972 MatrixType tmp_typ (a);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	973 typ = tmp_typ.typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	974 sp_bandden = tmp_typ.sp_bandden;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	975 bandden = tmp_typ.bandden;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	976 upper_band = tmp_typ.upper_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	977 lower_band = tmp_typ.lower_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	978 dense = tmp_typ.dense;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	979 full = tmp_typ.full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	980 nperm = tmp_typ.nperm;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	981
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	982 if (nperm != 0)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	983 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	984 perm = new octave_idx_type [nperm];
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	985 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	986 perm[i] = tmp_typ.perm[i];
5785 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
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	989 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	990 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	991
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	992 int
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	993 MatrixType::type (const SparseComplexMatrix &a)
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 if (typ != MatrixType::Unknown && (full \|\|
6460 fa6312d93730 [project @ 2007-03-26 21:23:00 by dbateman] dbateman parents: 6452 diff changeset	996 sp_bandden == octave_sparse_params::get_bandden()))
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	997 {
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	998 if (octave_sparse_params::get_key ("spumoni") != 0.)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	999 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1000 ("Using Cached Matrix Type");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1001
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1002 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1003 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1004
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1005 MatrixType tmp_typ (a);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1006 typ = tmp_typ.typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1007 sp_bandden = tmp_typ.sp_bandden;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1008 bandden = tmp_typ.bandden;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1009 upper_band = tmp_typ.upper_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1010 lower_band = tmp_typ.lower_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1011 dense = tmp_typ.dense;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1012 full = tmp_typ.full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1013 nperm = tmp_typ.nperm;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1014
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1015 if (nperm != 0)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1016 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1017 perm = new octave_idx_type [nperm];
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1018 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	1019 perm[i] = tmp_typ.perm[i];
5785 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
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1022 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1023 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1024
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1025 int
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1026 MatrixType::type (const Matrix &a)
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 if (typ != MatrixType::Unknown)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1029 {
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	1030 if (octave_sparse_params::get_key ("spumoni") != 0.)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1031 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1032 ("Using Cached Matrix Type");
5785 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 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1035 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1036
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1037 MatrixType tmp_typ (a);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1038 typ = tmp_typ.typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1039 full = tmp_typ.full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1040 nperm = tmp_typ.nperm;
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 if (nperm != 0)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1043 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1044 perm = new octave_idx_type [nperm];
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1045 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	1046 perm[i] = tmp_typ.perm[i];
5785 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
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1049 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1050 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1051
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1052 int
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1053 MatrixType::type (const ComplexMatrix &a)
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 if (typ != MatrixType::Unknown)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1056 {
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	1057 if (octave_sparse_params::get_key ("spumoni") != 0.)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1058 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1059 ("Using Cached Matrix Type");
5785 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 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1062 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1063
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1064 MatrixType tmp_typ (a);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1065 typ = tmp_typ.typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1066 full = tmp_typ.full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1067 nperm = tmp_typ.nperm;
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 if (nperm != 0)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1070 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1071 perm = new octave_idx_type [nperm];
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1072 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	1073 perm[i] = tmp_typ.perm[i];
5785 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
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1076 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1077 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1078
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1079 int
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1080 MatrixType::type (const FloatMatrix &a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1081 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1082 if (typ != MatrixType::Unknown)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1083 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1084 if (octave_sparse_params::get_key ("spumoni") != 0.)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1085 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1086 ("Using Cached Matrix Type");
7789 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 return typ;
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
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1091 MatrixType tmp_typ (a);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1092 typ = tmp_typ.typ;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1093 full = tmp_typ.full;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1094 nperm = tmp_typ.nperm;
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 if (nperm != 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1097 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1098 perm = new octave_idx_type [nperm];
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1099 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	1100 perm[i] = tmp_typ.perm[i];
7789 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
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1103 return typ;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1104 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1105
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1106 int
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1107 MatrixType::type (const FloatComplexMatrix &a)
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 if (typ != MatrixType::Unknown)
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 if (octave_sparse_params::get_key ("spumoni") != 0.)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1112 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1113 ("Using Cached Matrix Type");
7789 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 return typ;
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
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1118 MatrixType tmp_typ (a);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1119 typ = tmp_typ.typ;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1120 full = tmp_typ.full;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1121 nperm = tmp_typ.nperm;
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 if (nperm != 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1124 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1125 perm = new octave_idx_type [nperm];
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1126 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	1127 perm[i] = tmp_typ.perm[i];
7789 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
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1130 return typ;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1131 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1132
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1133 void
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1134 MatrixType::info () const
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1135 {
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	1136 if (octave_sparse_params::get_key ("spumoni") != 0.)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1137 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1138 if (typ == MatrixType::Unknown)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1139 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1140 ("Unknown Matrix Type");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1141 else if (typ == MatrixType::Diagonal)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1142 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1143 ("Diagonal Sparse Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1144 else if (typ == MatrixType::Permuted_Diagonal)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1145 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1146 ("Permuted Diagonal Sparse Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1147 else if (typ == MatrixType::Upper)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1148 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1149 ("Upper Triangular Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1150 else if (typ == MatrixType::Lower)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1151 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1152 ("Lower Triangular Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1153 else if (typ == MatrixType::Permuted_Upper)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1154 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1155 ("Permuted Upper Triangular Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1156 else if (typ == MatrixType::Permuted_Lower)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1157 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1158 ("Permuted Lower Triangular Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1159 else if (typ == MatrixType::Banded)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1160 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1161 ("Banded Sparse Matrix %d-1-%d (Density %f)", lower_band,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1162 upper_band, bandden);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1163 else if (typ == MatrixType::Banded_Hermitian)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1164 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1165 ("Banded Hermitian/Symmetric Sparse Matrix %d-1-%d (Density %f)",
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1166 lower_band, upper_band, bandden);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1167 else if (typ == MatrixType::Hermitian)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1168 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1169 ("Hermitian/Symmetric Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1170 else if (typ == MatrixType::Tridiagonal)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1171 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1172 ("Tridiagonal Sparse Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1173 else if (typ == MatrixType::Tridiagonal_Hermitian)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1174 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1175 ("Hermitian/Symmetric Tridiagonal Sparse Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1176 else if (typ == MatrixType::Rectangular)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1177 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1178 ("Rectangular/Singular Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1179 else if (typ == MatrixType::Full)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1180 (*current_liboctave_warning_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1181 ("Full Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1182 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1183 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1184
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1185 void
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1186 MatrixType::mark_as_symmetric (void)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1187 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1188 if (typ == MatrixType::Tridiagonal \|\|
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1189 typ == MatrixType::Tridiagonal_Hermitian)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1190 typ = MatrixType::Tridiagonal_Hermitian;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1191 else if (typ == MatrixType::Banded \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1192 typ == MatrixType::Banded_Hermitian)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1193 typ = MatrixType::Banded_Hermitian;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1194 else if (typ == MatrixType::Full \|\| typ == MatrixType::Hermitian \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1195 typ == MatrixType::Unknown)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1196 typ = MatrixType::Hermitian;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1197 else
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1198 (*current_liboctave_error_handler)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1199 ("Can not mark current matrix type as symmetric");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1200 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1201
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1202 void
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1203 MatrixType::mark_as_unsymmetric (void)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1204 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1205 if (typ == MatrixType::Tridiagonal \|\|
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1206 typ == MatrixType::Tridiagonal_Hermitian)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1207 typ = MatrixType::Tridiagonal;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1208 else if (typ == MatrixType::Banded \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1209 typ == MatrixType::Banded_Hermitian)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1210 typ = MatrixType::Banded;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1211 else if (typ == MatrixType::Full \|\| typ == MatrixType::Hermitian \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1212 typ == MatrixType::Unknown)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1213 typ = MatrixType::Full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1214 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1215
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1216 void
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1217 MatrixType::mark_as_permuted (const octave_idx_type np, const octave_idx_type *p)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1218 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1219 nperm = np;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1220 perm = new octave_idx_type [nperm];
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1221 for (octave_idx_type i = 0; i < nperm; i++)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1222 perm[i] = p[i];
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1223
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1224 if (typ == MatrixType::Diagonal \|\| typ == MatrixType::Permuted_Diagonal)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1225 typ = MatrixType::Permuted_Diagonal;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1226 else if (typ == MatrixType::Upper \|\| typ == MatrixType::Permuted_Upper)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1227 typ = MatrixType::Permuted_Upper;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1228 else if (typ == MatrixType::Lower \|\| typ == MatrixType::Permuted_Lower)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1229 typ = MatrixType::Permuted_Lower;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1230 else
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1231 (*current_liboctave_error_handler)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1232 ("Can not mark current matrix type as symmetric");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1233 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1234
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1235 void
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1236 MatrixType::mark_as_unpermuted (void)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1237 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1238 if (nperm)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1239 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1240 nperm = 0;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1241 delete [] perm;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1242 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1243
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1244 if (typ == MatrixType::Diagonal \|\| typ == MatrixType::Permuted_Diagonal)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1245 typ = MatrixType::Diagonal;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1246 else if (typ == MatrixType::Upper \|\| typ == MatrixType::Permuted_Upper)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1247 typ = MatrixType::Upper;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1248 else if (typ == MatrixType::Lower \|\| typ == MatrixType::Permuted_Lower)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1249 typ = MatrixType::Lower;
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
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1252 MatrixType
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1253 MatrixType::transpose (void) const
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1254 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1255 MatrixType retval (*this);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1256 if (typ == MatrixType::Upper)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1257 retval.typ = MatrixType::Lower;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1258 else if (typ == MatrixType::Permuted_Upper)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1259 retval.typ = MatrixType::Permuted_Lower;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1260 else if (typ == MatrixType::Lower)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1261 retval.typ = MatrixType::Upper;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1262 else if (typ == MatrixType::Permuted_Lower)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1263 retval.typ = MatrixType::Permuted_Upper;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1264 else if (typ == MatrixType::Banded)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1265 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1266 retval.upper_band = lower_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1267 retval.lower_band = upper_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1268 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1269
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1270 return retval;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1271 }

Mercurial > hg > octave-lyh

annotate liboctave/MatrixType.cc @ 10396:a0b51ac0f88a