octave-lyh: liboctave/fMatrix.cc annotate

annotate liboctave/fMatrix.cc @ 11570:57632dea2446

attempt better backward compatibility for Array constructors

author	John W. Eaton <jwe@octave.org>
date	Wed, 19 Jan 2011 17:55:56 -0500
parents	fd0a3ac60b0e
children	a83bad07f7e3

rev	line source
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1 // Matrix manipulations.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2 /*
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 11518 diff changeset	4 Copyright (C) 1994-2011 John W. Eaton
fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 11518 diff changeset	5 Copyright (C) 2008-2009 Jaroslav Hajek
9601 a9b37bae1802 add a couple of missing copyright statements Jaroslav Hajek <highegg@gmail.com> parents: 9578 diff changeset	6 Copyright (C) 2009 VZLU Prague, a.s.
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	7
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	8 This file is part of Octave.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	9
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	10 Octave is free software; you can redistribute it and/or modify it
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	11 under the terms of the GNU General Public License as published by the
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	12 Free Software Foundation; either version 3 of the License, or (at your
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	13 option) any later version.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	14
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	15 Octave is distributed in the hope that it will be useful, but WITHOUT
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	18 for more details.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	19
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	20 You should have received a copy of the GNU General Public License
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	21 along with Octave; see the file COPYING. If not, see
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	22 <http://www.gnu.org/licenses/>.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	23
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	24 */
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	25
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	26 #ifdef HAVE_CONFIG_H
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	27 #include <config.h>
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	28 #endif
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	29
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	30 #include <cfloat>
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	31
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	32 #include <iostream>
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	33 #include <vector>
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	34
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	35 #include "Array-util.h"
9523 0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	36 #include "DET.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	37 #include "byte-swap.h"
9523 0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	38 #include "f77-fcn.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	39 #include "fMatrix.h"
9523 0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	40 #include "floatCHOL.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	41 #include "floatSCHUR.h"
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	42 #include "floatSVD.h"
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	43 #include "functor.h"
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	44 #include "lo-error.h"
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	45 #include "lo-ieee.h"
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	46 #include "lo-mappers.h"
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	47 #include "lo-utils.h"
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	48 #include "mx-base.h"
9523 0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	49 #include "mx-fdm-fm.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	50 #include "mx-fm-fdm.h"
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	51 #include "mx-inlines.cc"
8774 b756ce0002db split implementation and interface in mx-op-defs and MArray-defs Jaroslav Hajek <highegg@gmail.com> parents: 8743 diff changeset	52 #include "mx-op-defs.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	53 #include "oct-cmplx.h"
9523 0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	54 #include "oct-fftw.h"
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	55 #include "oct-locbuf.h"
8336 9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	56 #include "oct-norm.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	57 #include "quit.h"
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	58
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	59 // Fortran functions we call.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	60
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	61 extern "C"
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	62 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	63 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	64 F77_FUNC (xilaenv, XILAENV) (const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	65 F77_CONST_CHAR_ARG_DECL,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	66 F77_CONST_CHAR_ARG_DECL,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	67 const octave_idx_type&, const octave_idx_type&,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	68 const octave_idx_type&, const octave_idx_type&,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	69 octave_idx_type&
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	70 F77_CHAR_ARG_LEN_DECL
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	71 F77_CHAR_ARG_LEN_DECL);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	72
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	73 F77_RET_T
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	74 F77_FUNC (sgebal, SGEBAL) (F77_CONST_CHAR_ARG_DECL,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	75 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	76 const octave_idx_type&, octave_idx_type&,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	77 octave_idx_type&, float*, octave_idx_type&
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	78 F77_CHAR_ARG_LEN_DECL);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	79
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	80 F77_RET_T
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	81 F77_FUNC (sgebak, SGEBAK) (F77_CONST_CHAR_ARG_DECL,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	82 F77_CONST_CHAR_ARG_DECL,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	83 const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	84 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	85 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	86 const octave_idx_type&, octave_idx_type&
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	87 F77_CHAR_ARG_LEN_DECL
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	88 F77_CHAR_ARG_LEN_DECL);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	89
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	90
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	91 F77_RET_T
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	92 F77_FUNC (sgemm, SGEMM) (F77_CONST_CHAR_ARG_DECL,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	93 F77_CONST_CHAR_ARG_DECL,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	94 const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	95 const octave_idx_type&, const float&, const float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	96 const octave_idx_type&, const float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	97 const octave_idx_type&, const float&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	98 const octave_idx_type&
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	99 F77_CHAR_ARG_LEN_DECL
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	100 F77_CHAR_ARG_LEN_DECL);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	101
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	102 F77_RET_T
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	103 F77_FUNC (sgemv, SGEMV) (F77_CONST_CHAR_ARG_DECL,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	104 const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	105 const float&, const float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	106 const octave_idx_type&, const float*,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	107 const octave_idx_type&, const float&, float*,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	108 const octave_idx_type&
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	109 F77_CHAR_ARG_LEN_DECL);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	110
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	111 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	112 F77_FUNC (xsdot, XSDOT) (const octave_idx_type&, const float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	113 const octave_idx_type&, const float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	114 const octave_idx_type&, float&);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	115
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	116 F77_RET_T
7804 a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	117 F77_FUNC (ssyrk, SSYRK) (F77_CONST_CHAR_ARG_DECL,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	118 F77_CONST_CHAR_ARG_DECL,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	119 const octave_idx_type&, const octave_idx_type&,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	120 const float&, const float*, const octave_idx_type&,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	121 const float&, float*, const octave_idx_type&
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	122 F77_CHAR_ARG_LEN_DECL
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	123 F77_CHAR_ARG_LEN_DECL);
7804 a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	124
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	125 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	126 F77_FUNC (sgetrf, SGETRF) (const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	127 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	128 const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	129 octave_idx_type*, octave_idx_type&);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	130
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	131 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	132 F77_FUNC (sgetrs, SGETRS) (F77_CONST_CHAR_ARG_DECL,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	133 const octave_idx_type&, const octave_idx_type&,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	134 const float*, const octave_idx_type&,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	135 const octave_idx_type, float,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	136 const octave_idx_type&, octave_idx_type&
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	137 F77_CHAR_ARG_LEN_DECL);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	138
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	139 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	140 F77_FUNC (sgetri, SGETRI) (const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	141 const octave_idx_type&, const octave_idx_type*,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	142 float*, const octave_idx_type&, octave_idx_type&);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	143
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	144 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	145 F77_FUNC (sgecon, SGECON) (F77_CONST_CHAR_ARG_DECL,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	146 const octave_idx_type&, float*,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	147 const octave_idx_type&, const float&, float&,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	148 float, octave_idx_type, octave_idx_type&
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	149 F77_CHAR_ARG_LEN_DECL);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	150
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	151 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	152 F77_FUNC (sgelsy, SGELSY) (const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	153 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	154 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	155 const octave_idx_type&, octave_idx_type*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	156 float&, octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	157 const octave_idx_type&, octave_idx_type&);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	158
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	159 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	160 F77_FUNC (sgelsd, SGELSD) (const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	161 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	162 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	163 const octave_idx_type&, float*, float&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	164 octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	165 const octave_idx_type&, octave_idx_type*,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	166 octave_idx_type&);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	167
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	168 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	169 F77_FUNC (spotrf, SPOTRF) (F77_CONST_CHAR_ARG_DECL,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	170 const octave_idx_type&, float *,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	171 const octave_idx_type&, octave_idx_type&
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	172 F77_CHAR_ARG_LEN_DECL);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	173
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	174 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	175 F77_FUNC (spocon, SPOCON) (F77_CONST_CHAR_ARG_DECL,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	176 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	177 const octave_idx_type&, const float&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	178 float&, float, octave_idx_type,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	179 octave_idx_type&
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	180 F77_CHAR_ARG_LEN_DECL);
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	181 F77_RET_T
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	182 F77_FUNC (spotrs, SPOTRS) (F77_CONST_CHAR_ARG_DECL,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	183 const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	184 const float, const octave_idx_type&, float,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	185 const octave_idx_type&, octave_idx_type&
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	186 F77_CHAR_ARG_LEN_DECL);
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	187
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	188 F77_RET_T
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	189 F77_FUNC (strtri, STRTRI) (F77_CONST_CHAR_ARG_DECL,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	190 F77_CONST_CHAR_ARG_DECL,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	191 const octave_idx_type&, const float*,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	192 const octave_idx_type&, octave_idx_type&
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	193 F77_CHAR_ARG_LEN_DECL
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	194 F77_CHAR_ARG_LEN_DECL);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	195 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	196 F77_FUNC (strcon, STRCON) (F77_CONST_CHAR_ARG_DECL,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	197 F77_CONST_CHAR_ARG_DECL,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	198 F77_CONST_CHAR_ARG_DECL,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	199 const octave_idx_type&, const float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	200 const octave_idx_type&, float&,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	201 float, octave_idx_type, octave_idx_type&
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	202 F77_CHAR_ARG_LEN_DECL
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	203 F77_CHAR_ARG_LEN_DECL
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	204 F77_CHAR_ARG_LEN_DECL);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	205 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	206 F77_FUNC (strtrs, STRTRS) (F77_CONST_CHAR_ARG_DECL,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	207 F77_CONST_CHAR_ARG_DECL,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	208 F77_CONST_CHAR_ARG_DECL,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	209 const octave_idx_type&,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	210 const octave_idx_type&, const float*,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	211 const octave_idx_type&, float*,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	212 const octave_idx_type&, octave_idx_type&
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	213 F77_CHAR_ARG_LEN_DECL
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	214 F77_CHAR_ARG_LEN_DECL
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	215 F77_CHAR_ARG_LEN_DECL);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	216
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	217 F77_RET_T
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	218 F77_FUNC (slartg, SLARTG) (const float&, const float&, float&,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	219 float&, float&);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	220
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	221 F77_RET_T
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	222 F77_FUNC (strsyl, STRSYL) (F77_CONST_CHAR_ARG_DECL,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	223 F77_CONST_CHAR_ARG_DECL,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	224 const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	225 const octave_idx_type&, const float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	226 const octave_idx_type&, const float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	227 const octave_idx_type&, const float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	228 const octave_idx_type&, float&, octave_idx_type&
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	229 F77_CHAR_ARG_LEN_DECL
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	230 F77_CHAR_ARG_LEN_DECL);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	231
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	232 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	233 F77_FUNC (xslange, XSLANGE) (F77_CONST_CHAR_ARG_DECL,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 11516 diff changeset	234 const octave_idx_type&,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	235 const octave_idx_type&, const float*,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	236 const octave_idx_type&, float*, float&
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	237 F77_CHAR_ARG_LEN_DECL);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	238 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	239
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	240 // Matrix class.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	241
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	242 FloatMatrix::FloatMatrix (const FloatRowVector& rv)
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	243 : MArray<float> (rv)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	244 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	245 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	246
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	247 FloatMatrix::FloatMatrix (const FloatColumnVector& cv)
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	248 : MArray<float> (cv)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	249 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	250 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	251
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	252 FloatMatrix::FloatMatrix (const FloatDiagMatrix& a)
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	253 : MArray<float> (a.dims (), 0.0)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	254 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	255 for (octave_idx_type i = 0; i < a.length (); i++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	256 elem (i, i) = a.elem (i, i);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	257 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	258
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8337 diff changeset	259 FloatMatrix::FloatMatrix (const PermMatrix& a)
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	260 : MArray<float> (a.dims (), 0.0)
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8337 diff changeset	261 {
8375 e3c9102431a9 fix design problems of diag & perm matrix classes Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	262 const Array<octave_idx_type> ia (a.pvec ());
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8337 diff changeset	263 octave_idx_type len = a.rows ();
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8337 diff changeset	264 if (a.is_col_perm ())
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8337 diff changeset	265 for (octave_idx_type i = 0; i < len; i++)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8337 diff changeset	266 elem (ia(i), i) = 1.0;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8337 diff changeset	267 else
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8337 diff changeset	268 for (octave_idx_type i = 0; i < len; i++)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8337 diff changeset	269 elem (i, ia(i)) = 1.0;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8337 diff changeset	270 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8337 diff changeset	271
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	272 // FIXME -- could we use a templated mixed-type copy function
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	273 // here?
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	274
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	275 FloatMatrix::FloatMatrix (const boolMatrix& a)
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	276 : MArray<float> (a)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	277 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	278 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	279
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	280 FloatMatrix::FloatMatrix (const charMatrix& a)
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	281 : MArray<float> (a.dims ())
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	282 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	283 for (octave_idx_type i = 0; i < a.rows (); i++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	284 for (octave_idx_type j = 0; j < a.cols (); j++)
8956 d91fa4b20bbb ensure nonnegative char -> real conversion Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	285 elem (i, j) = static_cast<unsigned char> (a.elem (i, j));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	286 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	287
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	288 bool
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	289 FloatMatrix::operator == (const FloatMatrix& a) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	290 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	291 if (rows () != a.rows () \|\| cols () != a.cols ())
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	292 return false;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	293
9550 3d6a9aea2aea refactor binary & bool ops in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9528 diff changeset	294 return mx_inline_equal (length (), data (), a.data ());
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	295 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	296
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	297 bool
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	298 FloatMatrix::operator != (const FloatMatrix& a) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	299 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	300 return !(*this == a);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	301 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	302
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	303 bool
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	304 FloatMatrix::is_symmetric (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	305 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	306 if (is_square () && rows () > 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	307 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	308 for (octave_idx_type i = 0; i < rows (); i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	309 for (octave_idx_type j = i+1; j < cols (); j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	310 if (elem (i, j) != elem (j, i))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	311 return false;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	312
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	313 return true;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	314 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	315
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	316 return false;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	317 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	318
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	319 FloatMatrix&
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	320 FloatMatrix::insert (const FloatMatrix& a, octave_idx_type r, octave_idx_type c)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	321 {
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	322 Array<float>::insert (a, r, c);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	323 return *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	324 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	325
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	326 FloatMatrix&
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	327 FloatMatrix::insert (const FloatRowVector& a, octave_idx_type r, octave_idx_type c)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	328 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	329 octave_idx_type a_len = a.length ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	330
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	331 if (r < 0 \|\| r >= rows () \|\| c < 0 \|\| c + a_len > cols ())
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	332 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	333 (*current_liboctave_error_handler) ("range error for insert");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	334 return *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	335 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	336
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	337 if (a_len > 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	338 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	339 make_unique ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	340
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	341 for (octave_idx_type i = 0; i < a_len; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	342 xelem (r, c+i) = a.elem (i);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	343 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	344
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	345 return *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	346 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	347
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	348 FloatMatrix&
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	349 FloatMatrix::insert (const FloatColumnVector& a, octave_idx_type r, octave_idx_type c)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	350 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	351 octave_idx_type a_len = a.length ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	352
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	353 if (r < 0 \|\| r + a_len > rows () \|\| c < 0 \|\| c >= cols ())
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	354 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	355 (*current_liboctave_error_handler) ("range error for insert");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	356 return *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	357 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	358
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	359 if (a_len > 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	360 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	361 make_unique ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	362
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	363 for (octave_idx_type i = 0; i < a_len; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	364 xelem (r+i, c) = a.elem (i);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	365 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	366
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	367 return *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	368 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	369
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	370 FloatMatrix&
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	371 FloatMatrix::insert (const FloatDiagMatrix& a, octave_idx_type r, octave_idx_type c)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	372 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	373 octave_idx_type a_nr = a.rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	374 octave_idx_type a_nc = a.cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	375
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	376 if (r < 0 \|\| r + a_nr > rows () \|\| c < 0 \|\| c + a_nc > cols ())
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	377 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	378 (*current_liboctave_error_handler) ("range error for insert");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	379 return *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	380 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	381
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	382 fill (0.0, r, c, r + a_nr - 1, c + a_nc - 1);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	383
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	384 octave_idx_type a_len = a.length ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	385
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	386 if (a_len > 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	387 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	388 make_unique ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	389
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	390 for (octave_idx_type i = 0; i < a_len; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	391 xelem (r+i, c+i) = a.elem (i, i);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	392 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	393
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	394 return *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	395 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	396
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	397 FloatMatrix&
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	398 FloatMatrix::fill (float val)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	399 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	400 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	401 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	402
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	403 if (nr > 0 && nc > 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	404 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	405 make_unique ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	406
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	407 for (octave_idx_type j = 0; j < nc; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	408 for (octave_idx_type i = 0; i < nr; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	409 xelem (i, j) = val;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	410 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	411
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	412 return *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	413 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	414
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	415 FloatMatrix&
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	416 FloatMatrix::fill (float val, octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	417 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	418 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	419 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	420
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	421 if (r1 < 0 \|\| r2 < 0 \|\| c1 < 0 \|\| c2 < 0
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	422 \|\| r1 >= nr \|\| r2 >= nr \|\| c1 >= nc \|\| c2 >= nc)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	423 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	424 (*current_liboctave_error_handler) ("range error for fill");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	425 return *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	426 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	427
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	428 if (r1 > r2) { octave_idx_type tmp = r1; r1 = r2; r2 = tmp; }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	429 if (c1 > c2) { octave_idx_type tmp = c1; c1 = c2; c2 = tmp; }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	430
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	431 if (r2 >= r1 && c2 >= c1)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	432 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	433 make_unique ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	434
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	435 for (octave_idx_type j = c1; j <= c2; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	436 for (octave_idx_type i = r1; i <= r2; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	437 xelem (i, j) = val;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	438 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	439
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	440 return *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	441 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	442
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	443 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	444 FloatMatrix::append (const FloatMatrix& a) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	445 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	446 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	447 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	448 if (nr != a.rows ())
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	449 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	450 (*current_liboctave_error_handler) ("row dimension mismatch for append");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	451 return FloatMatrix ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	452 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	453
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	454 octave_idx_type nc_insert = nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	455 FloatMatrix retval (nr, nc + a.cols ());
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	456 retval.insert (*this, 0, 0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	457 retval.insert (a, 0, nc_insert);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	458 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	459 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	460
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	461 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	462 FloatMatrix::append (const FloatRowVector& a) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	463 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	464 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	465 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	466 if (nr != 1)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	467 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	468 (*current_liboctave_error_handler) ("row dimension mismatch for append");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	469 return FloatMatrix ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	470 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	471
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	472 octave_idx_type nc_insert = nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	473 FloatMatrix retval (nr, nc + a.length ());
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	474 retval.insert (*this, 0, 0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	475 retval.insert (a, 0, nc_insert);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	476 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	477 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	478
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	479 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	480 FloatMatrix::append (const FloatColumnVector& a) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	481 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	482 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	483 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	484 if (nr != a.length ())
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	485 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	486 (*current_liboctave_error_handler) ("row dimension mismatch for append");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	487 return FloatMatrix ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	488 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	489
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	490 octave_idx_type nc_insert = nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	491 FloatMatrix retval (nr, nc + 1);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	492 retval.insert (*this, 0, 0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	493 retval.insert (a, 0, nc_insert);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	494 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	495 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	496
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	497 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	498 FloatMatrix::append (const FloatDiagMatrix& a) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	499 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	500 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	501 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	502 if (nr != a.rows ())
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	503 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	504 (*current_liboctave_error_handler) ("row dimension mismatch for append");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	505 return *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	506 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	507
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	508 octave_idx_type nc_insert = nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	509 FloatMatrix retval (nr, nc + a.cols ());
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	510 retval.insert (*this, 0, 0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	511 retval.insert (a, 0, nc_insert);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	512 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	513 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	514
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	515 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	516 FloatMatrix::stack (const FloatMatrix& a) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	517 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	518 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	519 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	520 if (nc != a.cols ())
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	521 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	522 (*current_liboctave_error_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	523 ("column dimension mismatch for stack");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	524 return FloatMatrix ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	525 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	526
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	527 octave_idx_type nr_insert = nr;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	528 FloatMatrix retval (nr + a.rows (), nc);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	529 retval.insert (*this, 0, 0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	530 retval.insert (a, nr_insert, 0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	531 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	532 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	533
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	534 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	535 FloatMatrix::stack (const FloatRowVector& a) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	536 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	537 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	538 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	539 if (nc != a.length ())
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	540 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	541 (*current_liboctave_error_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	542 ("column dimension mismatch for stack");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	543 return FloatMatrix ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	544 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	545
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	546 octave_idx_type nr_insert = nr;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	547 FloatMatrix retval (nr + 1, nc);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	548 retval.insert (*this, 0, 0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	549 retval.insert (a, nr_insert, 0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	550 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	551 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	552
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	553 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	554 FloatMatrix::stack (const FloatColumnVector& a) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	555 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	556 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	557 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	558 if (nc != 1)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	559 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	560 (*current_liboctave_error_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	561 ("column dimension mismatch for stack");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	562 return FloatMatrix ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	563 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	564
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	565 octave_idx_type nr_insert = nr;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	566 FloatMatrix retval (nr + a.length (), nc);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	567 retval.insert (*this, 0, 0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	568 retval.insert (a, nr_insert, 0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	569 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	570 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	571
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	572 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	573 FloatMatrix::stack (const FloatDiagMatrix& a) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	574 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	575 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	576 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	577 if (nc != a.cols ())
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	578 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	579 (*current_liboctave_error_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	580 ("column dimension mismatch for stack");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	581 return FloatMatrix ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	582 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	583
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	584 octave_idx_type nr_insert = nr;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	585 FloatMatrix retval (nr + a.rows (), nc);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	586 retval.insert (*this, 0, 0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	587 retval.insert (a, nr_insert, 0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	588 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	589 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	590
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	591 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	592 real (const FloatComplexMatrix& a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	593 {
10363 a0728e81ed25 improve diag matrix interface & implementation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	594 return do_mx_unary_op<float, FloatComplex> (a, mx_inline_real);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	595 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	596
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	597 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	598 imag (const FloatComplexMatrix& a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	599 {
10363 a0728e81ed25 improve diag matrix interface & implementation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	600 return do_mx_unary_op<float, FloatComplex> (a, mx_inline_imag);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	601 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	602
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	603 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	604 FloatMatrix::extract (octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	605 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	606 if (r1 > r2) { octave_idx_type tmp = r1; r1 = r2; r2 = tmp; }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	607 if (c1 > c2) { octave_idx_type tmp = c1; c1 = c2; c2 = tmp; }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	608
10805 8c858a1a2079 simplify Matrix::extract Jaroslav Hajek <highegg@gmail.com> parents: 10630 diff changeset	609 return index (idx_vector (r1, r2+1), idx_vector (c1, c2+1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	610 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	611
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	612 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	613 FloatMatrix::extract_n (octave_idx_type r1, octave_idx_type c1, octave_idx_type nr, octave_idx_type nc) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	614 {
10806 7c542263a92a omissions from last two patches Jaroslav Hajek <highegg@gmail.com> parents: 10805 diff changeset	615 return index (idx_vector (r1, r1 + nr), idx_vector (c1, c1 + nc));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	616 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	617
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	618 // extract row or column i.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	619
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	620 FloatRowVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	621 FloatMatrix::row (octave_idx_type i) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	622 {
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	623 return index (idx_vector (i), idx_vector::colon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	624 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	625
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	626 FloatColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	627 FloatMatrix::column (octave_idx_type i) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	628 {
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	629 return index (idx_vector::colon, idx_vector (i));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	630 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	631
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	632 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	633 FloatMatrix::inverse (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	634 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	635 octave_idx_type info;
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	636 float rcon;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	637 MatrixType mattype (*this);
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	638 return inverse (mattype, info, rcon, 0, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	639 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	640
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	641 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	642 FloatMatrix::inverse (octave_idx_type& info) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	643 {
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	644 float rcon;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	645 MatrixType mattype (*this);
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	646 return inverse (mattype, info, rcon, 0, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	647 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	648
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	649 FloatMatrix
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	650 FloatMatrix::inverse (octave_idx_type& info, float& rcon, int force,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	651 int calc_cond) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	652 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	653 MatrixType mattype (*this);
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	654 return inverse (mattype, info, rcon, force, calc_cond);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	655 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	656
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	657 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	658 FloatMatrix::inverse (MatrixType& mattype) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	659 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	660 octave_idx_type info;
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	661 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	662 return inverse (mattype, info, rcon, 0, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	663 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	664
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	665 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	666 FloatMatrix::inverse (MatrixType &mattype, octave_idx_type& info) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	667 {
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	668 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	669 return inverse (mattype, info, rcon, 0, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	670 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	671
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	672 FloatMatrix
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	673 FloatMatrix::tinverse (MatrixType &mattype, octave_idx_type& info, float& rcon,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	674 int force, int calc_cond) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	675 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	676 FloatMatrix retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	677
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	678 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	679 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	680
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	681 if (nr != nc \|\| nr == 0 \|\| nc == 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	682 (*current_liboctave_error_handler) ("inverse requires square matrix");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	683 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	684 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	685 int typ = mattype.type ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	686 char uplo = (typ == MatrixType::Lower ? 'L' : 'U');
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	687 char udiag = 'N';
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	688 retval = *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	689 float *tmp_data = retval.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	690
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	691 F77_XFCN (strtri, STRTRI, (F77_CONST_CHAR_ARG2 (&uplo, 1),
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	692 F77_CONST_CHAR_ARG2 (&udiag, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	693 nr, tmp_data, nr, info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	694 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	695 F77_CHAR_ARG_LEN (1)));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	696
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	697 // Throw-away extra info LAPACK gives so as to not change output.
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	698 rcon = 0.0;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	699 if (info != 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	700 info = -1;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	701 else if (calc_cond)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	702 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	703 octave_idx_type dtrcon_info = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	704 char job = '1';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	705
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	706 OCTAVE_LOCAL_BUFFER (float, work, 3 * nr);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	707 OCTAVE_LOCAL_BUFFER (octave_idx_type, iwork, nr);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	708
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	709 F77_XFCN (strcon, STRCON, (F77_CONST_CHAR_ARG2 (&job, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	710 F77_CONST_CHAR_ARG2 (&uplo, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	711 F77_CONST_CHAR_ARG2 (&udiag, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	712 nr, tmp_data, nr, rcon,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	713 work, iwork, dtrcon_info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	714 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	715 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	716 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	717
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	718 if (dtrcon_info != 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	719 info = -1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	720 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	721
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	722 if (info == -1 && ! force)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	723 retval = *this; // Restore matrix contents.
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	724 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	725
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	726 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	727 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	728
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	729
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	730 FloatMatrix
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	731 FloatMatrix::finverse (MatrixType &mattype, octave_idx_type& info, float& rcon,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	732 int force, int calc_cond) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	733 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	734 FloatMatrix retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	735
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	736 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	737 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	738
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	739 if (nr != nc \|\| nr == 0 \|\| nc == 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	740 (*current_liboctave_error_handler) ("inverse requires square matrix");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	741 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	742 {
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	743 Array<octave_idx_type> ipvt (dim_vector (nr, 1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	744 octave_idx_type *pipvt = ipvt.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	745
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	746 retval = *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	747 float *tmp_data = retval.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	748
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	749 Array<float> z(dim_vector (1, 1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	750 octave_idx_type lwork = -1;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	751
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	752 // Query the optimum work array size.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	753 F77_XFCN (sgetri, SGETRI, (nc, tmp_data, nr, pipvt,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	754 z.fortran_vec (), lwork, info));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	755
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	756 lwork = static_cast<octave_idx_type> (z(0));
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	757 lwork = (lwork < 2 nc ? 2nc : lwork);
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	758 z.resize (lwork, 1);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	759 float *pz = z.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	760
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	761 info = 0;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	762
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	763 // Calculate the norm of the matrix, for later use.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	764 float anorm = 0;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	765 if (calc_cond)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	766 anorm = retval.abs().sum().row(static_cast<octave_idx_type>(0)).max();
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	767
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	768 F77_XFCN (sgetrf, SGETRF, (nc, nc, tmp_data, nr, pipvt, info));
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	769
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	770 // Throw-away extra info LAPACK gives so as to not change output.
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	771 rcon = 0.0;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	772 if (info != 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	773 info = -1;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	774 else if (calc_cond)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	775 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	776 octave_idx_type dgecon_info = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	777
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	778 // Now calculate the condition number for non-singular matrix.
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	779 char job = '1';
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	780 Array<octave_idx_type> iz (dim_vector (nc, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	781 octave_idx_type *piz = iz.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	782 F77_XFCN (sgecon, SGECON, (F77_CONST_CHAR_ARG2 (&job, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	783 nc, tmp_data, nr, anorm,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	784 rcon, pz, piz, dgecon_info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	785 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	786
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	787 if (dgecon_info != 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	788 info = -1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	789 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	790
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	791 if (info == -1 && ! force)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	792 retval = *this; // Restore matrix contents.
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	793 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	794 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	795 octave_idx_type dgetri_info = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	796
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	797 F77_XFCN (sgetri, SGETRI, (nc, tmp_data, nr, pipvt,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	798 pz, lwork, dgetri_info));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	799
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	800 if (dgetri_info != 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	801 info = -1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	802 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	803
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	804 if (info != 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	805 mattype.mark_as_rectangular();
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	806 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	807
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	808 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	809 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	810
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	811 FloatMatrix
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	812 FloatMatrix::inverse (MatrixType &mattype, octave_idx_type& info, float& rcon,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	813 int force, int calc_cond) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	814 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	815 int typ = mattype.type (false);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	816 FloatMatrix ret;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	817
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	818 if (typ == MatrixType::Unknown)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	819 typ = mattype.type (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	820
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	821 if (typ == MatrixType::Upper \|\| typ == MatrixType::Lower)
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	822 ret = tinverse (mattype, info, rcon, force, calc_cond);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	823 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	824 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	825 if (mattype.is_hermitian ())
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	826 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	827 FloatCHOL chol (*this, info, calc_cond);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	828 if (info == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	829 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	830 if (calc_cond)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	831 rcon = chol.rcond ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	832 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	833 rcon = 1.0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	834 ret = chol.inverse ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	835 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	836 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	837 mattype.mark_as_unsymmetric ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	838 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	839
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	840 if (!mattype.is_hermitian ())
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	841 ret = finverse(mattype, info, rcon, force, calc_cond);
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	842
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	843 if ((mattype.is_hermitian () \|\| calc_cond) && rcon == 0.)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	844 ret = FloatMatrix (rows (), columns (), octave_Float_Inf);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	845 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	846
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	847 return ret;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	848 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	849
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	850 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	851 FloatMatrix::pseudo_inverse (float tol) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	852 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	853 FloatSVD result (*this, SVD::economy);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	854
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	855 FloatDiagMatrix S = result.singular_values ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	856 FloatMatrix U = result.left_singular_matrix ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	857 FloatMatrix V = result.right_singular_matrix ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	858
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	859 FloatColumnVector sigma = S.diag ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	860
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	861 octave_idx_type r = sigma.length () - 1;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	862 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	863 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	864
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	865 if (tol <= 0.0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	866 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	867 if (nr > nc)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	868 tol = nr * sigma.elem (0) * DBL_EPSILON;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	869 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	870 tol = nc * sigma.elem (0) * DBL_EPSILON;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	871 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	872
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	873 while (r >= 0 && sigma.elem (r) < tol)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	874 r--;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	875
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	876 if (r < 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	877 return FloatMatrix (nc, nr, 0.0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	878 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	879 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	880 FloatMatrix Ur = U.extract (0, 0, nr-1, r);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	881 FloatDiagMatrix D = FloatDiagMatrix (sigma.extract (0, r)) . inverse ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	882 FloatMatrix Vr = V.extract (0, 0, nc-1, r);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	883 return Vr * D * Ur.transpose ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	884 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	885 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	886
9523 0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	887 #if defined (HAVE_FFTW)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	888
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	889 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	890 FloatMatrix::fourier (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	891 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	892 size_t nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	893 size_t nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	894
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	895 FloatComplexMatrix retval (nr, nc);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	896
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	897 size_t npts, nsamples;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	898
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	899 if (nr == 1 \|\| nc == 1)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	900 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	901 npts = nr > nc ? nr : nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	902 nsamples = 1;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	903 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	904 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	905 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	906 npts = nr;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	907 nsamples = nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	908 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	909
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	910 const float *in (fortran_vec ());
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	911 FloatComplex *out (retval.fortran_vec ());
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	912
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	913 octave_fftw::fft (in, out, npts, nsamples);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	914
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	915 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	916 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	917
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	918 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	919 FloatMatrix::ifourier (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	920 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	921 size_t nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	922 size_t nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	923
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	924 FloatComplexMatrix retval (nr, nc);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	925
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	926 size_t npts, nsamples;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	927
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	928 if (nr == 1 \|\| nc == 1)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	929 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	930 npts = nr > nc ? nr : nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	931 nsamples = 1;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	932 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	933 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	934 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	935 npts = nr;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	936 nsamples = nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	937 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	938
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	939 FloatComplexMatrix tmp (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	940 FloatComplex *in (tmp.fortran_vec ());
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	941 FloatComplex *out (retval.fortran_vec ());
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	942
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	943 octave_fftw::ifft (in, out, npts, nsamples);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	944
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	945 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	946 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	947
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	948 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	949 FloatMatrix::fourier2d (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	950 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	951 dim_vector dv(rows (), cols ());
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	952
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	953 const float *in = fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	954 FloatComplexMatrix retval (rows (), cols ());
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	955 octave_fftw::fftNd (in, retval.fortran_vec (), 2, dv);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	956
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	957 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	958 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	959
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	960 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	961 FloatMatrix::ifourier2d (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	962 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	963 dim_vector dv(rows (), cols ());
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	964
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	965 FloatComplexMatrix retval (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	966 FloatComplex *out (retval.fortran_vec ());
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	967
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	968 octave_fftw::ifftNd (out, out, 2, dv);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	969
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	970 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	971 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	972
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	973 #else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	974
9523 0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	975 extern "C"
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	976 {
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	977 // Note that the original complex fft routines were not written for
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	978 // float complex arguments. They have been modified by adding an
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	979 // implicit float precision (a-h,o-z) statement at the beginning of
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	980 // each subroutine.
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	981
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	982 F77_RET_T
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	983 F77_FUNC (cffti, CFFTI) (const octave_idx_type&, FloatComplex*);
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	984
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	985 F77_RET_T
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	986 F77_FUNC (cfftf, CFFTF) (const octave_idx_type&, FloatComplex, FloatComplex);
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	987
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	988 F77_RET_T
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	989 F77_FUNC (cfftb, CFFTB) (const octave_idx_type&, FloatComplex, FloatComplex);
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	990 }
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9469 diff changeset	991
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	992 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	993 FloatMatrix::fourier (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	994 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	995 FloatComplexMatrix retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	996
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	997 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	998 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	999
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1000 octave_idx_type npts, nsamples;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1001
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1002 if (nr == 1 \|\| nc == 1)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1003 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1004 npts = nr > nc ? nr : nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1005 nsamples = 1;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1006 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1007 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1008 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1009 npts = nr;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1010 nsamples = nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1011 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1012
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1013 octave_idx_type nn = 4*npts+15;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1014
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1015 Array<FloatComplex> wsave (dim_vector (nn, 1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1016 FloatComplex *pwsave = wsave.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1017
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1018 retval = FloatComplexMatrix (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1019 FloatComplex *tmp_data = retval.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1020
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1021 F77_FUNC (cffti, CFFTI) (npts, pwsave);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1022
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1023 for (octave_idx_type j = 0; j < nsamples; j++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1024 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	1025 octave_quit ();
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1026
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1027 F77_FUNC (cfftf, CFFTF) (npts, &tmp_data[npts*j], pwsave);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1028 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1029
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1030 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1031 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1032
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1033 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1034 FloatMatrix::ifourier (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1035 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1036 FloatComplexMatrix retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1037
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1038 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1039 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1040
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1041 octave_idx_type npts, nsamples;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1042
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1043 if (nr == 1 \|\| nc == 1)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1044 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1045 npts = nr > nc ? nr : nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1046 nsamples = 1;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1047 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1048 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1049 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1050 npts = nr;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1051 nsamples = nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1052 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1053
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1054 octave_idx_type nn = 4*npts+15;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1055
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1056 Array<FloatComplex> wsave (dim_vector (nn, 1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1057 FloatComplex *pwsave = wsave.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1058
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1059 retval = FloatComplexMatrix (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1060 FloatComplex *tmp_data = retval.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1061
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1062 F77_FUNC (cffti, CFFTI) (npts, pwsave);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1063
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1064 for (octave_idx_type j = 0; j < nsamples; j++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1065 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	1066 octave_quit ();
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1067
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1068 F77_FUNC (cfftb, CFFTB) (npts, &tmp_data[npts*j], pwsave);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1069 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1070
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1071 for (octave_idx_type j = 0; j < npts*nsamples; j++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1072 tmp_data[j] = tmp_data[j] / static_cast<float> (npts);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1073
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1074 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1075 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1076
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1077 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1078 FloatMatrix::fourier2d (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1079 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1080 FloatComplexMatrix retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1081
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1082 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1083 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1084
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1085 octave_idx_type npts, nsamples;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1086
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1087 if (nr == 1 \|\| nc == 1)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1088 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1089 npts = nr > nc ? nr : nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1090 nsamples = 1;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1091 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1092 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1093 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1094 npts = nr;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1095 nsamples = nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1096 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1097
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1098 octave_idx_type nn = 4*npts+15;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1099
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1100 Array<FloatComplex> wsave (dim_vector (nn, 1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1101 FloatComplex *pwsave = wsave.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1102
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1103 retval = FloatComplexMatrix (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1104 FloatComplex *tmp_data = retval.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1105
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1106 F77_FUNC (cffti, CFFTI) (npts, pwsave);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1107
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1108 for (octave_idx_type j = 0; j < nsamples; j++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1109 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	1110 octave_quit ();
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1111
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1112 F77_FUNC (cfftf, CFFTF) (npts, &tmp_data[npts*j], pwsave);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1113 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1114
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1115 npts = nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1116 nsamples = nr;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1117 nn = 4*npts+15;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1118
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1119 wsave.resize (nn, 1);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1120 pwsave = wsave.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1121
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1122 Array<FloatComplex> tmp (dim_vector (npts, 1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1123 FloatComplex *prow = tmp.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1124
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1125 F77_FUNC (cffti, CFFTI) (npts, pwsave);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1126
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1127 for (octave_idx_type j = 0; j < nsamples; j++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1128 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	1129 octave_quit ();
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1130
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1131 for (octave_idx_type i = 0; i < npts; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1132 prow[i] = tmp_data[i*nr + j];
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1133
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1134 F77_FUNC (cfftf, CFFTF) (npts, prow, pwsave);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1135
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1136 for (octave_idx_type i = 0; i < npts; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1137 tmp_data[i*nr + j] = prow[i];
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1138 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1139
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1140 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1141 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1142
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1143 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1144 FloatMatrix::ifourier2d (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1145 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1146 FloatComplexMatrix retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1147
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1148 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1149 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1150
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1151 octave_idx_type npts, nsamples;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1152
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1153 if (nr == 1 \|\| nc == 1)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1154 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1155 npts = nr > nc ? nr : nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1156 nsamples = 1;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1157 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1158 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1159 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1160 npts = nr;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1161 nsamples = nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1162 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1163
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1164 octave_idx_type nn = 4*npts+15;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1165
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1166 Array<FloatComplex> wsave (dim_vector (nn, 1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1167 FloatComplex *pwsave = wsave.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1168
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1169 retval = FloatComplexMatrix (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1170 FloatComplex *tmp_data = retval.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1171
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1172 F77_FUNC (cffti, CFFTI) (npts, pwsave);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1173
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1174 for (octave_idx_type j = 0; j < nsamples; j++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1175 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	1176 octave_quit ();
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1177
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1178 F77_FUNC (cfftb, CFFTB) (npts, &tmp_data[npts*j], pwsave);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1179 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1180
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1181 for (octave_idx_type j = 0; j < npts*nsamples; j++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1182 tmp_data[j] = tmp_data[j] / static_cast<float> (npts);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1183
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1184 npts = nc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1185 nsamples = nr;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1186 nn = 4*npts+15;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1187
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1188 wsave.resize (nn, 1);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1189 pwsave = wsave.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1190
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1191 Array<FloatComplex> tmp (dim_vector (npts, 1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1192 FloatComplex *prow = tmp.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1193
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1194 F77_FUNC (cffti, CFFTI) (npts, pwsave);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1195
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1196 for (octave_idx_type j = 0; j < nsamples; j++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1197 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	1198 octave_quit ();
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1199
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1200 for (octave_idx_type i = 0; i < npts; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1201 prow[i] = tmp_data[i*nr + j];
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1202
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1203 F77_FUNC (cfftb, CFFTB) (npts, prow, pwsave);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1204
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1205 for (octave_idx_type i = 0; i < npts; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1206 tmp_data[i*nr + j] = prow[i] / static_cast<float> (npts);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1207 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1208
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1209 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1210 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1211
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1212 #endif
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1213
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1214 FloatDET
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1215 FloatMatrix::determinant (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1216 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1217 octave_idx_type info;
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1218 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1219 return determinant (info, rcon, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1220 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1221
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1222 FloatDET
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1223 FloatMatrix::determinant (octave_idx_type& info) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1224 {
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1225 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1226 return determinant (info, rcon, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1227 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1228
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1229 FloatDET
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1230 FloatMatrix::determinant (octave_idx_type& info, float& rcon, int calc_cond) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1231 {
8336 9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1232 MatrixType mattype (*this);
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1233 return determinant (mattype, info, rcon, calc_cond);
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1234 }
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1235
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1236 FloatDET
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1237 FloatMatrix::determinant (MatrixType& mattype,
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1238 octave_idx_type& info, float& rcon, int calc_cond) const
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1239 {
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1240 FloatDET retval (1.0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1241
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1242 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1243 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1244
8336 9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1245 if (nr != nc)
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1246 (*current_liboctave_error_handler) ("matrix must be square");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1247 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1248 {
8806 c7864bb74914 avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 8801 diff changeset	1249 volatile int typ = mattype.type ();
8336 9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1250
10213 f7ba6cfe7fb7 fix det() after singular matrix is flagged Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	1251 // Even though the matrix is marked as singular (Rectangular), we may
f7ba6cfe7fb7 fix det() after singular matrix is flagged Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	1252 // still get a useful number from the LU factorization, because it always
f7ba6cfe7fb7 fix det() after singular matrix is flagged Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	1253 // completes.
f7ba6cfe7fb7 fix det() after singular matrix is flagged Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	1254
8337 e02242c54c49 reuse matrix type detected in det Jaroslav Hajek <highegg@gmail.com> parents: 8336 diff changeset	1255 if (typ == MatrixType::Unknown)
e02242c54c49 reuse matrix type detected in det Jaroslav Hajek <highegg@gmail.com> parents: 8336 diff changeset	1256 typ = mattype.type (*this);
10213 f7ba6cfe7fb7 fix det() after singular matrix is flagged Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	1257 else if (typ == MatrixType::Rectangular)
f7ba6cfe7fb7 fix det() after singular matrix is flagged Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	1258 typ = MatrixType::Full;
8337 e02242c54c49 reuse matrix type detected in det Jaroslav Hajek <highegg@gmail.com> parents: 8336 diff changeset	1259
8336 9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1260 if (typ == MatrixType::Lower \|\| typ == MatrixType::Upper)
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1261 {
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1262 for (octave_idx_type i = 0; i < nc; i++)
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1263 retval *= elem (i,i);
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1264 }
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1265 else if (typ == MatrixType::Hermitian)
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1266 {
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1267 FloatMatrix atmp = *this;
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1268 float *tmp_data = atmp.fortran_vec ();
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1269
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1270 info = 0;
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1271 float anorm = 0;
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1272 if (calc_cond) anorm = xnorm (*this, 1);
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1273
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1274
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1275 char job = 'L';
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1276 F77_XFCN (spotrf, SPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr,
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1277 tmp_data, nr, info
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1278 F77_CHAR_ARG_LEN (1)));
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1279
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1280 if (info != 0)
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1281 {
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1282 rcon = 0.0;
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1283 mattype.mark_as_unsymmetric ();
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1284 typ = MatrixType::Full;
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1285 }
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1286 else
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1287 {
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1288 Array<float> z (dim_vector (3 * nc, 1));
8336 9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1289 float *pz = z.fortran_vec ();
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1290 Array<octave_idx_type> iz (dim_vector (nc, 1));
8336 9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1291 octave_idx_type *piz = iz.fortran_vec ();
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1292
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1293 F77_XFCN (spocon, SPOCON, (F77_CONST_CHAR_ARG2 (&job, 1),
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1294 nr, tmp_data, nr, anorm,
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1295 rcon, pz, piz, info
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1296 F77_CHAR_ARG_LEN (1)));
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1297
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1298 if (info != 0)
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1299 rcon = 0.0;
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1300
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1301 for (octave_idx_type i = 0; i < nc; i++)
8337 e02242c54c49 reuse matrix type detected in det Jaroslav Hajek <highegg@gmail.com> parents: 8336 diff changeset	1302 retval *= atmp (i,i);
8336 9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1303
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1304 retval = retval.square ();
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1305 }
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1306 }
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1307 else if (typ != MatrixType::Full)
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1308 (*current_liboctave_error_handler) ("det: invalid dense matrix type");
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1309
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1310 if (typ == MatrixType::Full)
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1311 {
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1312 Array<octave_idx_type> ipvt (dim_vector (nr, 1));
8336 9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1313 octave_idx_type *pipvt = ipvt.fortran_vec ();
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1314
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1315 FloatMatrix atmp = *this;
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1316 float *tmp_data = atmp.fortran_vec ();
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1317
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1318 info = 0;
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1319
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1320 // Calculate the norm of the matrix, for later use.
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1321 float anorm = 0;
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1322 if (calc_cond) anorm = xnorm (*this, 1);
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1323
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1324 F77_XFCN (sgetrf, SGETRF, (nr, nr, tmp_data, nr, pipvt, info));
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1325
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1326 // Throw-away extra info LAPACK gives so as to not change output.
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1327 rcon = 0.0;
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1328 if (info != 0)
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1329 {
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1330 info = -1;
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1331 retval = FloatDET ();
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1332 }
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1333 else
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1334 {
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1335 if (calc_cond)
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1336 {
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1337 // Now calc the condition number for non-singular matrix.
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1338 char job = '1';
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1339 Array<float> z (dim_vector (4 * nc, 1));
8336 9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1340 float *pz = z.fortran_vec ();
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1341 Array<octave_idx_type> iz (dim_vector (nc, 1));
8336 9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1342 octave_idx_type *piz = iz.fortran_vec ();
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1343
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1344 F77_XFCN (sgecon, SGECON, (F77_CONST_CHAR_ARG2 (&job, 1),
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1345 nc, tmp_data, nr, anorm,
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1346 rcon, pz, piz, info
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1347 F77_CHAR_ARG_LEN (1)));
8335 64cf956a109c templatize & fix DET Jaroslav Hajek <highegg@gmail.com> parents: 8211 diff changeset	1348 }
8336 9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1349
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1350 if (info != 0)
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1351 {
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1352 info = -1;
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1353 retval = FloatDET ();
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1354 }
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1355 else
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1356 {
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1357 for (octave_idx_type i = 0; i < nc; i++)
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1358 {
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1359 float c = atmp(i,i);
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1360 retval *= (ipvt(i) != (i+1)) ? -c : c;
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1361 }
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1362 }
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1363 }
9813c07ca946 make det take advantage of matrix type Jaroslav Hajek <highegg@gmail.com> parents: 8335 diff changeset	1364 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1365 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1366
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1367 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1368 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1369
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1370 float
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1371 FloatMatrix::rcond (void) const
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1372 {
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1373 MatrixType mattype (*this);
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1374 return rcond (mattype);
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1375 }
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1376
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1377 float
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1378 FloatMatrix::rcond (MatrixType &mattype) const
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1379 {
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1380 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1381 octave_idx_type nr = rows ();
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1382 octave_idx_type nc = cols ();
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1383
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1384 if (nr != nc)
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1385 (*current_liboctave_error_handler) ("matrix must be square");
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1386 else if (nr == 0 \|\| nc == 0)
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1387 rcon = octave_Inf;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1388 else
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1389 {
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1390 int typ = mattype.type ();
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1391
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1392 if (typ == MatrixType::Unknown)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1393 typ = mattype.type (*this);
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1394
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1395 // Only calculate the condition number for LU/Cholesky
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1396 if (typ == MatrixType::Upper)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1397 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1398 const float *tmp_data = fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1399 octave_idx_type info = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1400 char norm = '1';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1401 char uplo = 'U';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1402 char dia = 'N';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1403
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1404 Array<float> z (dim_vector (3 * nc, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1405 float *pz = z.fortran_vec ();
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1406 Array<octave_idx_type> iz (dim_vector (nc, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1407 octave_idx_type *piz = iz.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1408
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1409 F77_XFCN (strcon, STRCON, (F77_CONST_CHAR_ARG2 (&norm, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1410 F77_CONST_CHAR_ARG2 (&uplo, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1411 F77_CONST_CHAR_ARG2 (&dia, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1412 nr, tmp_data, nr, rcon,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1413 pz, piz, info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1414 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1415 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1416 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1417
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1418 if (info != 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1419 rcon = 0.0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1420 }
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1421 else if (typ == MatrixType::Permuted_Upper)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1422 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1423 ("permuted triangular matrix not implemented");
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1424 else if (typ == MatrixType::Lower)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1425 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1426 const float *tmp_data = fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1427 octave_idx_type info = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1428 char norm = '1';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1429 char uplo = 'L';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1430 char dia = 'N';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1431
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1432 Array<float> z (dim_vector (3 * nc, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1433 float *pz = z.fortran_vec ();
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1434 Array<octave_idx_type> iz (dim_vector (nc, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1435 octave_idx_type *piz = iz.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1436
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1437 F77_XFCN (strcon, STRCON, (F77_CONST_CHAR_ARG2 (&norm, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1438 F77_CONST_CHAR_ARG2 (&uplo, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1439 F77_CONST_CHAR_ARG2 (&dia, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1440 nr, tmp_data, nr, rcon,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1441 pz, piz, info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1442 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1443 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1444 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1445
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1446 if (info != 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1447 rcon = 0.0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1448 }
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1449 else if (typ == MatrixType::Permuted_Lower)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1450 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1451 ("permuted triangular matrix not implemented");
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1452 else if (typ == MatrixType::Full \|\| typ == MatrixType::Hermitian)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1453 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1454 float anorm = -1.0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1455 FloatMatrix atmp = *this;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1456 float *tmp_data = atmp.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1457
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1458 if (typ == MatrixType::Hermitian)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1459 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1460 octave_idx_type info = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1461 char job = 'L';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1462 anorm = atmp.abs().sum().
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1463 row(static_cast<octave_idx_type>(0)).max();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1464
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1465 F77_XFCN (spotrf, SPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1466 tmp_data, nr, info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1467 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1468
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1469 if (info != 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1470 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1471 rcon = 0.0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1472 mattype.mark_as_unsymmetric ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1473 typ = MatrixType::Full;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1474 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1475 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1476 {
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1477 Array<float> z (dim_vector (3 * nc, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1478 float *pz = z.fortran_vec ();
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1479 Array<octave_idx_type> iz (dim_vector (nc, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1480 octave_idx_type *piz = iz.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1481
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1482 F77_XFCN (spocon, SPOCON, (F77_CONST_CHAR_ARG2 (&job, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1483 nr, tmp_data, nr, anorm,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1484 rcon, pz, piz, info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1485 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1486
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1487 if (info != 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1488 rcon = 0.0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1489 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1490 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1491
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1492 if (typ == MatrixType::Full)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1493 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1494 octave_idx_type info = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1495
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1496 Array<octave_idx_type> ipvt (dim_vector (nr, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1497 octave_idx_type *pipvt = ipvt.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1498
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1499 if(anorm < 0.)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1500 anorm = atmp.abs().sum().
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1501 row(static_cast<octave_idx_type>(0)).max();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1502
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1503 Array<float> z (dim_vector (4 * nc, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1504 float *pz = z.fortran_vec ();
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1505 Array<octave_idx_type> iz (dim_vector (nc, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1506 octave_idx_type *piz = iz.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1507
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1508 F77_XFCN (sgetrf, SGETRF, (nr, nr, tmp_data, nr, pipvt, info));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1509
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1510 if (info != 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1511 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1512 rcon = 0.0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1513 mattype.mark_as_rectangular ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1514 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1515 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1516 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1517 char job = '1';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1518 F77_XFCN (sgecon, SGECON, (F77_CONST_CHAR_ARG2 (&job, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1519 nc, tmp_data, nr, anorm,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1520 rcon, pz, piz, info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1521 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1522
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1523 if (info != 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1524 rcon = 0.0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1525 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1526 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1527 }
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1528 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1529 rcon = 0.0;
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1530 }
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1531
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1532 return rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1533 }
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1534
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1535 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1536 FloatMatrix::utsolve (MatrixType &mattype, const FloatMatrix& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1537 float& rcon, solve_singularity_handler sing_handler,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1538 bool calc_cond, blas_trans_type transt) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1539 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1540 FloatMatrix retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1541
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1542 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1543 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1544
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1545 if (nr != b.rows ())
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1546 (*current_liboctave_error_handler)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1547 ("matrix dimension mismatch solution of linear equations");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1548 else if (nr == 0 \|\| nc == 0 \|\| b.cols () == 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1549 retval = FloatMatrix (nc, b.cols (), 0.0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1550 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1551 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1552 volatile int typ = mattype.type ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1553
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1554 if (typ == MatrixType::Permuted_Upper \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1555 typ == MatrixType::Upper)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1556 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1557 octave_idx_type b_nc = b.cols ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1558 rcon = 1.;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1559 info = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1560
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1561 if (typ == MatrixType::Permuted_Upper)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1562 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1563 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1564 ("permuted triangular matrix not implemented");
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1565 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1566 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1567 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1568 const float *tmp_data = fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1569
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1570 if (calc_cond)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1571 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1572 char norm = '1';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1573 char uplo = 'U';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1574 char dia = 'N';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1575
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1576 Array<float> z (dim_vector (3 * nc, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1577 float *pz = z.fortran_vec ();
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1578 Array<octave_idx_type> iz (dim_vector (nc, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1579 octave_idx_type *piz = iz.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1580
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1581 F77_XFCN (strcon, STRCON, (F77_CONST_CHAR_ARG2 (&norm, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1582 F77_CONST_CHAR_ARG2 (&uplo, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1583 F77_CONST_CHAR_ARG2 (&dia, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1584 nr, tmp_data, nr, rcon,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1585 pz, piz, info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1586 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1587 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1588 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1589
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1590 if (info != 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1591 info = -2;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1592
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1593 volatile float rcond_plus_one = rcon + 1.0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1594
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1595 if (rcond_plus_one == 1.0 \|\| xisnan (rcon))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1596 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1597 info = -2;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1598
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1599 if (sing_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1600 sing_handler (rcon);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1601 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1602 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1603 ("matrix singular to machine precision, rcond = %g",
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1604 rcon);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1605 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1606 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1607
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1608 if (info == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1609 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1610 retval = b;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1611 float *result = retval.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1612
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1613 char uplo = 'U';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1614 char trans = get_blas_char (transt);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1615 char dia = 'N';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1616
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1617 F77_XFCN (strtrs, STRTRS, (F77_CONST_CHAR_ARG2 (&uplo, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1618 F77_CONST_CHAR_ARG2 (&trans, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1619 F77_CONST_CHAR_ARG2 (&dia, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1620 nr, b_nc, tmp_data, nr,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1621 result, nr, info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1622 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1623 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1624 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1625 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1626 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1627 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1628 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1629 (*current_liboctave_error_handler) ("incorrect matrix type");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1630 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1631
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1632 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1633 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1634
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1635 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1636 FloatMatrix::ltsolve (MatrixType &mattype, const FloatMatrix& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1637 float& rcon, solve_singularity_handler sing_handler,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1638 bool calc_cond, blas_trans_type transt) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1639 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1640 FloatMatrix retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1641
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1642 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1643 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1644
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1645 if (nr != b.rows ())
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1646 (*current_liboctave_error_handler)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1647 ("matrix dimension mismatch solution of linear equations");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1648 else if (nr == 0 \|\| nc == 0 \|\| b.cols () == 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1649 retval = FloatMatrix (nc, b.cols (), 0.0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1650 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1651 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1652 volatile int typ = mattype.type ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1653
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1654 if (typ == MatrixType::Permuted_Lower \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1655 typ == MatrixType::Lower)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1656 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1657 octave_idx_type b_nc = b.cols ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1658 rcon = 1.;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1659 info = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1660
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1661 if (typ == MatrixType::Permuted_Lower)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1662 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1663 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1664 ("permuted triangular matrix not implemented");
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1665 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1666 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1667 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1668 const float *tmp_data = fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1669
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1670 if (calc_cond)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1671 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1672 char norm = '1';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1673 char uplo = 'L';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1674 char dia = 'N';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1675
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1676 Array<float> z (dim_vector (3 * nc, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1677 float *pz = z.fortran_vec ();
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1678 Array<octave_idx_type> iz (dim_vector (nc, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1679 octave_idx_type *piz = iz.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1680
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1681 F77_XFCN (strcon, STRCON, (F77_CONST_CHAR_ARG2 (&norm, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1682 F77_CONST_CHAR_ARG2 (&uplo, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1683 F77_CONST_CHAR_ARG2 (&dia, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1684 nr, tmp_data, nr, rcon,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1685 pz, piz, info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1686 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1687 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1688 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1689
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1690 if (info != 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1691 info = -2;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1692
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1693 volatile float rcond_plus_one = rcon + 1.0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1694
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1695 if (rcond_plus_one == 1.0 \|\| xisnan (rcon))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1696 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1697 info = -2;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1698
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1699 if (sing_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1700 sing_handler (rcon);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1701 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1702 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1703 ("matrix singular to machine precision, rcond = %g",
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1704 rcon);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1705 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1706 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1707
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1708 if (info == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1709 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1710 retval = b;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1711 float *result = retval.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1712
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1713 char uplo = 'L';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1714 char trans = get_blas_char (transt);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1715 char dia = 'N';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1716
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1717 F77_XFCN (strtrs, STRTRS, (F77_CONST_CHAR_ARG2 (&uplo, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1718 F77_CONST_CHAR_ARG2 (&trans, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1719 F77_CONST_CHAR_ARG2 (&dia, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1720 nr, b_nc, tmp_data, nr,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1721 result, nr, info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1722 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1723 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1724 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1725 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1726 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1727 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1728 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1729 (*current_liboctave_error_handler) ("incorrect matrix type");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1730 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1731
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1732 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1733 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1734
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1735 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1736 FloatMatrix::fsolve (MatrixType &mattype, const FloatMatrix& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1737 float& rcon, solve_singularity_handler sing_handler,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1738 bool calc_cond) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1739 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1740 FloatMatrix retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1741
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1742 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1743 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1744
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1745 if (nr != nc \|\| nr != b.rows ())
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1746 (*current_liboctave_error_handler)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1747 ("matrix dimension mismatch solution of linear equations");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1748 else if (nr == 0 \|\| b.cols () == 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1749 retval = FloatMatrix (nc, b.cols (), 0.0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1750 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1751 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1752 volatile int typ = mattype.type ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1753
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1754 // Calculate the norm of the matrix, for later use.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1755 float anorm = -1.;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1756
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1757 if (typ == MatrixType::Hermitian)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1758 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1759 info = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1760 char job = 'L';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1761 FloatMatrix atmp = *this;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1762 float *tmp_data = atmp.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1763 anorm = atmp.abs().sum().row(static_cast<octave_idx_type>(0)).max();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1764
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1765 F77_XFCN (spotrf, SPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1766 tmp_data, nr, info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1767 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1768
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1769 // Throw-away extra info LAPACK gives so as to not change output.
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1770 rcon = 0.0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1771 if (info != 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1772 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1773 info = -2;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1774
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1775 mattype.mark_as_unsymmetric ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1776 typ = MatrixType::Full;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1777 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1778 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1779 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1780 if (calc_cond)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1781 {
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1782 Array<float> z (dim_vector (3 * nc, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1783 float *pz = z.fortran_vec ();
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1784 Array<octave_idx_type> iz (dim_vector (nc, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1785 octave_idx_type *piz = iz.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1786
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1787 F77_XFCN (spocon, SPOCON, (F77_CONST_CHAR_ARG2 (&job, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1788 nr, tmp_data, nr, anorm,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1789 rcon, pz, piz, info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1790 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1791
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1792 if (info != 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1793 info = -2;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1794
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1795 volatile float rcond_plus_one = rcon + 1.0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1796
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1797 if (rcond_plus_one == 1.0 \|\| xisnan (rcon))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1798 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1799 info = -2;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1800
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1801 if (sing_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1802 sing_handler (rcon);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1803 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1804 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1805 ("matrix singular to machine precision, rcond = %g",
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1806 rcon);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1807 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1808 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1809
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1810 if (info == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1811 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1812 retval = b;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1813 float *result = retval.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1814
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1815 octave_idx_type b_nc = b.cols ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1816
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1817 F77_XFCN (spotrs, SPOTRS, (F77_CONST_CHAR_ARG2 (&job, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1818 nr, b_nc, tmp_data, nr,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1819 result, b.rows(), info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1820 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1821 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1822 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1823 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1824 mattype.mark_as_unsymmetric ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1825 typ = MatrixType::Full;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1826 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1827 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1828 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1829
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1830 if (typ == MatrixType::Full)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1831 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1832 info = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1833
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1834 Array<octave_idx_type> ipvt (dim_vector (nr, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1835 octave_idx_type *pipvt = ipvt.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1836
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1837 FloatMatrix atmp = *this;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1838 float *tmp_data = atmp.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1839 if(anorm < 0.)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1840 anorm = atmp.abs().sum().row(static_cast<octave_idx_type>(0)).max();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1841
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1842 Array<float> z (dim_vector (4 * nc, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1843 float *pz = z.fortran_vec ();
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1844 Array<octave_idx_type> iz (dim_vector (nc, 1));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1845 octave_idx_type *piz = iz.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1846
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1847 F77_XFCN (sgetrf, SGETRF, (nr, nr, tmp_data, nr, pipvt, info));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1848
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1849 // Throw-away extra info LAPACK gives so as to not change output.
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1850 rcon = 0.0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1851 if (info != 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1852 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1853 info = -2;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1854
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1855 if (sing_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1856 sing_handler (rcon);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1857 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1858 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1859 ("matrix singular to machine precision");
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1860
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1861 mattype.mark_as_rectangular ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1862 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1863 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1864 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1865 if (calc_cond)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1866 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1867 // Now calculate the condition number for
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1868 // non-singular matrix.
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1869 char job = '1';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1870 F77_XFCN (sgecon, SGECON, (F77_CONST_CHAR_ARG2 (&job, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1871 nc, tmp_data, nr, anorm,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1872 rcon, pz, piz, info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1873 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1874
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1875 if (info != 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1876 info = -2;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1877
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1878 volatile float rcond_plus_one = rcon + 1.0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1879
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1880 if (rcond_plus_one == 1.0 \|\| xisnan (rcon))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1881 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1882 info = -2;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1883
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1884 if (sing_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1885 sing_handler (rcon);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1886 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1887 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1888 ("matrix singular to machine precision, rcond = %g",
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1889 rcon);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1890 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1891 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1892
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1893 if (info == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1894 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1895 retval = b;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1896 float *result = retval.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1897
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1898 octave_idx_type b_nc = b.cols ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1899
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1900 char job = 'N';
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1901 F77_XFCN (sgetrs, SGETRS, (F77_CONST_CHAR_ARG2 (&job, 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1902 nr, b_nc, tmp_data, nr,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1903 pipvt, result, b.rows(), info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1904 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1905 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1906 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1907 mattype.mark_as_rectangular ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1908 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1909 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1910 else if (typ != MatrixType::Hermitian)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1911 (*current_liboctave_error_handler) ("incorrect matrix type");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1912 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1913
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1914 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1915 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1916
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1917 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1918 FloatMatrix::solve (MatrixType &typ, const FloatMatrix& b) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1919 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1920 octave_idx_type info;
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1921 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1922 return solve (typ, b, info, rcon, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1923 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1924
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1925 FloatMatrix
9662 0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	1926 FloatMatrix::solve (MatrixType &typ, const FloatMatrix& b, octave_idx_type& info) const
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	1927 {
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	1928 float rcon;
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	1929 return solve (typ, b, info, rcon, 0);
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	1930 }
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	1931
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	1932 FloatMatrix
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1933 FloatMatrix::solve (MatrixType &typ, const FloatMatrix& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1934 float& rcon) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1935 {
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1936 return solve (typ, b, info, rcon, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1937 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1938
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1939 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1940 FloatMatrix::solve (MatrixType &mattype, const FloatMatrix& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1941 float& rcon, solve_singularity_handler sing_handler,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1942 bool singular_fallback, blas_trans_type transt) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1943 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1944 FloatMatrix retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1945 int typ = mattype.type ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1946
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1947 if (typ == MatrixType::Unknown)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1948 typ = mattype.type (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1949
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1950 // Only calculate the condition number for LU/Cholesky
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1951 if (typ == MatrixType::Upper \|\| typ == MatrixType::Permuted_Upper)
9661 afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9658 diff changeset	1952 retval = utsolve (mattype, b, info, rcon, sing_handler, false, transt);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1953 else if (typ == MatrixType::Lower \|\| typ == MatrixType::Permuted_Lower)
9661 afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9658 diff changeset	1954 retval = ltsolve (mattype, b, info, rcon, sing_handler, false, transt);
afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9658 diff changeset	1955 else if (transt == blas_trans \|\| transt == blas_conj_trans)
afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9658 diff changeset	1956 return transpose ().solve (mattype, b, info, rcon, sing_handler, singular_fallback);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1957 else if (typ == MatrixType::Full \|\| typ == MatrixType::Hermitian)
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1958 retval = fsolve (mattype, b, info, rcon, sing_handler, true);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1959 else if (typ != MatrixType::Rectangular)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1960 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1961 (*current_liboctave_error_handler) ("unknown matrix type");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1962 return FloatMatrix ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1963 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1964
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1965 // Rectangular or one of the above solvers flags a singular matrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1966 if (singular_fallback && mattype.type () == MatrixType::Rectangular)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1967 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1968 octave_idx_type rank;
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1969 retval = lssolve (b, info, rank, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1970 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1971
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1972 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1973 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1974
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1975 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1976 FloatMatrix::solve (MatrixType &typ, const FloatComplexMatrix& b) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1977 {
9662 0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	1978 octave_idx_type info;
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	1979 float rcon;
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	1980 return solve (typ, b, info, rcon, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1981 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1982
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1983 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1984 FloatMatrix::solve (MatrixType &typ, const FloatComplexMatrix& b,
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1985 octave_idx_type& info) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1986 {
9662 0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	1987 float rcon;
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	1988 return solve (typ, b, info, rcon, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1989 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1990
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1991 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1992 FloatMatrix::solve (MatrixType &typ, const FloatComplexMatrix& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	1993 float& rcon) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	1994 {
9662 0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	1995 return solve (typ, b, info, rcon, 0);
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	1996 }
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	1997
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	1998 static FloatMatrix
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	1999 stack_complex_matrix (const FloatComplexMatrix& cm)
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2000 {
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2001 octave_idx_type m = cm.rows (), n = cm.cols (), nel = m*n;
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2002 FloatMatrix retval (m, 2*n);
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2003 const FloatComplex *cmd = cm.data ();
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2004 float *rd = retval.fortran_vec ();
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2005 for (octave_idx_type i = 0; i < nel; i++)
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2006 {
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2007 rd[i] = std::real (cmd[i]);
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2008 rd[nel+i] = std::imag (cmd[i]);
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2009 }
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2010 return retval;
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2011 }
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2012
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2013 static FloatComplexMatrix
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2014 unstack_complex_matrix (const FloatMatrix& sm)
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2015 {
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2016 octave_idx_type m = sm.rows (), n = sm.cols () / 2, nel = m*n;
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2017 FloatComplexMatrix retval (m, n);
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2018 const float *smd = sm.data ();
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2019 FloatComplex *rd = retval.fortran_vec ();
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2020 for (octave_idx_type i = 0; i < nel; i++)
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2021 rd[i] = FloatComplex (smd[i], smd[nel+i]);
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2022 return retval;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2023 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2024
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2025 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2026 FloatMatrix::solve (MatrixType &typ, const FloatComplexMatrix& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2027 float& rcon, solve_singularity_handler sing_handler,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2028 bool singular_fallback, blas_trans_type transt) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2029 {
9662 0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2030 FloatMatrix tmp = stack_complex_matrix (b);
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2031 tmp = solve (typ, tmp, info, rcon, sing_handler, singular_fallback, transt);
0d3b248f4ab6 further improve mixed real-complex division Jaroslav Hajek <highegg@gmail.com> parents: 9661 diff changeset	2032 return unstack_complex_matrix (tmp);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2033 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2034
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2035 FloatColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2036 FloatMatrix::solve (MatrixType &typ, const FloatColumnVector& b) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2037 {
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2038 octave_idx_type info; float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2039 return solve (typ, b, info, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2040 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2041
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2042 FloatColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2043 FloatMatrix::solve (MatrixType &typ, const FloatColumnVector& b,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2044 octave_idx_type& info) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2045 {
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2046 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2047 return solve (typ, b, info, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2048 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2049
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2050 FloatColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2051 FloatMatrix::solve (MatrixType &typ, const FloatColumnVector& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2052 float& rcon) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2053 {
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2054 return solve (typ, b, info, rcon, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2055 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2056
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2057 FloatColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2058 FloatMatrix::solve (MatrixType &typ, const FloatColumnVector& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2059 float& rcon, solve_singularity_handler sing_handler, blas_trans_type transt) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2060 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2061 FloatMatrix tmp (b);
10352 a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	2062 tmp = solve (typ, tmp, info, rcon, sing_handler, true, transt);
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	2063 return tmp.column(static_cast<octave_idx_type> (0));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2064 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2065
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2066 FloatComplexColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2067 FloatMatrix::solve (MatrixType &typ, const FloatComplexColumnVector& b) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2068 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2069 FloatComplexMatrix tmp (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2070 return tmp.solve (typ, b);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2071 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2072
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2073 FloatComplexColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2074 FloatMatrix::solve (MatrixType &typ, const FloatComplexColumnVector& b,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2075 octave_idx_type& info) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2076 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2077 FloatComplexMatrix tmp (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2078 return tmp.solve (typ, b, info);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2079 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2080
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2081 FloatComplexColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2082 FloatMatrix::solve (MatrixType &typ, const FloatComplexColumnVector& b,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2083 octave_idx_type& info, float& rcon) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2084 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2085 FloatComplexMatrix tmp (*this);
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2086 return tmp.solve (typ, b, info, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2087 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2088
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2089 FloatComplexColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2090 FloatMatrix::solve (MatrixType &typ, const FloatComplexColumnVector& b,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2091 octave_idx_type& info, float& rcon,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2092 solve_singularity_handler sing_handler, blas_trans_type transt) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2093 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2094 FloatComplexMatrix tmp (*this);
9661 afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9658 diff changeset	2095 return tmp.solve(typ, b, info, rcon, sing_handler, transt);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2096 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2097
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2098 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2099 FloatMatrix::solve (const FloatMatrix& b) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2100 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2101 octave_idx_type info;
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2102 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2103 return solve (b, info, rcon, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2104 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2105
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2106 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2107 FloatMatrix::solve (const FloatMatrix& b, octave_idx_type& info) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2108 {
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2109 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2110 return solve (b, info, rcon, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2111 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2112
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2113 FloatMatrix
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2114 FloatMatrix::solve (const FloatMatrix& b, octave_idx_type& info, float& rcon) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2115 {
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2116 return solve (b, info, rcon, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2117 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2118
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2119 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2120 FloatMatrix::solve (const FloatMatrix& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2121 float& rcon, solve_singularity_handler sing_handler, blas_trans_type transt) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2122 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2123 MatrixType mattype (*this);
9661 afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9658 diff changeset	2124 return solve (mattype, b, info, rcon, sing_handler, true, transt);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2125 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2126
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2127 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2128 FloatMatrix::solve (const FloatComplexMatrix& b) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2129 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2130 FloatComplexMatrix tmp (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2131 return tmp.solve (b);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2132 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2133
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2134 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2135 FloatMatrix::solve (const FloatComplexMatrix& b, octave_idx_type& info) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2136 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2137 FloatComplexMatrix tmp (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2138 return tmp.solve (b, info);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2139 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2140
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2141 FloatComplexMatrix
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2142 FloatMatrix::solve (const FloatComplexMatrix& b, octave_idx_type& info, float& rcon) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2143 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2144 FloatComplexMatrix tmp (*this);
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2145 return tmp.solve (b, info, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2146 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2147
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2148 FloatComplexMatrix
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2149 FloatMatrix::solve (const FloatComplexMatrix& b, octave_idx_type& info, float& rcon,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2150 solve_singularity_handler sing_handler, blas_trans_type transt) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2151 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2152 FloatComplexMatrix tmp (*this);
9661 afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9658 diff changeset	2153 return tmp.solve (b, info, rcon, sing_handler, transt);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2154 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2155
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2156 FloatColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2157 FloatMatrix::solve (const FloatColumnVector& b) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2158 {
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2159 octave_idx_type info; float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2160 return solve (b, info, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2161 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2162
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2163 FloatColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2164 FloatMatrix::solve (const FloatColumnVector& b, octave_idx_type& info) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2165 {
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2166 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2167 return solve (b, info, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2168 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2169
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2170 FloatColumnVector
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2171 FloatMatrix::solve (const FloatColumnVector& b, octave_idx_type& info, float& rcon) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2172 {
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2173 return solve (b, info, rcon, 0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2174 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2175
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2176 FloatColumnVector
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2177 FloatMatrix::solve (const FloatColumnVector& b, octave_idx_type& info, float& rcon,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2178 solve_singularity_handler sing_handler, blas_trans_type transt) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2179 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2180 MatrixType mattype (*this);
9661 afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9658 diff changeset	2181 return solve (mattype, b, info, rcon, sing_handler, transt);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2182 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2183
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2184 FloatComplexColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2185 FloatMatrix::solve (const FloatComplexColumnVector& b) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2186 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2187 FloatComplexMatrix tmp (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2188 return tmp.solve (b);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2189 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2190
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2191 FloatComplexColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2192 FloatMatrix::solve (const FloatComplexColumnVector& b, octave_idx_type& info) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2193 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2194 FloatComplexMatrix tmp (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2195 return tmp.solve (b, info);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2196 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2197
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2198 FloatComplexColumnVector
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2199 FloatMatrix::solve (const FloatComplexColumnVector& b, octave_idx_type& info, float& rcon) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2200 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2201 FloatComplexMatrix tmp (*this);
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2202 return tmp.solve (b, info, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2203 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2204
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2205 FloatComplexColumnVector
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2206 FloatMatrix::solve (const FloatComplexColumnVector& b, octave_idx_type& info, float& rcon,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2207 solve_singularity_handler sing_handler, blas_trans_type transt) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2208 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2209 FloatComplexMatrix tmp (*this);
9661 afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9658 diff changeset	2210 return tmp.solve (b, info, rcon, sing_handler, transt);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2211 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2212
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2213 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2214 FloatMatrix::lssolve (const FloatMatrix& b) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2215 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2216 octave_idx_type info;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2217 octave_idx_type rank;
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2218 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2219 return lssolve (b, info, rank, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2220 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2221
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2222 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2223 FloatMatrix::lssolve (const FloatMatrix& b, octave_idx_type& info) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2224 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2225 octave_idx_type rank;
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2226 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2227 return lssolve (b, info, rank, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2228 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2229
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2230 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2231 FloatMatrix::lssolve (const FloatMatrix& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2232 octave_idx_type& rank) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2233 {
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2234 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2235 return lssolve (b, info, rank, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2236 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2237
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2238 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2239 FloatMatrix::lssolve (const FloatMatrix& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2240 octave_idx_type& rank, float &rcon) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2241 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2242 FloatMatrix retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2243
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2244 octave_idx_type nrhs = b.cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2245
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2246 octave_idx_type m = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2247 octave_idx_type n = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2248
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2249 if (m != b.rows ())
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2250 (*current_liboctave_error_handler)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2251 ("matrix dimension mismatch solution of linear equations");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2252 else if (m == 0 \|\| n == 0 \|\| b.cols () == 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2253 retval = FloatMatrix (n, b.cols (), 0.0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2254 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2255 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2256 volatile octave_idx_type minmn = (m < n ? m : n);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2257 octave_idx_type maxmn = m > n ? m : n;
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2258 rcon = -1.0;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2259 if (m != n)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2260 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2261 retval = FloatMatrix (maxmn, nrhs, 0.0);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2262
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2263 for (octave_idx_type j = 0; j < nrhs; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2264 for (octave_idx_type i = 0; i < m; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2265 retval.elem (i, j) = b.elem (i, j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2266 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2267 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2268 retval = b;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2269
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2270 FloatMatrix atmp = *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2271 float *tmp_data = atmp.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2272
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2273 float *pretval = retval.fortran_vec ();
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2274 Array<float> s (dim_vector (minmn, 1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2275 float *ps = s.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2276
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2277 // Ask DGELSD what the dimension of WORK should be.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2278 octave_idx_type lwork = -1;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2279
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2280 Array<float> work (dim_vector (1, 1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2281
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2282 octave_idx_type smlsiz;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2283 F77_FUNC (xilaenv, XILAENV) (9, F77_CONST_CHAR_ARG2 ("SGELSD", 6),
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2284 F77_CONST_CHAR_ARG2 (" ", 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2285 0, 0, 0, 0, smlsiz
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2286 F77_CHAR_ARG_LEN (6)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2287 F77_CHAR_ARG_LEN (1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2288
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2289 octave_idx_type mnthr;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2290 F77_FUNC (xilaenv, XILAENV) (6, F77_CONST_CHAR_ARG2 ("SGELSD", 6),
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2291 F77_CONST_CHAR_ARG2 (" ", 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2292 m, n, nrhs, -1, mnthr
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2293 F77_CHAR_ARG_LEN (6)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2294 F77_CHAR_ARG_LEN (1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2295
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2296 // We compute the size of iwork because DGELSD in older versions
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2297 // of LAPACK does not return it on a query call.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2298 float dminmn = static_cast<float> (minmn);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2299 float dsmlsizp1 = static_cast<float> (smlsiz+1);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2300 #if defined (HAVE_LOG2)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2301 float tmp = log2 (dminmn / dsmlsizp1);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2302 #else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2303 float tmp = log (dminmn / dsmlsizp1) / log (2.0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2304 #endif
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2305 octave_idx_type nlvl = static_cast<octave_idx_type> (tmp) + 1;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2306 if (nlvl < 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2307 nlvl = 0;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2308
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2309 octave_idx_type liwork = 3 * minmn * nlvl + 11 * minmn;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2310 if (liwork < 1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2311 liwork = 1;
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2312 Array<octave_idx_type> iwork (dim_vector (liwork, 1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2313 octave_idx_type* piwork = iwork.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2314
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2315 F77_XFCN (sgelsd, SGELSD, (m, n, nrhs, tmp_data, m, pretval, maxmn,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2316 ps, rcon, rank, work.fortran_vec (),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2317 lwork, piwork, info));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2318
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2319 // The workspace query is broken in at least LAPACK 3.0.0
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2320 // through 3.1.1 when n >= mnthr. The obtuse formula below
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2321 // should provide sufficient workspace for DGELSD to operate
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2322 // efficiently.
10813 2c2d4a2f1047 fix workspace bug workaround for xGELSD (since 7486:6a6d2abe51ff) Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	2323 if (n > m && n >= mnthr)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2324 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2325 const octave_idx_type wlalsd
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2326 = 9m + 2msmlsiz + 8mnlvl + mnrhs + (smlsiz+1)*(smlsiz+1);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2327
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2328 octave_idx_type addend = m;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2329
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2330 if (2*m-4 > addend)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2331 addend = 2*m-4;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2332
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2333 if (nrhs > addend)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2334 addend = nrhs;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2335
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2336 if (n-3*m > addend)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2337 addend = n-3*m;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2338
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2339 if (wlalsd > addend)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2340 addend = wlalsd;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2341
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2342 const octave_idx_type lworkaround = 4m + mm + addend;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2343
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2344 if (work(0) < lworkaround)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2345 work(0) = lworkaround;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2346 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2347 else if (m >= n)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2348 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2349 octave_idx_type lworkaround
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2350 = 12n + 2nsmlsiz + 8nnlvl + nnrhs + (smlsiz+1)*(smlsiz+1);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2351
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2352 if (work(0) < lworkaround)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2353 work(0) = lworkaround;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2354 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2355
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2356 lwork = static_cast<octave_idx_type> (work(0));
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	2357 work.resize (lwork, 1);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2358
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2359 F77_XFCN (sgelsd, SGELSD, (m, n, nrhs, tmp_data, m, pretval,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2360 maxmn, ps, rcon, rank,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2361 work.fortran_vec (), lwork,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2362 piwork, info));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2363
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2364 if (s.elem (0) == 0.0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2365 rcon = 0.0;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2366 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2367 rcon = s.elem (minmn - 1) / s.elem (0);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2368
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2369 retval.resize (n, nrhs);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2370 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2371
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2372 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2373 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2374
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2375 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2376 FloatMatrix::lssolve (const FloatComplexMatrix& b) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2377 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2378 FloatComplexMatrix tmp (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2379 octave_idx_type info;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2380 octave_idx_type rank;
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2381 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2382 return tmp.lssolve (b, info, rank, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2383 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2384
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2385 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2386 FloatMatrix::lssolve (const FloatComplexMatrix& b, octave_idx_type& info) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2387 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2388 FloatComplexMatrix tmp (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2389 octave_idx_type rank;
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2390 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2391 return tmp.lssolve (b, info, rank, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2392 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2393
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2394 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2395 FloatMatrix::lssolve (const FloatComplexMatrix& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2396 octave_idx_type& rank) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2397 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2398 FloatComplexMatrix tmp (*this);
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2399 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2400 return tmp.lssolve (b, info, rank, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2401 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2402
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2403 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2404 FloatMatrix::lssolve (const FloatComplexMatrix& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2405 octave_idx_type& rank, float& rcon) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2406 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2407 FloatComplexMatrix tmp (*this);
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2408 return tmp.lssolve (b, info, rank, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2409 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2410
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2411 FloatColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2412 FloatMatrix::lssolve (const FloatColumnVector& b) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2413 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2414 octave_idx_type info;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2415 octave_idx_type rank;
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2416 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2417 return lssolve (b, info, rank, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2418 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2419
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2420 FloatColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2421 FloatMatrix::lssolve (const FloatColumnVector& b, octave_idx_type& info) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2422 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2423 octave_idx_type rank;
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2424 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2425 return lssolve (b, info, rank, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2426 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2427
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2428 FloatColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2429 FloatMatrix::lssolve (const FloatColumnVector& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2430 octave_idx_type& rank) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2431 {
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2432 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2433 return lssolve (b, info, rank, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2434 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2435
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2436 FloatColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2437 FloatMatrix::lssolve (const FloatColumnVector& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2438 octave_idx_type& rank, float &rcon) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2439 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2440 FloatColumnVector retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2441
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2442 octave_idx_type nrhs = 1;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2443
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2444 octave_idx_type m = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2445 octave_idx_type n = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2446
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2447 if (m != b.length ())
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2448 (*current_liboctave_error_handler)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2449 ("matrix dimension mismatch solution of linear equations");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2450 else if (m == 0 \|\| n == 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2451 retval = FloatColumnVector (n, 0.0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2452 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2453 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2454 volatile octave_idx_type minmn = (m < n ? m : n);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2455 octave_idx_type maxmn = m > n ? m : n;
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2456 rcon = -1.0;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2457
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2458 if (m != n)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2459 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2460 retval = FloatColumnVector (maxmn, 0.0);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2461
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2462 for (octave_idx_type i = 0; i < m; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2463 retval.elem (i) = b.elem (i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2464 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2465 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2466 retval = b;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2467
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2468 FloatMatrix atmp = *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2469 float *tmp_data = atmp.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2470
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2471 float *pretval = retval.fortran_vec ();
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2472 Array<float> s (dim_vector (minmn, 1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2473 float *ps = s.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2474
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2475 // Ask DGELSD what the dimension of WORK should be.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2476 octave_idx_type lwork = -1;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2477
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2478 Array<float> work (dim_vector (1, 1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2479
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2480 octave_idx_type smlsiz;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2481 F77_FUNC (xilaenv, XILAENV) (9, F77_CONST_CHAR_ARG2 ("SGELSD", 6),
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2482 F77_CONST_CHAR_ARG2 (" ", 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2483 0, 0, 0, 0, smlsiz
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2484 F77_CHAR_ARG_LEN (6)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2485 F77_CHAR_ARG_LEN (1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2486
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2487 // We compute the size of iwork because DGELSD in older versions
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2488 // of LAPACK does not return it on a query call.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2489 float dminmn = static_cast<float> (minmn);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2490 float dsmlsizp1 = static_cast<float> (smlsiz+1);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2491 #if defined (HAVE_LOG2)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2492 float tmp = log2 (dminmn / dsmlsizp1);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2493 #else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2494 float tmp = log (dminmn / dsmlsizp1) / log (2.0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2495 #endif
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2496 octave_idx_type nlvl = static_cast<octave_idx_type> (tmp) + 1;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2497 if (nlvl < 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2498 nlvl = 0;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2499
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2500 octave_idx_type liwork = 3 * minmn * nlvl + 11 * minmn;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2501 if (liwork < 1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2502 liwork = 1;
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2503 Array<octave_idx_type> iwork (dim_vector (liwork, 1));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2504 octave_idx_type* piwork = iwork.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2505
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2506 F77_XFCN (sgelsd, SGELSD, (m, n, nrhs, tmp_data, m, pretval, maxmn,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2507 ps, rcon, rank, work.fortran_vec (),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2508 lwork, piwork, info));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2509
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2510 lwork = static_cast<octave_idx_type> (work(0));
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	2511 work.resize (lwork, 1);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2512
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2513 F77_XFCN (sgelsd, SGELSD, (m, n, nrhs, tmp_data, m, pretval,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2514 maxmn, ps, rcon, rank,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2515 work.fortran_vec (), lwork,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2516 piwork, info));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2517
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2518 if (rank < minmn)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2519 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2520 if (s.elem (0) == 0.0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2521 rcon = 0.0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2522 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2523 rcon = s.elem (minmn - 1) / s.elem (0);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2524 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2525
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2526 retval.resize (n, nrhs);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2527 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2528
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2529 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2530 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2531
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2532 FloatComplexColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2533 FloatMatrix::lssolve (const FloatComplexColumnVector& b) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2534 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2535 FloatComplexMatrix tmp (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2536 octave_idx_type info;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2537 octave_idx_type rank;
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2538 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2539 return tmp.lssolve (b, info, rank, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2540 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2541
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2542 FloatComplexColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2543 FloatMatrix::lssolve (const FloatComplexColumnVector& b, octave_idx_type& info) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2544 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2545 FloatComplexMatrix tmp (*this);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2546 octave_idx_type rank;
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2547 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2548 return tmp.lssolve (b, info, rank, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2549 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2550
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2551 FloatComplexColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2552 FloatMatrix::lssolve (const FloatComplexColumnVector& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2553 octave_idx_type& rank) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2554 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2555 FloatComplexMatrix tmp (*this);
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2556 float rcon;
f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2557 return tmp.lssolve (b, info, rank, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2558 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2559
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2560 FloatComplexColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2561 FloatMatrix::lssolve (const FloatComplexColumnVector& b, octave_idx_type& info,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2562 octave_idx_type& rank, float &rcon) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2563 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2564 FloatComplexMatrix tmp (*this);
7797 f42c6f8d6d8e Extend rcond function to single precision types David Bateman <dbateman@free.fr> parents: 7789 diff changeset	2565 return tmp.lssolve (b, info, rank, rcon);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2566 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2567
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2568 FloatMatrix&
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2569 FloatMatrix::operator += (const FloatDiagMatrix& a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2570 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2571 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2572 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2573
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2574 octave_idx_type a_nr = a.rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2575 octave_idx_type a_nc = a.cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2576
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2577 if (nr != a_nr \|\| nc != a_nc)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2578 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2579 gripe_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2580 return *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2581 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2582
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2583 for (octave_idx_type i = 0; i < a.length (); i++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2584 elem (i, i) += a.elem (i, i);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2585
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2586 return *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2587 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2588
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2589 FloatMatrix&
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2590 FloatMatrix::operator -= (const FloatDiagMatrix& a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2591 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2592 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2593 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2594
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2595 octave_idx_type a_nr = a.rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2596 octave_idx_type a_nc = a.cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2597
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2598 if (nr != a_nr \|\| nc != a_nc)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2599 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2600 gripe_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2601 return *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2602 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2603
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2604 for (octave_idx_type i = 0; i < a.length (); i++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2605 elem (i, i) -= a.elem (i, i);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2606
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2607 return *this;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2608 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2609
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2610 // unary operations
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2611
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2612 boolMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2613 FloatMatrix::operator ! (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2614 {
11130 7c573eb981eb consistently give error for operator not applied to NaN values John W. Eaton <jwe@octave.org> parents: 11010 diff changeset	2615 if (any_element_is_nan ())
7c573eb981eb consistently give error for operator not applied to NaN values John W. Eaton <jwe@octave.org> parents: 11010 diff changeset	2616 gripe_nan_to_logical_conversion ();
7c573eb981eb consistently give error for operator not applied to NaN values John W. Eaton <jwe@octave.org> parents: 11010 diff changeset	2617
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	2618 return do_mx_unary_op<bool, float> (*this, mx_inline_not);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2619 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2620
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2621 // column vector by row vector -> matrix operations
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2622
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2623 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2624 operator * (const FloatColumnVector& v, const FloatRowVector& a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2625 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2626 FloatMatrix retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2627
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2628 octave_idx_type len = v.length ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2629
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2630 if (len != 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2631 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2632 octave_idx_type a_len = a.length ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2633
9359 be6867ba8104 avoid useless zero initialization when doing matrix multiply Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	2634 retval = FloatMatrix (len, a_len);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2635 float *c = retval.fortran_vec ();
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2636
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2637 F77_XFCN (sgemm, SGEMM, (F77_CONST_CHAR_ARG2 ("N", 1),
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2638 F77_CONST_CHAR_ARG2 ("N", 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2639 len, a_len, 1, 1.0, v.data (), len,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2640 a.data (), 1, 0.0, c, len
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2641 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2642 F77_CHAR_ARG_LEN (1)));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2643 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2644
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2645 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2646 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2647
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2648 // other operations.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2649
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2650 bool
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2651 FloatMatrix::any_element_is_negative (bool neg_zero) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2652 {
11010 9478b216752e simplify more array tests Jaroslav Hajek <highegg@gmail.com> parents: 11008 diff changeset	2653 return (neg_zero ? test_all (xnegative_sign)
9478b216752e simplify more array tests Jaroslav Hajek <highegg@gmail.com> parents: 11008 diff changeset	2654 : do_mx_check<float> (*this, mx_inline_any_negative));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2655 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2656
7922 935be827eaf8 error for NaN values in & and \| expressions John W. Eaton <jwe@octave.org> parents: 7804 diff changeset	2657 bool
935be827eaf8 error for NaN values in & and \| expressions John W. Eaton <jwe@octave.org> parents: 7804 diff changeset	2658 FloatMatrix::any_element_is_nan (void) const
935be827eaf8 error for NaN values in & and \| expressions John W. Eaton <jwe@octave.org> parents: 7804 diff changeset	2659 {
11008 3622db30ff05 simplify some array tests in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10813 diff changeset	2660 return do_mx_check<float> (*this, mx_inline_any_nan);
7922 935be827eaf8 error for NaN values in & and \| expressions John W. Eaton <jwe@octave.org> parents: 7804 diff changeset	2661 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2662
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2663 bool
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2664 FloatMatrix::any_element_is_inf_or_nan (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2665 {
11008 3622db30ff05 simplify some array tests in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10813 diff changeset	2666 return ! do_mx_check<float> (*this, mx_inline_all_finite);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2667 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2668
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2669 bool
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2670 FloatMatrix::any_element_not_one_or_zero (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2671 {
11010 9478b216752e simplify more array tests Jaroslav Hajek <highegg@gmail.com> parents: 11008 diff changeset	2672 return ! test_all (xis_one_or_zero);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2673 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2674
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2675 bool
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2676 FloatMatrix::all_elements_are_int_or_inf_or_nan (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2677 {
11010 9478b216752e simplify more array tests Jaroslav Hajek <highegg@gmail.com> parents: 11008 diff changeset	2678 return test_all (xis_int_or_inf_or_nan);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2679 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2680
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2681 // Return nonzero if any element of M is not an integer. Also extract
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2682 // the largest and smallest values and return them in MAX_VAL and MIN_VAL.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2683
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2684 bool
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2685 FloatMatrix::all_integers (float& max_val, float& min_val) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2686 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2687 octave_idx_type nel = nelem ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2688
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2689 if (nel > 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2690 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2691 max_val = elem (0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2692 min_val = elem (0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2693 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2694 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2695 return false;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2696
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2697 for (octave_idx_type i = 0; i < nel; i++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2698 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2699 float val = elem (i);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2700
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2701 if (val > max_val)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2702 max_val = val;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2703
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2704 if (val < min_val)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2705 min_val = val;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2706
11010 9478b216752e simplify more array tests Jaroslav Hajek <highegg@gmail.com> parents: 11008 diff changeset	2707 if (! xisinteger (val))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2708 return false;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2709 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2710
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2711 return true;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2712 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2713
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2714 bool
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2715 FloatMatrix::too_large_for_float (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2716 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2717 return false;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2718 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2719
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2720 // FIXME Do these really belong here? Maybe they should be
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2721 // in a base class?
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2722
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2723 boolMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2724 FloatMatrix::all (int dim) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2725 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	2726 return do_mx_red_op<bool, float> (*this, dim, mx_inline_all);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2727 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2728
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2729 boolMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2730 FloatMatrix::any (int dim) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2731 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	2732 return do_mx_red_op<bool, float> (*this, dim, mx_inline_any);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2733 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2734
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2735 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2736 FloatMatrix::cumprod (int dim) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2737 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	2738 return do_mx_cum_op<float, float> (*this, dim, mx_inline_cumprod);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2739 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2740
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2741 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2742 FloatMatrix::cumsum (int dim) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2743 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	2744 return do_mx_cum_op<float, float> (*this, dim, mx_inline_cumsum);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2745 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2746
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2747 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2748 FloatMatrix::prod (int dim) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2749 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	2750 return do_mx_red_op<float, float> (*this, dim, mx_inline_prod);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2751 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2752
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2753 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2754 FloatMatrix::sum (int dim) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2755 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	2756 return do_mx_red_op<float, float> (*this, dim, mx_inline_sum);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2757 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2758
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2759 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2760 FloatMatrix::sumsq (int dim) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2761 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	2762 return do_mx_red_op<float, float> (*this, dim, mx_inline_sumsq);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2763 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2764
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2765 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2766 FloatMatrix::abs (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2767 {
10363 a0728e81ed25 improve diag matrix interface & implementation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	2768 return do_mx_unary_map<float, float, std::abs> (*this);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2769 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2770
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2771 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2772 FloatMatrix::diag (octave_idx_type k) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2773 {
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	2774 return MArray<float>::diag (k);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2775 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2776
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2777 FloatColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2778 FloatMatrix::row_min (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2779 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2780 Array<octave_idx_type> dummy_idx;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2781 return row_min (dummy_idx);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2782 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2783
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2784 FloatColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2785 FloatMatrix::row_min (Array<octave_idx_type>& idx_arg) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2786 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2787 FloatColumnVector result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2788
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2789 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2790 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2791
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2792 if (nr > 0 && nc > 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2793 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2794 result.resize (nr);
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	2795 idx_arg.resize (nr, 1);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2796
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2797 for (octave_idx_type i = 0; i < nr; i++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2798 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2799 octave_idx_type idx_j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2800
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2801 float tmp_min = octave_Float_NaN;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2802
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2803 for (idx_j = 0; idx_j < nc; idx_j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2804 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2805 tmp_min = elem (i, idx_j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2806
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2807 if (! xisnan (tmp_min))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2808 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2809 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2810
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2811 for (octave_idx_type j = idx_j+1; j < nc; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2812 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2813 float tmp = elem (i, j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2814
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2815 if (xisnan (tmp))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2816 continue;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2817 else if (tmp < tmp_min)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2818 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2819 idx_j = j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2820 tmp_min = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2821 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2822 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2823
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2824 result.elem (i) = tmp_min;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2825 idx_arg.elem (i) = xisnan (tmp_min) ? 0 : idx_j;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2826 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2827 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2828
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2829 return result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2830 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2831
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2832 FloatColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2833 FloatMatrix::row_max (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2834 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2835 Array<octave_idx_type> dummy_idx;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2836 return row_max (dummy_idx);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2837 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2838
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2839 FloatColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2840 FloatMatrix::row_max (Array<octave_idx_type>& idx_arg) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2841 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2842 FloatColumnVector result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2843
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2844 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2845 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2846
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2847 if (nr > 0 && nc > 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2848 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2849 result.resize (nr);
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	2850 idx_arg.resize (nr, 1);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2851
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2852 for (octave_idx_type i = 0; i < nr; i++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2853 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2854 octave_idx_type idx_j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2855
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2856 float tmp_max = octave_Float_NaN;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2857
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2858 for (idx_j = 0; idx_j < nc; idx_j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2859 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2860 tmp_max = elem (i, idx_j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2861
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2862 if (! xisnan (tmp_max))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2863 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2864 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2865
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2866 for (octave_idx_type j = idx_j+1; j < nc; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2867 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2868 float tmp = elem (i, j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2869
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2870 if (xisnan (tmp))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2871 continue;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2872 else if (tmp > tmp_max)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2873 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2874 idx_j = j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2875 tmp_max = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2876 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2877 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2878
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2879 result.elem (i) = tmp_max;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2880 idx_arg.elem (i) = xisnan (tmp_max) ? 0 : idx_j;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2881 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2882 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2883
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2884 return result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2885 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2886
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2887 FloatRowVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2888 FloatMatrix::column_min (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2889 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2890 Array<octave_idx_type> dummy_idx;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2891 return column_min (dummy_idx);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2892 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2893
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2894 FloatRowVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2895 FloatMatrix::column_min (Array<octave_idx_type>& idx_arg) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2896 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2897 FloatRowVector result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2898
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2899 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2900 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2901
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2902 if (nr > 0 && nc > 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2903 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2904 result.resize (nc);
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	2905 idx_arg.resize (1, nc);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2906
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2907 for (octave_idx_type j = 0; j < nc; j++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2908 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2909 octave_idx_type idx_i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2910
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2911 float tmp_min = octave_Float_NaN;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2912
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2913 for (idx_i = 0; idx_i < nr; idx_i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2914 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2915 tmp_min = elem (idx_i, j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2916
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2917 if (! xisnan (tmp_min))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2918 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2919 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2920
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2921 for (octave_idx_type i = idx_i+1; i < nr; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2922 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2923 float tmp = elem (i, j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2924
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2925 if (xisnan (tmp))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2926 continue;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2927 else if (tmp < tmp_min)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2928 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2929 idx_i = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2930 tmp_min = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2931 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2932 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2933
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2934 result.elem (j) = tmp_min;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2935 idx_arg.elem (j) = xisnan (tmp_min) ? 0 : idx_i;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2936 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2937 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2938
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2939 return result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2940 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2941
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2942 FloatRowVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2943 FloatMatrix::column_max (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2944 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2945 Array<octave_idx_type> dummy_idx;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2946 return column_max (dummy_idx);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2947 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2948
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2949 FloatRowVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2950 FloatMatrix::column_max (Array<octave_idx_type>& idx_arg) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2951 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2952 FloatRowVector result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2953
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2954 octave_idx_type nr = rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2955 octave_idx_type nc = cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2956
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2957 if (nr > 0 && nc > 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2958 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2959 result.resize (nc);
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	2960 idx_arg.resize (1, nc);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2961
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2962 for (octave_idx_type j = 0; j < nc; j++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2963 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2964 octave_idx_type idx_i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2965
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2966 float tmp_max = octave_Float_NaN;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2967
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2968 for (idx_i = 0; idx_i < nr; idx_i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2969 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2970 tmp_max = elem (idx_i, j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2971
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2972 if (! xisnan (tmp_max))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2973 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2974 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2975
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2976 for (octave_idx_type i = idx_i+1; i < nr; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2977 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2978 float tmp = elem (i, j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2979
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2980 if (xisnan (tmp))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2981 continue;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2982 else if (tmp > tmp_max)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2983 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2984 idx_i = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2985 tmp_max = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2986 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2987 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2988
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2989 result.elem (j) = tmp_max;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	2990 idx_arg.elem (j) = xisnan (tmp_max) ? 0 : idx_i;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2991 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2992 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2993
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2994 return result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2995 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2996
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2997 std::ostream&
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2998 operator << (std::ostream& os, const FloatMatrix& a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	2999 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3000 for (octave_idx_type i = 0; i < a.rows (); i++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3001 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3002 for (octave_idx_type j = 0; j < a.cols (); j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3003 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3004 os << " ";
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3005 octave_write_float (os, a.elem (i, j));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3006 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3007 os << "\n";
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3008 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3009 return os;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3010 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3011
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3012 std::istream&
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3013 operator >> (std::istream& is, FloatMatrix& a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3014 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3015 octave_idx_type nr = a.rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3016 octave_idx_type nc = a.cols ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3017
8999 dc07bc4157b8 allow empty matrices in stream input operators Jaroslav Hajek <highegg@gmail.com> parents: 8956 diff changeset	3018 if (nr > 0 && nc > 0)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3019 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3020 float tmp;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3021 for (octave_idx_type i = 0; i < nr; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3022 for (octave_idx_type j = 0; j < nc; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3023 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3024 tmp = octave_read_value<float> (is);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3025 if (is)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3026 a.elem (i, j) = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3027 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3028 goto done;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3029 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3030 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3031
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3032 done:
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3033
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3034 return is;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3035 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3036
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3037 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3038 Givens (float x, float y)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3039 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3040 float cc, s, temp_r;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3041
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3042 F77_FUNC (slartg, SLARTG) (x, y, cc, s, temp_r);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3043
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3044 FloatMatrix g (2, 2);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3045
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3046 g.elem (0, 0) = cc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3047 g.elem (1, 1) = cc;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3048 g.elem (0, 1) = s;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3049 g.elem (1, 0) = -s;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3050
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3051 return g;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3052 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3053
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3054 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3055 Sylvester (const FloatMatrix& a, const FloatMatrix& b, const FloatMatrix& c)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3056 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3057 FloatMatrix retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3058
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3059 // FIXME -- need to check that a, b, and c are all the same
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3060 // size.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3061
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3062 // Compute Schur decompositions.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3063
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3064 FloatSCHUR as (a, "U");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3065 FloatSCHUR bs (b, "U");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3066
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3067 // Transform c to new coordinates.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3068
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3069 FloatMatrix ua = as.unitary_matrix ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3070 FloatMatrix sch_a = as.schur_matrix ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3071
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3072 FloatMatrix ub = bs.unitary_matrix ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3073 FloatMatrix sch_b = bs.schur_matrix ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3074
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3075 FloatMatrix cx = ua.transpose () * c * ub;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3076
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3077 // Solve the sylvester equation, back-transform, and return the
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3078 // solution.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3079
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3080 octave_idx_type a_nr = a.rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3081 octave_idx_type b_nr = b.rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3082
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3083 float scale;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3084 octave_idx_type info;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3085
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3086 float *pa = sch_a.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3087 float *pb = sch_b.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3088 float *px = cx.fortran_vec ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3089
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3090 F77_XFCN (strsyl, STRSYL, (F77_CONST_CHAR_ARG2 ("N", 1),
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3091 F77_CONST_CHAR_ARG2 ("N", 1),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3092 1, a_nr, b_nr, pa, a_nr, pb,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3093 b_nr, px, a_nr, scale, info
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3094 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3095 F77_CHAR_ARG_LEN (1)));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3096
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3097
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3098 // FIXME -- check info?
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3099
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3100 retval = -uacxub.transpose ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3101
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3102 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3103 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3104
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3105 // matrix by matrix -> matrix operations
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3106
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3107 /* Simple Dot Product, Matrix-Vector and Matrix-Matrix Unit tests
9527 6a9fd5f653c9 make single prec. matrix mutliply tests really single Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	3108 %!assert(single([1 2 3]) * single([ 4 ; 5 ; 6]), single(32), 5e-7)
6a9fd5f653c9 make single prec. matrix mutliply tests really single Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	3109 %!assert(single([1 2 ; 3 4 ]) * single([5 ; 6]), single([17 ; 39 ]), 5e-7)
6a9fd5f653c9 make single prec. matrix mutliply tests really single Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	3110 %!assert(single([1 2 ; 3 4 ]) * single([5 6 ; 7 8]), single([19 22; 43 50]), 5e-7)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3111 */
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3112
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3113 /* Test some simple identities
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3114 %!shared M, cv, rv
9527 6a9fd5f653c9 make single prec. matrix mutliply tests really single Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	3115 %! M = single(randn(10,10));
6a9fd5f653c9 make single prec. matrix mutliply tests really single Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	3116 %! cv = single(randn(10,1));
6a9fd5f653c9 make single prec. matrix mutliply tests really single Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	3117 %! rv = single(randn(1,10));
9528 ec066ba012c8 more fixes & tests for matrix multiply Jaroslav Hajek <highegg@gmail.com> parents: 9527 diff changeset	3118 %!assert([Mcv,Mcv],M*[cv,cv],5e-6)
ec066ba012c8 more fixes & tests for matrix multiply Jaroslav Hajek <highegg@gmail.com> parents: 9527 diff changeset	3119 %!assert([M'cv,M'cv],M'*[cv,cv],5e-6)
ec066ba012c8 more fixes & tests for matrix multiply Jaroslav Hajek <highegg@gmail.com> parents: 9527 diff changeset	3120 %!assert([rvM;rvM],[rv;rv]*M,5e-6)
ec066ba012c8 more fixes & tests for matrix multiply Jaroslav Hajek <highegg@gmail.com> parents: 9527 diff changeset	3121 %!assert([rvM';rvM'],[rv;rv]*M',5e-6)
ec066ba012c8 more fixes & tests for matrix multiply Jaroslav Hajek <highegg@gmail.com> parents: 9527 diff changeset	3122 %!assert(2rvcv,[rv,rv]*[cv;cv],5e-6)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3123 */
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3124
11516 53edbf95fbb6 avoid GCC warnings John W. Eaton <jwe@octave.org> parents: 11130 diff changeset	3125 static char
7804 a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3126 get_blas_trans_arg (bool trans)
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3127 {
11516 53edbf95fbb6 avoid GCC warnings John W. Eaton <jwe@octave.org> parents: 11130 diff changeset	3128 return trans ? 'T' : 'N';
7804 a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3129 }
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3130
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3131 // the general GEMM operation
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3132
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3133 FloatMatrix
9665 1dba57e9d08d use blas_trans_type for xgemm Jaroslav Hajek <highegg@gmail.com> parents: 9662 diff changeset	3134 xgemm (const FloatMatrix& a, const FloatMatrix& b,
1dba57e9d08d use blas_trans_type for xgemm Jaroslav Hajek <highegg@gmail.com> parents: 9662 diff changeset	3135 blas_trans_type transa, blas_trans_type transb)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3136 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3137 FloatMatrix retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3138
9665 1dba57e9d08d use blas_trans_type for xgemm Jaroslav Hajek <highegg@gmail.com> parents: 9662 diff changeset	3139 bool tra = transa != blas_no_trans, trb = transb != blas_no_trans;
1dba57e9d08d use blas_trans_type for xgemm Jaroslav Hajek <highegg@gmail.com> parents: 9662 diff changeset	3140
1dba57e9d08d use blas_trans_type for xgemm Jaroslav Hajek <highegg@gmail.com> parents: 9662 diff changeset	3141 octave_idx_type a_nr = tra ? a.cols () : a.rows ();
1dba57e9d08d use blas_trans_type for xgemm Jaroslav Hajek <highegg@gmail.com> parents: 9662 diff changeset	3142 octave_idx_type a_nc = tra ? a.rows () : a.cols ();
1dba57e9d08d use blas_trans_type for xgemm Jaroslav Hajek <highegg@gmail.com> parents: 9662 diff changeset	3143
1dba57e9d08d use blas_trans_type for xgemm Jaroslav Hajek <highegg@gmail.com> parents: 9662 diff changeset	3144 octave_idx_type b_nr = trb ? b.cols () : b.rows ();
1dba57e9d08d use blas_trans_type for xgemm Jaroslav Hajek <highegg@gmail.com> parents: 9662 diff changeset	3145 octave_idx_type b_nc = trb ? b.rows () : b.cols ();
7804 a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3146
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3147 if (a_nc != b_nr)
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3148 gripe_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3149 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3150 {
7804 a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3151 if (a_nr == 0 \|\| a_nc == 0 \|\| b_nc == 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3152 retval = FloatMatrix (a_nr, b_nc, 0.0);
9665 1dba57e9d08d use blas_trans_type for xgemm Jaroslav Hajek <highegg@gmail.com> parents: 9662 diff changeset	3153 else if (a.data () == b.data () && a_nr == b_nc && tra != trb)
7804 a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3154 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3155 octave_idx_type lda = a.rows ();
7804 a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3156
9359 be6867ba8104 avoid useless zero initialization when doing matrix multiply Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	3157 retval = FloatMatrix (a_nr, b_nc);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3158 float *c = retval.fortran_vec ();
7804 a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3159
11516 53edbf95fbb6 avoid GCC warnings John W. Eaton <jwe@octave.org> parents: 11130 diff changeset	3160 const char ctra = get_blas_trans_arg (tra);
7804 a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3161 F77_XFCN (ssyrk, SSYRK, (F77_CONST_CHAR_ARG2 ("U", 1),
11516 53edbf95fbb6 avoid GCC warnings John W. Eaton <jwe@octave.org> parents: 11130 diff changeset	3162 F77_CONST_CHAR_ARG2 (&ctra, 1),
7804 a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3163 a_nr, a_nc, 1.0,
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3164 a.data (), lda, 0.0, c, a_nr
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3165 F77_CHAR_ARG_LEN (1)
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3166 F77_CHAR_ARG_LEN (1)));
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3167 for (int j = 0; j < a_nr; j++)
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3168 for (int i = 0; i < j; i++)
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3169 retval.xelem (j,i) = retval.xelem (i,j);
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3170
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3171 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3172 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3173 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3174 octave_idx_type lda = a.rows (), tda = a.cols ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3175 octave_idx_type ldb = b.rows (), tdb = b.cols ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3176
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3177 retval = FloatMatrix (a_nr, b_nc);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3178 float *c = retval.fortran_vec ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3179
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3180 if (b_nc == 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3181 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3182 if (a_nr == 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3183 F77_FUNC (xsdot, XSDOT) (a_nc, a.data (), 1, b.data (), 1, *c);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3184 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3185 {
11516 53edbf95fbb6 avoid GCC warnings John W. Eaton <jwe@octave.org> parents: 11130 diff changeset	3186 const char ctra = get_blas_trans_arg (tra);
53edbf95fbb6 avoid GCC warnings John W. Eaton <jwe@octave.org> parents: 11130 diff changeset	3187 F77_XFCN (sgemv, SGEMV, (F77_CONST_CHAR_ARG2 (&ctra, 1),
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3188 lda, tda, 1.0, a.data (), lda,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3189 b.data (), 1, 0.0, c, 1
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3190 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3191 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3192 }
7804 a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3193 else if (a_nr == 1)
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3194 {
11516 53edbf95fbb6 avoid GCC warnings John W. Eaton <jwe@octave.org> parents: 11130 diff changeset	3195 const char crevtrb = get_blas_trans_arg (! trb);
53edbf95fbb6 avoid GCC warnings John W. Eaton <jwe@octave.org> parents: 11130 diff changeset	3196 F77_XFCN (sgemv, SGEMV, (F77_CONST_CHAR_ARG2 (&crevtrb, 1),
7804 a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3197 ldb, tdb, 1.0, b.data (), ldb,
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3198 a.data (), 1, 0.0, c, 1
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3199 F77_CHAR_ARG_LEN (1)));
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3200 }
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3201 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3202 {
11516 53edbf95fbb6 avoid GCC warnings John W. Eaton <jwe@octave.org> parents: 11130 diff changeset	3203 const char ctra = get_blas_trans_arg (tra);
53edbf95fbb6 avoid GCC warnings John W. Eaton <jwe@octave.org> parents: 11130 diff changeset	3204 const char ctrb = get_blas_trans_arg (trb);
53edbf95fbb6 avoid GCC warnings John W. Eaton <jwe@octave.org> parents: 11130 diff changeset	3205 F77_XFCN (sgemm, SGEMM, (F77_CONST_CHAR_ARG2 (&ctra, 1),
53edbf95fbb6 avoid GCC warnings John W. Eaton <jwe@octave.org> parents: 11130 diff changeset	3206 F77_CONST_CHAR_ARG2 (&ctrb, 1),
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3207 a_nr, b_nc, a_nc, 1.0, a.data (),
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3208 lda, b.data (), ldb, 0.0, c, a_nr
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3209 F77_CHAR_ARG_LEN (1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3210 F77_CHAR_ARG_LEN (1)));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3211 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3212 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3213 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3214
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3215 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3216 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3217
7804 a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3218 FloatMatrix
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3219 operator * (const FloatMatrix& a, const FloatMatrix& b)
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3220 {
9665 1dba57e9d08d use blas_trans_type for xgemm Jaroslav Hajek <highegg@gmail.com> parents: 9662 diff changeset	3221 return xgemm (a, b);
7804 a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3222 }
a0c550b22e61 compound ops for float matrices Jaroslav Hajek <highegg@gmail.com> parents: 7797 diff changeset	3223
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3224 // FIXME -- it would be nice to share code among the min/max
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3225 // functions below.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3226
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3227 #define EMPTY_RETURN_CHECK(T) \
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3228 if (nr == 0 \|\| nc == 0) \
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3229 return T (nr, nc);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3230
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3231 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3232 min (float d, const FloatMatrix& m)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3233 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3234 octave_idx_type nr = m.rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3235 octave_idx_type nc = m.columns ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3236
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3237 EMPTY_RETURN_CHECK (FloatMatrix);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3238
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3239 FloatMatrix result (nr, nc);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3240
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3241 for (octave_idx_type j = 0; j < nc; j++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3242 for (octave_idx_type i = 0; i < nr; i++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3243 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3244 octave_quit ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3245 result (i, j) = xmin (d, m (i, j));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3246 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3247
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3248 return result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3249 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3250
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3251 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3252 min (const FloatMatrix& m, float d)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3253 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3254 octave_idx_type nr = m.rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3255 octave_idx_type nc = m.columns ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3256
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3257 EMPTY_RETURN_CHECK (FloatMatrix);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3258
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3259 FloatMatrix result (nr, nc);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3260
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3261 for (octave_idx_type j = 0; j < nc; j++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3262 for (octave_idx_type i = 0; i < nr; i++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3263 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3264 octave_quit ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3265 result (i, j) = xmin (m (i, j), d);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3266 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3267
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3268 return result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3269 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3270
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3271 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3272 min (const FloatMatrix& a, const FloatMatrix& b)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3273 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3274 octave_idx_type nr = a.rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3275 octave_idx_type nc = a.columns ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3276
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3277 if (nr != b.rows () \|\| nc != b.columns ())
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3278 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3279 (*current_liboctave_error_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3280 ("two-arg min expecting args of same size");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3281 return FloatMatrix ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3282 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3283
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3284 EMPTY_RETURN_CHECK (FloatMatrix);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3285
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3286 FloatMatrix result (nr, nc);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3287
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3288 for (octave_idx_type j = 0; j < nc; j++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3289 for (octave_idx_type i = 0; i < nr; i++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3290 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3291 octave_quit ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3292 result (i, j) = xmin (a (i, j), b (i, j));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3293 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3294
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3295 return result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3296 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3297
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3298 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3299 max (float d, const FloatMatrix& m)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3300 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3301 octave_idx_type nr = m.rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3302 octave_idx_type nc = m.columns ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3303
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3304 EMPTY_RETURN_CHECK (FloatMatrix);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3305
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3306 FloatMatrix result (nr, nc);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3307
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3308 for (octave_idx_type j = 0; j < nc; j++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3309 for (octave_idx_type i = 0; i < nr; i++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3310 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3311 octave_quit ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3312 result (i, j) = xmax (d, m (i, j));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3313 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3314
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3315 return result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3316 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3317
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3318 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3319 max (const FloatMatrix& m, float d)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3320 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3321 octave_idx_type nr = m.rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3322 octave_idx_type nc = m.columns ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3323
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3324 EMPTY_RETURN_CHECK (FloatMatrix);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3325
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3326 FloatMatrix result (nr, nc);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3327
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3328 for (octave_idx_type j = 0; j < nc; j++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3329 for (octave_idx_type i = 0; i < nr; i++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3330 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3331 octave_quit ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3332 result (i, j) = xmax (m (i, j), d);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3333 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3334
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3335 return result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3336 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3337
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3338 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3339 max (const FloatMatrix& a, const FloatMatrix& b)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3340 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3341 octave_idx_type nr = a.rows ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3342 octave_idx_type nc = a.columns ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3343
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3344 if (nr != b.rows () \|\| nc != b.columns ())
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3345 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3346 (*current_liboctave_error_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3347 ("two-arg max expecting args of same size");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3348 return FloatMatrix ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3349 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3350
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3351 EMPTY_RETURN_CHECK (FloatMatrix);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3352
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3353 FloatMatrix result (nr, nc);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3354
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3355 for (octave_idx_type j = 0; j < nc; j++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3356 for (octave_idx_type i = 0; i < nr; i++)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3357 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3358 octave_quit ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10213 diff changeset	3359 result (i, j) = xmax (a (i, j), b (i, j));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3360 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3361
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3362 return result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3363 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3364
9653 e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3365 FloatMatrix linspace (const FloatColumnVector& x1,
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3366 const FloatColumnVector& x2,
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3367 octave_idx_type n)
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3368
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3369 {
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3370 if (n < 1) n = 1;
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3371
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3372 octave_idx_type m = x1.length ();
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3373
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3374 if (x2.length () != m)
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3375 (*current_liboctave_error_handler) ("linspace: vectors must be of equal length");
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3376
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3377 NoAlias<FloatMatrix> retval;
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3378
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3379 retval.clear (m, n);
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3380 for (octave_idx_type i = 0; i < m; i++)
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3381 retval(i, 0) = x1(i);
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3382
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3383 // The last column is not needed while using delta.
9658 3429c956de6f extend linspace & fix up liboctave rewrite Jaroslav Hajek <highegg@gmail.com> parents: 9653 diff changeset	3384 float *delta = &retval(0, n-1);
9653 e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3385 for (octave_idx_type i = 0; i < m; i++)
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3386 delta[i] = (x2(i) - x1(i)) / (n - 1);
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3387
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3388 for (octave_idx_type j = 1; j < n-1; j++)
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3389 for (octave_idx_type i = 0; i < m; i++)
9658 3429c956de6f extend linspace & fix up liboctave rewrite Jaroslav Hajek <highegg@gmail.com> parents: 9653 diff changeset	3390 retval(i, j) = x1(i) + j*delta[i];
9653 e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3391
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3392 for (octave_idx_type i = 0; i < m; i++)
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3393 retval(i, n-1) = x2(i);
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3394
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3395 return retval;
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3396 }
e087d7c77ff9 improve linspace in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	3397
9578 7dafdb8b062f refactor comparison ops implementations Jaroslav Hajek <highegg@gmail.com> parents: 9553 diff changeset	3398 MS_CMP_OPS (FloatMatrix, float)
9550 3d6a9aea2aea refactor binary & bool ops in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9528 diff changeset	3399 MS_BOOL_OPS (FloatMatrix, float)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3400
9578 7dafdb8b062f refactor comparison ops implementations Jaroslav Hajek <highegg@gmail.com> parents: 9553 diff changeset	3401 SM_CMP_OPS (float, FloatMatrix)
9550 3d6a9aea2aea refactor binary & bool ops in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9528 diff changeset	3402 SM_BOOL_OPS (float, FloatMatrix)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: diff changeset	3403
9578 7dafdb8b062f refactor comparison ops implementations Jaroslav Hajek <highegg@gmail.com> parents: 9553 diff changeset	3404 MM_CMP_OPS (FloatMatrix, FloatMatrix)
9550 3d6a9aea2aea refactor binary & bool ops in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9528 diff changeset	3405 MM_BOOL_OPS (FloatMatrix, FloatMatrix)

Mercurial > hg > octave-lyh

annotate liboctave/fMatrix.cc @ 11570:57632dea2446