octave-nkf: libinterp/octave-value/ov-base-diag.cc annotate

annotate libinterp/octave-value/ov-base-diag.cc @ 20574:dd6345fd8a97

use exceptions for better invalid index error reporting (bug #45957) * lo-array-gripes.h, lo-array-gripes.cc (index_exception): New base class for indexing errors. (invalid_index, out_of_range): New classes. (gripe_index_out_of_range): New overloaded function. (gripe_invalid_index): New overloaded functions. Delete version with no arguments. (gripe_invalid_assignment_size, gripe_assignment_dimension_mismatch): Delete. Change uses of gripe functions as needed. * Cell.cc (Cell::index, Cell::assign, Cell::delete_elements): Use exceptions to collect error info about and handle indexing errors. * data.cc (Fnth_element, do_accumarray_sum, F__accumarray_sum__, do_accumarray_minmax, do_accumarray_minmax_fun, F__accumdim_sum__): Likewise. * oct-map.cc (octave_map::index, octave_map::assign, octave_map::delete_elements): Likewise. * sparse.cc (Fsparse): Likewise. * sub2ind.cc (Fsub2ind, Find2sub): Likewise. New tests. * utils.cc (dims_to_numel): Likewise. * ov-base-diag.cc (octave_base_diag<DMT, MT>::do_index_op, octave_base_diag<DMT, MT>::subsasgn): Likewise. * ov-base-mat.cc (octave_base_matrix<MT>::subsref, octave_base_matrix<MT>::assign): Likewise. * ov-base-sparse.cc (octave_base_sparse<T>::do_index_op, octave_base_sparse<T>::assign, octave_base_sparse<MT>::delete_elements): Likewise. * ov-classdef.cc (cdef_object_array::subsref, cdef_object_array::subsasgn): Likewise. * ov-java.cc (make_java_index): Likewise. * ov-perm.cc (octave_perm_matrix::do_index_op): Likewise. * ov-range.cc (octave_range::do_index_op): Likewise. * ov-re-diag.cc (octave_diag_matrix::do_index_op): Likewise. * ov-str-mat.cc (octave_char_matrix_str::do_index_op_internal): Likewise. * pt-assign.cc (tree_simple_assignment::rvalue1): Likewise. * pt-idx.cc (tree_index_expression::rvalue, tree_index_expression::lvalue): Likewise. * Array-util.cc (sub2ind): Likewise. * toplev.cc (main_loop): Also catch unhandled index_exception exceptions. * ov-base.cc (octave_base_value::index_vector): Improve error message. * ov-re-sparse.cc (octave_sparse_matrix::index_vector): Likewise. * ov-complex.cc (complex_index): New class. (gripe_complex_index): New function. (octave_complex::index_vector): Use it. * pt-id.h, pt-id.cc (tree_identifier::is_variable, tree_black_hole::is_variable): Now const. * pt-idx.cc (final_index_error): New static function. (tree_index_expression::rvalue, tree_index_expression::lvalue): Use it. * index.tst: New tests.

author	Lachlan Andrew <lachlanbis@gmail.com>
date	Fri, 02 Oct 2015 15:07:37 -0400
parents	c6224b4e7774
children	f90c8372b7ba

rev	line source
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	1 /*
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	2
19731 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19659 diff changeset	3 Copyright (C) 2008-2015 Jaroslav Hajek
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	4
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	5 This file is part of Octave.
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	6
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	8 under the terms of the GNU General Public License as published by the
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	10 option) any later version.
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	11
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	15 for more details.
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	16
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	17 You should have received a copy of the GNU General Public License
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	19 <http://www.gnu.org/licenses/>.
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	20
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	21 */
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	22
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	23 #ifdef HAVE_CONFIG_H
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	24 #include <config.h>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	25 #endif
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	26
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	27 #include <iostream>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	28
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	29 #include "mach-info.h"
9003 0631d397fbe0 replace lo_ieee_isnan by xisnan, add missing includes Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	30 #include "lo-ieee.h"
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	31
20574 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	32 #include "ov-base-diag.h"
15149 62a35ae7d6a2 use forward decls for mxArray in ov.h and ov-base.h John W. Eaton <jwe@octave.org> parents: 15057 diff changeset	33 #include "mxarray.h"
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	34 #include "ov-base.h"
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	35 #include "ov-base-mat.h"
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	36 #include "pr-output.h"
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	37 #include "error.h"
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	38 #include "gripes.h"
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	39 #include "oct-stream.h"
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	40 #include "ops.h"
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	41
20482 c6224b4e7774 maint: Rename instances of LS_ASCII to LS_TEXT for clarity. Rik <rik@octave.org> parents: 19731 diff changeset	42 #include "ls-oct-text.h"
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	43
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	44 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	45 octave_value
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	46 octave_base_diag<DMT, MT>::subsref (const std::string& type,
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	47 const std::list<octave_value_list>& idx)
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	48 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	49 octave_value retval;
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	50
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	51 switch (type[0])
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	52 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	53 case '(':
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	54 retval = do_index_op (idx.front ());
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	55 break;
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	56
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	57 case '{':
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	58 case '.':
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	59 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	60 std::string nm = type_name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	61 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	62 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	63 break;
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	64
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	65 default:
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	66 panic_impossible ();
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	67 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	68
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	69 return retval.next_subsref (type, idx);
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	70 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	71
15428 fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	72
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	73 template <class DMT, class MT>
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	74 octave_value
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	75 octave_base_diag<DMT,MT>::diag (octave_idx_type k) const
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	76 {
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	77 octave_value retval;
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	78 if (matrix.rows () == 1 \|\| matrix.cols () == 1)
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	79 {
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	80 // Rather odd special case. This is a row or column vector
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	81 // represented as a diagonal matrix with a single nonzero entry, but
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	82 // Fdiag semantics are to product a diagonal matrix for vector
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	83 // inputs.
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	84 if (k == 0)
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	85 // Returns Diag2Array<T> with nnz <= 1.
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	86 retval = matrix.build_diag_matrix ();
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	87 else
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	88 // Returns Array<T> matrix
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	89 retval = matrix.array_value ().diag (k);
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	90 }
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	91 else
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	92 // Returns Array<T> vector
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	93 retval = matrix.extract_diag (k);
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	94 return retval;
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	95 }
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	96
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14590 diff changeset	97
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	98 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	99 octave_value
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	100 octave_base_diag<DMT, MT>::do_index_op (const octave_value_list& idx,
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	101 bool resize_ok)
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	102 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	103 octave_value retval;
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8366 diff changeset	104
8960 93f18f166aba remove float perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	105 if (idx.length () == 2 && ! resize_ok)
93f18f166aba remove float perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	106 {
20574 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	107 int k = 0; // index we're accesing when index_vector throws
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	108 try
8459 d17874a6f161 improve indexing of diagonal & permutation matrices Jaroslav Hajek <highegg@gmail.com> parents: 8437 diff changeset	109 {
20574 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	110 idx_vector idx0 = idx(0).index_vector ();
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	111 k = 1;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	112 idx_vector idx1 = idx(1).index_vector ();
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	113
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	114 if (idx0.is_scalar () && idx1.is_scalar ())
8459 d17874a6f161 improve indexing of diagonal & permutation matrices Jaroslav Hajek <highegg@gmail.com> parents: 8437 diff changeset	115 {
20574 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	116 retval = matrix.checkelem (idx0(0), idx1(0));
8459 d17874a6f161 improve indexing of diagonal & permutation matrices Jaroslav Hajek <highegg@gmail.com> parents: 8437 diff changeset	117 }
d17874a6f161 improve indexing of diagonal & permutation matrices Jaroslav Hajek <highegg@gmail.com> parents: 8437 diff changeset	118 else
20574 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	119 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	120 octave_idx_type m = idx0.length (matrix.rows ());
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	121 octave_idx_type n = idx1.length (matrix.columns ());
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	122 if (idx0.is_colon_equiv (m) && idx1.is_colon_equiv (n)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	123 && m <= matrix.rows () && n <= matrix.rows ())
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	124 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	125 DMT rm (matrix);
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	126 rm.resize (m, n);
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	127 retval = rm;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	128 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	129 else
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	130 retval = to_dense ().do_index_op (idx, resize_ok);
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	131 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	132 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	133 catch (index_exception& e)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	134 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	135 // Rethrow to allow more info to be reported later.
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	136 e.set_pos_if_unset (2, k+1);
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	137 throw;
8459 d17874a6f161 improve indexing of diagonal & permutation matrices Jaroslav Hajek <highegg@gmail.com> parents: 8437 diff changeset	138 }
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8366 diff changeset	139 }
8960 93f18f166aba remove float perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	140 else
93f18f166aba remove float perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	141 retval = to_dense ().do_index_op (idx, resize_ok);
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8366 diff changeset	142
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	143 return retval;
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	144 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	145
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	146 template <class DMT, class MT>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	147 octave_value
8398 d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	148 octave_base_diag<DMT, MT>::subsasgn (const std::string& type,
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	149 const std::list<octave_value_list>& idx,
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	150 const octave_value& rhs)
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	151 {
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	152 octave_value retval;
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	153
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	154 switch (type[0])
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	155 {
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	156 case '(':
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	157 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	158 if (type.length () == 1)
8398 d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	159 {
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	160 octave_value_list jdx = idx.front ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	161 // Check for a simple element assignment. That means, if D is a
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	162 // diagonal matrix, 'D(i,i) = x' will not destroy its diagonality
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	163 // (provided i is a valid index).
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	164 if (jdx.length () == 2
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	165 && jdx(0).is_scalar_type () && jdx(1).is_scalar_type ())
8398 d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	166 {
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	167 typename DMT::element_type val;
20574 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	168 int k = 0;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	169 try
8398 d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	170 {
20574 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	171 idx_vector i0 = jdx(0).index_vector ();
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	172 k = 1;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	173 idx_vector i1 = jdx(1).index_vector ();
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	174 if (! error_state && i0(0) == i1(0)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	175 && i0(0) < matrix.rows () && i1(0) < matrix.cols ()
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	176 && chk_valid_scalar (rhs, val))
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	177 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	178 matrix.dgelem (i0(0)) = val;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	179 retval = this;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	180 this->count++;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	181 // invalidate cache
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	182 dense_cache = octave_value ();
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	183 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	184 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	185 catch (index_exception& e)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	186 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	187 // Rethrow to allow more info to be reported later.
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	188 e.set_pos_if_unset (2, k+1);
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20482 diff changeset	189 throw;
8398 d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	190 }
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	191 }
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	192
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	193 if (! error_state && ! retval.is_defined ())
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	194 retval = numeric_assign (type, idx, rhs);
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	195 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	196 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	197 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	198 std::string nm = type_name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	199 error ("in indexed assignment of %s, last lhs index must be ()",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	200 nm.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	201 }
8398 d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	202 }
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	203 break;
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	204
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	205 case '{':
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	206 case '.':
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	207 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	208 if (is_empty ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	209 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	210 octave_value tmp = octave_value::empty_conv (type, rhs);
8398 d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	211
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	212 retval = tmp.subsasgn (type, idx, rhs);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	213 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	214 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	215 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	216 std::string nm = type_name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	217 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	218 }
8398 d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	219 }
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	220 break;
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	221
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	222 default:
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	223 panic_impossible ();
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	224 }
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	225
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	226 return retval;
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	227 }
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	228
d95282fa0579 allow element assignment to diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	229 template <class DMT, class MT>
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	230 octave_value
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	231 octave_base_diag<DMT, MT>::resize (const dim_vector& dv, bool fill) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	232 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	233 octave_value retval;
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	234 if (dv.length () == 2)
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	235 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	236 DMT rm (matrix);
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	237 rm.resize (dv(0), dv(1));
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	238 retval = rm;
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	239 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	240 else
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	241 retval = to_dense ().resize (dv, fill);
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	242 return retval;
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	243 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	244
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	245 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	246 bool
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	247 octave_base_diag<DMT, MT>::is_true (void) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	248 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	249 return to_dense ().is_true ();
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	250 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	251
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	252 // FIXME: This should be achieveable using ::real
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	253 template <class T> inline T helper_getreal (T x) { return x; }
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	254 template <class T> inline T helper_getreal (std::complex<T> x)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	255 { return x.real (); }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	256 // FIXME: We really need some traits so that ad hoc hooks like this
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	257 // are not necessary.
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	258 template <class T> inline T helper_iscomplex (T) { return false; }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	259 template <class T> inline T helper_iscomplex (std::complex<T>) { return true; }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	260
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	261 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	262 double
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	263 octave_base_diag<DMT, MT>::double_value (bool force_conversion) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	264 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	265 double retval = lo_ieee_nan_value ();
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	266 typedef typename DMT::element_type el_type;
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	267
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	268 if (helper_iscomplex (el_type ()) && ! force_conversion)
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	269 gripe_implicit_conversion ("Octave:imag-to-real",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	270 "complex matrix", "real scalar");
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	271
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	272 if (numel () > 0)
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	273 {
14469 29aabe9b37a2 Rename array-as-vector, array-as-scalar warning IDs to match documentation (bug #35838) Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	274 gripe_implicit_conversion ("Octave:array-to-scalar",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	275 type_name (), "real scalar");
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	276
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	277 retval = helper_getreal (el_type (matrix (0, 0)));
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	278 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	279 else
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	280 gripe_invalid_conversion (type_name (), "real scalar");
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	281
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	282 return retval;
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	283 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	284
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	285 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	286 float
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	287 octave_base_diag<DMT, MT>::float_value (bool force_conversion) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	288 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	289 float retval = lo_ieee_float_nan_value ();
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	290 typedef typename DMT::element_type el_type;
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	291
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	292 if (helper_iscomplex (el_type ()) && ! force_conversion)
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	293 gripe_implicit_conversion ("Octave:imag-to-real",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	294 "complex matrix", "real scalar");
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	295
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	296 if (numel () > 0)
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	297 {
14469 29aabe9b37a2 Rename array-as-vector, array-as-scalar warning IDs to match documentation (bug #35838) Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	298 gripe_implicit_conversion ("Octave:array-to-scalar",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	299 type_name (), "real scalar");
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	300
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	301 retval = helper_getreal (el_type (matrix (0, 0)));
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	302 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	303 else
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	304 gripe_invalid_conversion (type_name (), "real scalar");
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	305
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	306 return retval;
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	307 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	308
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	309 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	310 Complex
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	311 octave_base_diag<DMT, MT>::complex_value (bool) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	312 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	313 double tmp = lo_ieee_nan_value ();
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	314
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	315 Complex retval (tmp, tmp);
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	316
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	317 if (rows () > 0 && columns () > 0)
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	318 {
14469 29aabe9b37a2 Rename array-as-vector, array-as-scalar warning IDs to match documentation (bug #35838) Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	319 gripe_implicit_conversion ("Octave:array-to-scalar",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	320 type_name (), "complex scalar");
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	321
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	322 retval = matrix (0, 0);
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	323 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	324 else
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	325 gripe_invalid_conversion (type_name (), "complex scalar");
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	326
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	327 return retval;
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	328 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	329
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	330 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	331 FloatComplex
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	332 octave_base_diag<DMT, MT>::float_complex_value (bool) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	333 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	334 float tmp = lo_ieee_float_nan_value ();
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	335
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	336 FloatComplex retval (tmp, tmp);
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	337
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	338 if (rows () > 0 && columns () > 0)
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	339 {
14469 29aabe9b37a2 Rename array-as-vector, array-as-scalar warning IDs to match documentation (bug #35838) Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	340 gripe_implicit_conversion ("Octave:array-to-scalar",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	341 type_name (), "complex scalar");
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	342
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	343 retval = matrix (0, 0);
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	344 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	345 else
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	346 gripe_invalid_conversion (type_name (), "complex scalar");
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	347
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	348 return retval;
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	349 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	350
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	351 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	352 Matrix
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	353 octave_base_diag<DMT, MT>::matrix_value (bool) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	354 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	355 return Matrix (diag_matrix_value ());
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	356 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	357
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	358 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	359 FloatMatrix
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	360 octave_base_diag<DMT, MT>::float_matrix_value (bool) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	361 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	362 return FloatMatrix (float_diag_matrix_value ());
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	363 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	364
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	365 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	366 ComplexMatrix
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	367 octave_base_diag<DMT, MT>::complex_matrix_value (bool) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	368 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	369 return ComplexMatrix (complex_diag_matrix_value ());
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	370 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	371
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	372 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	373 FloatComplexMatrix
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	374 octave_base_diag<DMT, MT>::float_complex_matrix_value (bool) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	375 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	376 return FloatComplexMatrix (float_complex_diag_matrix_value ());
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	377 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	378
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	379 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	380 NDArray
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	381 octave_base_diag<DMT, MT>::array_value (bool) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	382 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	383 return NDArray (matrix_value ());
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	384 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	385
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	386 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	387 FloatNDArray
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	388 octave_base_diag<DMT, MT>::float_array_value (bool) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	389 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	390 return FloatNDArray (float_matrix_value ());
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	391 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	392
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	393 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	394 ComplexNDArray
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	395 octave_base_diag<DMT, MT>::complex_array_value (bool) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	396 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	397 return ComplexNDArray (complex_matrix_value ());
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	398 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	399
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	400 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	401 FloatComplexNDArray
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	402 octave_base_diag<DMT, MT>::float_complex_array_value (bool) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	403 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	404 return FloatComplexNDArray (float_complex_matrix_value ());
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	405 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	406
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	407 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	408 boolNDArray
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	409 octave_base_diag<DMT, MT>::bool_array_value (bool warn) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	410 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	411 return to_dense ().bool_array_value (warn);
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	412 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	413
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	414 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	415 charNDArray
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	416 octave_base_diag<DMT, MT>::char_array_value (bool warn) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	417 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	418 return to_dense ().char_array_value (warn);
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	419 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	420
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	421 template <class DMT, class MT>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	422 SparseMatrix
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	423 octave_base_diag<DMT, MT>::sparse_matrix_value (bool) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	424 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	425 return SparseMatrix (diag_matrix_value ());
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	426 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	427
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	428 template <class DMT, class MT>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	429 SparseComplexMatrix
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	430 octave_base_diag<DMT, MT>::sparse_complex_matrix_value (bool) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	431 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	432 return SparseComplexMatrix (complex_diag_matrix_value ());
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	433 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	434
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	435 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	436 idx_vector
18129 e473c4853afc enable non-integer ranges as indices by default and deprecate preference John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	437 octave_base_diag<DMT, MT>::index_vector (bool require_integers) const
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	438 {
18129 e473c4853afc enable non-integer ranges as indices by default and deprecate preference John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	439 return to_dense ().index_vector (require_integers);
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	440 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	441
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	442 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	443 octave_value
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	444 octave_base_diag<DMT, MT>::convert_to_str_internal (bool pad, bool force,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	445 char type) const
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	446 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	447 return to_dense ().convert_to_str_internal (pad, force, type);
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	448 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	449
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	450 template <class DMT, class MT>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	451 bool
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	452 octave_base_diag<DMT, MT>::save_ascii (std::ostream& os)
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	453 {
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	454 os << "# rows: " << matrix.rows () << "\n"
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	455 << "# columns: " << matrix.columns () << "\n";
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	456
15448 0a0912a9ab6e Replace deprecated DiagArray2<T>::diag calls with DiagArray2<T>::extract_diag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15429 diff changeset	457 os << matrix.extract_diag ();
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	458
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	459 return true;
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	460 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	461
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	462 template <class DMT, class MT>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	463 bool
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	464 octave_base_diag<DMT, MT>::load_ascii (std::istream& is)
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	465 {
18099 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	466 octave_idx_type r = 0;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	467 octave_idx_type c = 0;
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	468 bool success = true;
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	469
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	470 if (extract_keyword (is, "rows", r, true)
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	471 && extract_keyword (is, "columns", c, true))
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	472 {
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	473 octave_idx_type l = r < c ? r : c;
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	474 MT tmp (l, 1);
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	475 is >> tmp;
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	476
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	477 if (!is)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	478 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	479 error ("load: failed to load diagonal matrix constant");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	480 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	481 }
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	482 else
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	483 {
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	484 // This is a little tricky, as we have the Matrix type, but
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	485 // not ColumnVector type. We need to help the compiler get
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	486 // through the inheritance tree.
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	487 typedef typename DMT::element_type el_type;
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	488 matrix = DMT (MDiagArray2<el_type> (MArray<el_type> (tmp)));
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	489 matrix.resize (r, c);
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	490
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	491 // Invalidate cache. Probably not necessary, but safe.
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	492 dense_cache = octave_value ();
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	493 }
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	494 }
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	495 else
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	496 {
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	497 error ("load: failed to extract number of rows and columns");
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	498 success = false;
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	499 }
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	500
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	501 return success;
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	502 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	503
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	504 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	505 void
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	506 octave_base_diag<DMT, MT>::print_raw (std::ostream& os,
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	507 bool pr_as_read_syntax) const
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	508 {
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8459 diff changeset	509 return octave_print_internal (os, matrix, pr_as_read_syntax,
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8459 diff changeset	510 current_print_indent_level ());
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	511 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	512
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	513 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	514 mxArray *
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	515 octave_base_diag<DMT, MT>::as_mxArray (void) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	516 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	517 return to_dense ().as_mxArray ();
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	518 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	519
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	520 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	521 bool
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	522 octave_base_diag<DMT, MT>::print_as_scalar (void) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	523 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	524 dim_vector dv = dims ();
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	525
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	526 return (dv.all_ones () \|\| dv.any_zero ());
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	527 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	528
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	529 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	530 void
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18131 diff changeset	531 octave_base_diag<DMT, MT>::print (std::ostream& os, bool pr_as_read_syntax)
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	532 {
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	533 print_raw (os, pr_as_read_syntax);
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	534 newline (os);
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	535 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	536 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	537 int
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	538 octave_base_diag<DMT, MT>::write (octave_stream& os, int block_size,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	539 oct_data_conv::data_type output_type,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	540 int skip,
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	541 oct_mach_info::float_format flt_fmt) const
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	542 {
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	543 return to_dense ().write (os, block_size, output_type, skip, flt_fmt);
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	544 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	545
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	546 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	547 void
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	548 octave_base_diag<DMT, MT>::print_info (std::ostream& os,
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	549 const std::string& prefix) const
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	550 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	551 matrix.print_info (os, prefix);
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	552 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	553
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	554 template <class DMT, class MT>
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	555 octave_value
18684 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	556 octave_base_diag<DMT, MT>::fast_elem_extract (octave_idx_type n) const
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	557 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	558 if (n < matrix.numel ())
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	559 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	560 octave_idx_type nr = matrix.rows ();
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	561
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	562 octave_idx_type r = n % nr;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	563 octave_idx_type c = n / nr;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	564
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	565 return octave_value (matrix.elem (r, c));
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	566 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	567 else
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	568 return octave_value ();
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	569 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	570
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	571 template <class DMT, class MT>
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	572 octave_value
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	573 octave_base_diag<DMT, MT>::to_dense (void) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	574 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	575 if (! dense_cache.is_defined ())
9358 d4b1314a7c31 mex.cc (mxArray_octave_value::get_data): avoid enumerating types that can be handled as foreign John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	576 dense_cache = MT (matrix);
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	577
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	578 return dense_cache;
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	579 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	580

Mercurial > octave-nkf

annotate libinterp/octave-value/ov-base-diag.cc @ 20574:dd6345fd8a97