octave-nkf: liboctave/array/fMatrix.cc annotate

annotate liboctave/array/fMatrix.cc @ 19510:d0c73e23a505

Change inheritance tree so that <T>Matrix inherit from <T>NDArray. * liboctave/array/CMatrix.cc, liboctave/array/CMatrix.h, liboctave/array/CNDArray.cc, liboctave/array/CNDArray.h, liboctave/array/dMatrix.cc, liboctave/array/dMatrix.h, liboctave/array/dNDArray.cc, liboctave/array/dNDArray.h, liboctave/array/fCMatrix.cc, liboctave/array/fCMatrix.h, liboctave/array/fCNDArray.cc, liboctave/array/fCNDArray.h, liboctave/array/fMatrix.cc, liboctave/array/fMatrix.h, liboctave/array/fNDArray.cc, liboctave/array/fNDArray.h: change base class of Matrix, FloatMatrix, ComplexMatrix, and FloatComplexMatrix to NDArray, FloatNDArray, ComplexNDArray, and FloatComplexNDArray respectively. This will allow to reduce duplicated code since the Matrix classes will be able to inherit many of their methods from their NDArray counterparts. Also remove the matrix_value () method since a constructor now suffices. * liboctave/array/CSparse.h: include CMatrix * libinterp/corefcn/pr-output.cc, libinterp/octave-value/ov-cx-mat.cc, libinterp/octave-value/ov-flt-cx-mat.cc, libinterp/octave-value/ov-flt-re-mat.cc, libinterp/octave-value/ov-re-mat.cc: replace calls to matrix_value () with constructor with respective Matrix subclass.

author	Carnë Draug <carandraug@octave.org>
date	Fri, 07 Nov 2014 08:15:55 +0000
parents	65554f5847ac
children	3746b92739f7

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

Mercurial > hg > octave-nkf

annotate liboctave/array/fMatrix.cc @ 19510:d0c73e23a505