Mercurial > hg > octave-lyh
view src/xdiv.h @ 13294:7dce7e110511
make concatenation of class objects work
* data.h: New file.
* src/Makefile.am (octinclude_HEADERS): Add it to the list.
* data.cc (attempt_type_conversion): New static function.
(do_class_concat): New function.
(do_cat): Use it if any elements of the list are objects.
Check whether any elements of the list are objects or cells.
Check whether all elements of the list are complex.
Check whether the first element of the list is a struct.
Maybe convert elements of the list to cells.
New tests for horzcat and vertcat.
* data.h (do_class_concat): Provide decl.
* ov-class.h (octave_class::octave_class): Allow optional parent
list.
* ov.h, ov.h (octave_value::octave_value (const Octave_map&,
const std::string&)): Likewise.
* pt-mat.cc (do_class_concat): New static function.
(tree_matrix::rvalue1): Use it to concatenate objects.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 07 Oct 2011 22:16:07 -0400 |
parents | 12df7854fa7c |
children | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 1993-2011 John W. Eaton Copyright (C) 2008 Jaroslav Hajek This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if !defined (octave_xdiv_h) #define octave_xdiv_h 1 #include "mx-defs.h" #include "MatrixType.h" extern Matrix xdiv (const Matrix& a, const Matrix& b, MatrixType &typ); extern ComplexMatrix xdiv (const Matrix& a, const ComplexMatrix& b, MatrixType &typ); extern ComplexMatrix xdiv (const ComplexMatrix& a, const Matrix& b, MatrixType &typ); extern ComplexMatrix xdiv (const ComplexMatrix& a, const ComplexMatrix& b, MatrixType &typ); extern Matrix x_el_div (double a, const Matrix& b); extern ComplexMatrix x_el_div (double a, const ComplexMatrix& b); extern ComplexMatrix x_el_div (const Complex a, const Matrix& b); extern ComplexMatrix x_el_div (const Complex a, const ComplexMatrix& b); extern NDArray x_el_div (double a, const NDArray& b); extern ComplexNDArray x_el_div (double a, const ComplexNDArray& b); extern ComplexNDArray x_el_div (const Complex a, const NDArray& b); extern ComplexNDArray x_el_div (const Complex a, const ComplexNDArray& b); extern Matrix xleftdiv (const Matrix& a, const Matrix& b, MatrixType &typ, blas_trans_type transt = blas_no_trans); extern ComplexMatrix xleftdiv (const Matrix& a, const ComplexMatrix& b, MatrixType &typ, blas_trans_type transt = blas_no_trans); extern ComplexMatrix xleftdiv (const ComplexMatrix& a, const Matrix& b, MatrixType &typ, blas_trans_type transt = blas_no_trans); extern ComplexMatrix xleftdiv (const ComplexMatrix& a, const ComplexMatrix& b, MatrixType &typ, blas_trans_type transt = blas_no_trans); extern FloatMatrix xdiv (const FloatMatrix& a, const FloatMatrix& b, MatrixType &typ); extern FloatComplexMatrix xdiv (const FloatMatrix& a, const FloatComplexMatrix& b, MatrixType &typ); extern FloatComplexMatrix xdiv (const FloatComplexMatrix& a, const FloatMatrix& b, MatrixType &typ); extern FloatComplexMatrix xdiv (const FloatComplexMatrix& a, const FloatComplexMatrix& b, MatrixType &typ); extern FloatMatrix x_el_div (float a, const FloatMatrix& b); extern FloatComplexMatrix x_el_div (float a, const FloatComplexMatrix& b); extern FloatComplexMatrix x_el_div (const FloatComplex a, const FloatMatrix& b); extern FloatComplexMatrix x_el_div (const FloatComplex a, const FloatComplexMatrix& b); extern FloatNDArray x_el_div (float a, const FloatNDArray& b); extern FloatComplexNDArray x_el_div (float a, const FloatComplexNDArray& b); extern FloatComplexNDArray x_el_div (const FloatComplex a, const FloatNDArray& b); extern FloatComplexNDArray x_el_div (const FloatComplex a, const FloatComplexNDArray& b); extern FloatMatrix xleftdiv (const FloatMatrix& a, const FloatMatrix& b, MatrixType &typ, blas_trans_type transt = blas_no_trans); extern FloatComplexMatrix xleftdiv (const FloatMatrix& a, const FloatComplexMatrix& b, MatrixType &typ, blas_trans_type transt = blas_no_trans); extern FloatComplexMatrix xleftdiv (const FloatComplexMatrix& a, const FloatMatrix& b, MatrixType &typ, blas_trans_type transt = blas_no_trans); extern FloatComplexMatrix xleftdiv (const FloatComplexMatrix& a, const FloatComplexMatrix& b, MatrixType &typ, blas_trans_type transt = blas_no_trans); extern Matrix xdiv (const Matrix& a, const DiagMatrix& b); extern ComplexMatrix xdiv (const ComplexMatrix& a, const DiagMatrix& b); extern ComplexMatrix xdiv (const ComplexMatrix& a, const ComplexDiagMatrix& b); extern DiagMatrix xdiv (const DiagMatrix& a, const DiagMatrix& b); extern ComplexDiagMatrix xdiv (const ComplexDiagMatrix& a, const DiagMatrix& b); extern ComplexDiagMatrix xdiv (const ComplexDiagMatrix& a, const ComplexDiagMatrix& b); extern FloatMatrix xdiv (const FloatMatrix& a, const FloatDiagMatrix& b); extern FloatComplexMatrix xdiv (const FloatComplexMatrix& a, const FloatDiagMatrix& b); extern FloatComplexMatrix xdiv (const FloatMatrix& a, const FloatComplexDiagMatrix& b); extern FloatComplexMatrix xdiv (const FloatComplexMatrix& a, const FloatComplexDiagMatrix& b); extern FloatDiagMatrix xdiv (const FloatDiagMatrix& a, const FloatDiagMatrix& b); extern FloatComplexDiagMatrix xdiv (const FloatComplexDiagMatrix& a, const FloatDiagMatrix& b); extern FloatComplexDiagMatrix xdiv (const FloatComplexDiagMatrix& a, const FloatComplexDiagMatrix& b); extern Matrix xleftdiv (const DiagMatrix& a, const Matrix& b); extern ComplexMatrix xleftdiv (const DiagMatrix& a, const ComplexMatrix& b); extern ComplexMatrix xleftdiv (const ComplexDiagMatrix& a, const ComplexMatrix& b); extern DiagMatrix xleftdiv (const DiagMatrix& a, const DiagMatrix& b); extern ComplexDiagMatrix xleftdiv (const DiagMatrix& a, const ComplexDiagMatrix& b); extern ComplexDiagMatrix xleftdiv (const ComplexDiagMatrix& a, const ComplexDiagMatrix& b); extern FloatMatrix xleftdiv (const FloatDiagMatrix& a, const FloatMatrix& b); extern FloatComplexMatrix xleftdiv (const FloatDiagMatrix& a, const FloatComplexMatrix& b); extern FloatComplexMatrix xleftdiv (const FloatComplexDiagMatrix& a, const FloatComplexMatrix& b); extern FloatDiagMatrix xleftdiv (const FloatDiagMatrix& a, const FloatDiagMatrix& b); extern FloatComplexDiagMatrix xleftdiv (const FloatDiagMatrix& a, const FloatComplexDiagMatrix& b); extern FloatComplexDiagMatrix xleftdiv (const FloatComplexDiagMatrix& a, const FloatComplexDiagMatrix& b); #endif