octave: libinterp/octave-value/ov-perm.cc annotate

annotate libinterp/octave-value/ov-perm.cc @ 22407:34ce5be04942

maint: Style check C++ code in libinterp/. * build-env.h, build-env.in.cc, builtins.h, Cell.cc, Cell.h, __contourc__.cc, __dispatch__.cc, __dsearchn__.cc, __ilu__.cc, __lin_interpn__.cc, __luinc__.cc, __magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, balance.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, cdisplay.c, cdisplay.h, cellfun.cc, coct-hdf5-types.c, comment-list.cc, comment-list.h, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, data.h, debug.cc, debug.h, defaults.cc, defaults.in.h, defun-dld.h, defun-int.h, defun.h, det.cc, dirfns.cc, dirfns.h, display.cc, display.h, dlmread.cc, dynamic-ld.cc, dynamic-ld.h, eig.cc, error.cc, error.h, errwarn.h, event-queue.cc, event-queue.h, fft.cc, fft2.cc, fftn.cc, file-io.cc, file-io.h, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, givens.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics.cc, graphics.in.h, gripes.h, gsvd.cc, hash.cc, help.cc, help.h, hess.cc, hex2num.cc, hook-fcn.cc, hook-fcn.h, input.cc, input.h, interpreter.cc, interpreter.h, inv.cc, jit-ir.cc, jit-ir.h, jit-typeinfo.cc, jit-typeinfo.h, jit-util.cc, jit-util.h, kron.cc, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-ascii-helper.cc, ls-ascii-helper.h, ls-hdf5.cc, ls-hdf5.h, ls-mat-ascii.cc, ls-mat-ascii.h, ls-mat4.cc, ls-mat4.h, ls-mat5.h, ls-oct-binary.cc, ls-oct-binary.h, ls-oct-text.cc, ls-oct-text.h, ls-utils.cc, ls-utils.h, lsode.cc, lu.cc, matrix_type.cc, max.cc, mex.cc, mex.h, mexproto.h, mgorth.cc, mxarray.in.h, nproc.cc, oct-errno.h, oct-errno.in.cc, oct-fstrm.cc, oct-fstrm.h, oct-handle.h, oct-hdf5-types.cc, oct-hdf5-types.h, oct-hdf5.h, oct-hist.cc, oct-hist.h, oct-iostrm.cc, oct-iostrm.h, oct-lvalue.cc, oct-lvalue.h, oct-map.h, oct-obj.h, oct-opengl.h, oct-prcstrm.cc, oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.cc, oct-strstrm.h, oct.h, octave-default-image.h, octave-link.h, octave-preserve-stream-state.h, ordschur.cc, pager.cc, pager.h, pinv.cc, pr-output.cc, pr-output.h, procstream.cc, procstream.h, profiler.h, psi.cc, pt-jit.cc, pt-jit.h, quad.cc, quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, sighandlers.cc, sighandlers.h, sparse-xdiv.cc, sparse-xdiv.h, sparse-xpow.cc, sparse-xpow.h, sparse.cc, spparms.cc, sqrtm.cc, str2double.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symtab.cc, symtab.h, syscalls.cc, sysdep.cc, sysdep.h, text-renderer.cc, text-renderer.h, time.cc, toplev.cc, toplev.h, tril.cc, tsearch.cc, txt-eng.cc, txt-eng.h, typecast.cc, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, workspace-element.h, xdiv.cc, xdiv.h, xnorm.cc, xnorm.h, xpow.cc, xpow.h, zfstream.cc, zfstream.h, deprecated-config.h, __delaunayn__.cc, __eigs__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __osmesa_print__.cc, __voronoi__.cc, amd.cc, audiodevinfo.cc, audioread.cc, ccolamd.cc, chol.cc, colamd.cc, convhulln.cc, dmperm.cc, fftw.cc, gzip.cc, oct-qhull.h, qr.cc, symbfact.cc, symrcm.cc, liboctinterp-build-info.h, liboctinterp-build-info.in.cc, ov-base-diag.h, ov-base-int.cc, ov-base-int.h, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.h, ov-base-sparse.cc, ov-base-sparse.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h, ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.cc, ov-ch-mat.h, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-colon.cc, ov-colon.h, ov-complex.cc, ov-complex.h, ov-cs-list.h, ov-cx-diag.cc, ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc, ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn-inline.cc, ov-fcn-inline.h, ov-fcn.cc, ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-int-traits.h, ov-int16.cc, ov-int16.h, ov-int32.cc, ov-int32.h, ov-int64.cc, ov-int64.h, ov-int8.cc, ov-int8.h, ov-intx.h, ov-java.cc, ov-java.h, ov-lazy-idx.cc, ov-lazy-idx.h, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-null-mat.h, ov-oncleanup.cc, ov-oncleanup.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h, ov-typeinfo.cc, ov-typeinfo.h, ov-uint16.cc, ov-uint16.h, ov-uint32.cc, ov-uint32.h, ov-uint64.cc, ov-uint64.h, ov-uint8.cc, ov-uint8.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.h, ovl.cc, ovl.h, octave.cc, octave.h, op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.cc, op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-pm.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-dm-template.cc, op-dms-template.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcm-pm.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fm-pm.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc, op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc, op-int.h, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-pm.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-pm-cm.cc, op-pm-fcm.cc, op-pm-fm.cc, op-pm-m.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc, op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.cc, ops.h, options-usage.h, lex.h, parse.h, pt-all.h, pt-arg-list.cc, pt-arg-list.h, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.cc, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-funcall.cc, pt-funcall.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.cc, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-stmt.cc, pt-stmt.h, pt-unop.cc, pt-unop.h, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Array-jit.cc, Array-tc.cc, version.cc, version.in.h: Style check C++ code in libinterp/

author	Rik <rik@octave.org>
date	Tue, 30 Aug 2016 21:46:47 -0700
parents	d0562b3159c7
children	6bf1cbb90705

rev	line source
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	1 /*
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	2
22323 bac0d6f07a3e maint: Update copyright notices for 2016. John W. Eaton <jwe@octave.org> parents: 22296 diff changeset	3 Copyright (C) 2008-2016 Jaroslav Hajek
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	4
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	5 This file is part of Octave.
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	6
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	8 under the terms of the GNU General Public License as published by the
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	10 option) any later version.
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	11
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	15 for more details.
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	16
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	17 You should have received a copy of the GNU General Public License
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	19 <http://www.gnu.org/licenses/>.
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	20
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	21 */
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21647 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	24 # include "config.h"
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	25 #endif
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	26
8381 ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	27 #include "byte-swap.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	28 #include "dim-vector.h"
8381 ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	29
15149 62a35ae7d6a2 use forward decls for mxArray in ov.h and ov-base.h John W. Eaton <jwe@octave.org> parents: 15057 diff changeset	30 #include "mxarray.h"
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	31 #include "ov-perm.h"
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	32 #include "ov-re-mat.h"
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	33 #include "ov-scalar.h"
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	34 #include "error.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 20979 diff changeset	35 #include "errwarn.h"
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	36 #include "ops.h"
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8459 diff changeset	37 #include "pr-output.h"
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	38
20447 c6224b4e7774 maint: Rename instances of LS_ASCII to LS_TEXT for clarity. Rik <rik@octave.org> parents: 20232 diff changeset	39 #include "ls-oct-text.h"
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	40
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	41 octave_value
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	42 octave_perm_matrix::subsref (const std::string& type,
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	43 const std::list<octave_value_list>& idx)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	44 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	45 octave_value retval;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	46
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	47 switch (type[0])
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	48 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	49 case '(':
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	50 retval = do_index_op (idx.front ());
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	51 break;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	52
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	53 case '{':
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	54 case '.':
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	55 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	56 std::string nm = type_name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	57 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	58 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	59 break;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	60
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	61 default:
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	62 panic_impossible ();
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	63 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	64
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	65 return retval.next_subsref (type, idx);
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	66 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	67
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	68 octave_value
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	69 octave_perm_matrix::do_index_op (const octave_value_list& idx,
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	70 bool resize_ok)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	71 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	72 octave_value retval;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	73 octave_idx_type nidx = idx.length ();
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	74 idx_vector idx0, idx1;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	75 if (nidx == 2)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	76 {
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20447 diff changeset	77 int k = 0; // index we're processing when index_vector throws
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20447 diff changeset	78 try
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20447 diff changeset	79 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20447 diff changeset	80 idx0 = idx(0).index_vector ();
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20447 diff changeset	81 k = 1;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20447 diff changeset	82 idx1 = idx(1).index_vector ();
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20447 diff changeset	83 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	84 catch (octave::index_exception& e)
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20447 diff changeset	85 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20447 diff changeset	86 // 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: 20447 diff changeset	87 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: 20447 diff changeset	88 throw;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20447 diff changeset	89 }
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	90 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	91
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	92 // This hack is to allow constructing permutation matrices using
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	93 // eye(n)(p,:), eye(n)(:,q) && eye(n)(p,q) where p & q are permutation
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	94 // vectors.
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	95 // Note that, for better consistency, eye(n)(:,:) still converts to a full
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	96 // matrix.
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	97 if (nidx == 2)
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	98 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	99 bool left = idx0.is_permutation (matrix.rows ());
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	100 bool right = idx1.is_permutation (matrix.cols ());
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	101
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	102 if (left && right)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	103 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	104 if (idx0.is_colon ()) left = false;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	105 if (idx1.is_colon ()) right = false;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	106 if (left \|\| right)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	107 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	108 PermMatrix p = matrix;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	109 if (left)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	110 p = PermMatrix (idx0, false) * p;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	111 if (right)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	112 p = p * PermMatrix (idx1, true);
8960 93f18f166aba remove float perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	113 retval = p;
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	114 }
8459 d17874a6f161 improve indexing of diagonal & permutation matrices Jaroslav Hajek <highegg@gmail.com> parents: 8437 diff changeset	115 else
d17874a6f161 improve indexing of diagonal & permutation matrices Jaroslav Hajek <highegg@gmail.com> parents: 8437 diff changeset	116 {
d17874a6f161 improve indexing of diagonal & permutation matrices Jaroslav Hajek <highegg@gmail.com> parents: 8437 diff changeset	117 retval = this;
d17874a6f161 improve indexing of diagonal & permutation matrices Jaroslav Hajek <highegg@gmail.com> parents: 8437 diff changeset	118 this->count++;
d17874a6f161 improve indexing of diagonal & permutation matrices Jaroslav Hajek <highegg@gmail.com> parents: 8437 diff changeset	119 }
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	120 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	121 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	122
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	123 if (! retval.is_defined ())
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	124 {
19864 17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	125 if (nidx == 2 && ! resize_ok && idx0.is_scalar () && idx1.is_scalar ())
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	126 retval = matrix.checkelem (idx0(0), idx1(0));
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	127 else
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	128 retval = to_dense ().do_index_op (idx, resize_ok);
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	129 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	130
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	131 return retval;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	132 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	133
21990 efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21885 diff changeset	134 // Return true if this matrix has all true elements (non-zero, not NaN/NA).
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21885 diff changeset	135 // A permutation cannot have NaN/NA.
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	136 bool
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	137 octave_perm_matrix::is_true (void) const
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	138 {
21990 efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21885 diff changeset	139 if (dims ().numel () > 1)
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21885 diff changeset	140 {
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21885 diff changeset	141 warn_array_as_logical (dims ());
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21885 diff changeset	142 return false; // > 1x1 permutation always has zeros, and no NaN.
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21885 diff changeset	143 }
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21885 diff changeset	144 else
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21885 diff changeset	145 return dims ().numel (); // 1x1 is [1] == true, 0x0 == false.
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	146 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	147
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	148 double
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	149 octave_perm_matrix::double_value (bool) const
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	150 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	151 double retval = lo_ieee_nan_value ();
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	152
21885 0806871e3e1e maint: Prefer is_empty() rather than "length () == 0". Rik <rik@octave.org> parents: 21751 diff changeset	153 if (is_empty ())
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	154 err_invalid_conversion (type_name (), "real scalar");
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	155
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	156 warn_implicit_conversion ("Octave:array-to-scalar",
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	157 type_name (), "real scalar");
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	158
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	159 retval = matrix(0, 0);
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	160
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	161 return retval;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	162 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	163
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	164 float
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	165 octave_perm_matrix::float_value (bool) const
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	166 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	167 float retval = lo_ieee_float_nan_value ();
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	168
21885 0806871e3e1e maint: Prefer is_empty() rather than "length () == 0". Rik <rik@octave.org> parents: 21751 diff changeset	169 if (is_empty ())
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	170 err_invalid_conversion (type_name (), "real scalar");
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	171
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	172 warn_implicit_conversion ("Octave:array-to-scalar",
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	173 type_name (), "real scalar");
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	174
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	175 retval = matrix(0, 0);
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	176
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	177 return retval;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	178 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	179
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	180 Complex
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	181 octave_perm_matrix::complex_value (bool) const
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	182 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	183 double tmp = lo_ieee_nan_value ();
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	184
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	185 Complex retval (tmp, tmp);
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	186
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	187 if (rows () == 0 \|\| columns () == 0)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	188 err_invalid_conversion (type_name (), "complex scalar");
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	189
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	190 warn_implicit_conversion ("Octave:array-to-scalar",
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	191 type_name (), "complex scalar");
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	192
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	193 retval = matrix(0, 0);
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	194
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	195 return retval;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	196 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	197
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	198 FloatComplex
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	199 octave_perm_matrix::float_complex_value (bool) const
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	200 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	201 float tmp = lo_ieee_float_nan_value ();
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	202
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	203 FloatComplex retval (tmp, tmp);
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	204
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	205 if (rows () == 0 \|\| columns () == 0)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	206 err_invalid_conversion (type_name (), "complex scalar");
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	207
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	208 warn_implicit_conversion ("Octave:array-to-scalar",
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	209 type_name (), "complex scalar");
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	210
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	211 retval = matrix(0, 0);
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	212
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	213 return retval;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	214 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	215
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	216 #define FORWARD_MATRIX_VALUE(TYPE, PREFIX) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	217 TYPE \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	218 octave_perm_matrix::PREFIX ## _value (bool frc_str_conv) const \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	219 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	220 return to_dense ().PREFIX ## _value (frc_str_conv); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	221 }
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	222
8910 6e9f26506804 optimize diag -> sparse and perm -> sparse conversions Jaroslav Hajek <highegg@gmail.com> parents: 8891 diff changeset	223 SparseMatrix
6e9f26506804 optimize diag -> sparse and perm -> sparse conversions Jaroslav Hajek <highegg@gmail.com> parents: 8891 diff changeset	224 octave_perm_matrix::sparse_matrix_value (bool) const
6e9f26506804 optimize diag -> sparse and perm -> sparse conversions Jaroslav Hajek <highegg@gmail.com> parents: 8891 diff changeset	225 {
6e9f26506804 optimize diag -> sparse and perm -> sparse conversions Jaroslav Hajek <highegg@gmail.com> parents: 8891 diff changeset	226 return SparseMatrix (matrix);
6e9f26506804 optimize diag -> sparse and perm -> sparse conversions Jaroslav Hajek <highegg@gmail.com> parents: 8891 diff changeset	227 }
6e9f26506804 optimize diag -> sparse and perm -> sparse conversions Jaroslav Hajek <highegg@gmail.com> parents: 8891 diff changeset	228
13030 b646413c3d0e Make operators do smarter sparse conversions on permutation matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	229 SparseBoolMatrix
b646413c3d0e Make operators do smarter sparse conversions on permutation matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	230 octave_perm_matrix::sparse_bool_matrix_value (bool) const
b646413c3d0e Make operators do smarter sparse conversions on permutation matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	231 {
b646413c3d0e Make operators do smarter sparse conversions on permutation matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	232 return SparseBoolMatrix (matrix);
b646413c3d0e Make operators do smarter sparse conversions on permutation matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	233 }
b646413c3d0e Make operators do smarter sparse conversions on permutation matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	234
8910 6e9f26506804 optimize diag -> sparse and perm -> sparse conversions Jaroslav Hajek <highegg@gmail.com> parents: 8891 diff changeset	235 SparseComplexMatrix
6e9f26506804 optimize diag -> sparse and perm -> sparse conversions Jaroslav Hajek <highegg@gmail.com> parents: 8891 diff changeset	236 octave_perm_matrix::sparse_complex_matrix_value (bool) const
6e9f26506804 optimize diag -> sparse and perm -> sparse conversions Jaroslav Hajek <highegg@gmail.com> parents: 8891 diff changeset	237 {
6e9f26506804 optimize diag -> sparse and perm -> sparse conversions Jaroslav Hajek <highegg@gmail.com> parents: 8891 diff changeset	238 return SparseComplexMatrix (sparse_matrix_value ());
6e9f26506804 optimize diag -> sparse and perm -> sparse conversions Jaroslav Hajek <highegg@gmail.com> parents: 8891 diff changeset	239 }
6e9f26506804 optimize diag -> sparse and perm -> sparse conversions Jaroslav Hajek <highegg@gmail.com> parents: 8891 diff changeset	240
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	241 FORWARD_MATRIX_VALUE (Matrix, matrix)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	242 FORWARD_MATRIX_VALUE (FloatMatrix, float_matrix)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	243 FORWARD_MATRIX_VALUE (ComplexMatrix, complex_matrix)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	244 FORWARD_MATRIX_VALUE (FloatComplexMatrix, float_complex_matrix)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	245
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	246 FORWARD_MATRIX_VALUE (NDArray, array)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	247 FORWARD_MATRIX_VALUE (FloatNDArray, float_array)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	248 FORWARD_MATRIX_VALUE (ComplexNDArray, complex_array)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	249 FORWARD_MATRIX_VALUE (FloatComplexNDArray, float_complex_array)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	250
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	251 FORWARD_MATRIX_VALUE (boolNDArray, bool_array)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	252 FORWARD_MATRIX_VALUE (charNDArray, char_array)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	253
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	254 idx_vector
18130 e473c4853afc enable non-integer ranges as indices by default and deprecate preference John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	255 octave_perm_matrix::index_vector (bool require_integers) const
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	256 {
18130 e473c4853afc enable non-integer ranges as indices by default and deprecate preference John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	257 return to_dense ().index_vector (require_integers);
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	258 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	259
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	260 octave_value
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	261 octave_perm_matrix::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	262 char type) const
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	263 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	264 return to_dense ().convert_to_str_internal (pad, force, type);
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	265 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	266
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	267 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	268 octave_perm_matrix::as_double (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	269 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	270 return matrix;
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	271 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	272
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	273 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	274 octave_perm_matrix::as_single (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	275 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	276 return float_array_value ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	277 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	278
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	279 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	280 octave_perm_matrix::as_int8 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	281 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	282 return int8_array_value ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	283 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	284
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	285 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	286 octave_perm_matrix::as_int16 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	287 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	288 return int16_array_value ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	289 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	290
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	291 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	292 octave_perm_matrix::as_int32 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	293 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	294 return int32_array_value ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	295 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	296
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	297 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	298 octave_perm_matrix::as_int64 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	299 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	300 return int64_array_value ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	301 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	302
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	303 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	304 octave_perm_matrix::as_uint8 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	305 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	306 return uint8_array_value ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	307 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	308
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	309 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	310 octave_perm_matrix::as_uint16 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	311 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	312 return uint16_array_value ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	313 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	314
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	315 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	316 octave_perm_matrix::as_uint32 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	317 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	318 return uint32_array_value ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	319 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	320
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	321 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	322 octave_perm_matrix::as_uint64 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	323 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	324 return uint64_array_value ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	325 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	326
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	327 bool
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	328 octave_perm_matrix::save_ascii (std::ostream& os)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	329 {
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	330 os << "# size: " << matrix.rows () << "\n";
18849 aa9ca67f09fb make all permutation matrices column permutations (bug #42418) David Spies <dnspies@gmail.com> parents: 18678 diff changeset	331 os << "# orient: c\n";
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	332
18849 aa9ca67f09fb make all permutation matrices column permutations (bug #42418) David Spies <dnspies@gmail.com> parents: 18678 diff changeset	333 Array<octave_idx_type> pvec = matrix.col_perm_vec ();
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20228 diff changeset	334 octave_idx_type n = pvec.numel ();
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	335 ColumnVector tmp (n);
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	336 for (octave_idx_type i = 0; i < n; i++) tmp(i) = pvec(i) + 1;
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	337 os << tmp;
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	338
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	339 return true;
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	340 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	341
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	342 bool
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	343 octave_perm_matrix::load_ascii (std::istream& is)
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	344 {
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	345 octave_idx_type n;
c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	346 char orient;
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	347
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20955 diff changeset	348 if (! extract_keyword (is, "size", n, true)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20955 diff changeset	349 \|\| ! extract_keyword (is, "orient", orient, true))
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20955 diff changeset	350 error ("load: failed to extract size & orientation");
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	351
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20955 diff changeset	352 bool colp = orient == 'c';
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20955 diff changeset	353 ColumnVector tmp (n);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20955 diff changeset	354 is >> tmp;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20955 diff changeset	355 if (! is)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20955 diff changeset	356 error ("load: failed to load permutation matrix constant");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20955 diff changeset	357
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20955 diff changeset	358 Array<octave_idx_type> pvec (dim_vector (n, 1));
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20955 diff changeset	359 for (octave_idx_type i = 0; i < n; i++) pvec(i) = tmp(i) - 1;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20955 diff changeset	360 matrix = PermMatrix (pvec, colp);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20955 diff changeset	361
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21739 diff changeset	362 // Invalidate cache. Probably not necessary, but safe.
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20955 diff changeset	363 dense_cache = octave_value ();
8376 c43481a19bfe implement ASCII saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	364
21124 95f8c8cdbffe maint: Eliminate 'bool success' variable where possible. Rik <rik@octave.org> parents: 21118 diff changeset	365 return true;
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	366 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	367
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	368 bool
8381 ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	369 octave_perm_matrix::save_binary (std::ostream& os, bool&)
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	370 {
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	371
9605 dfc68e6d8741 avoid some gcc warnings John W. Eaton <jwe@octave.org> parents: 8960 diff changeset	372 int32_t sz = matrix.rows ();
18849 aa9ca67f09fb make all permutation matrices column permutations (bug #42418) David Spies <dnspies@gmail.com> parents: 18678 diff changeset	373 bool colp = true;
9605 dfc68e6d8741 avoid some gcc warnings John W. Eaton <jwe@octave.org> parents: 8960 diff changeset	374 os.write (reinterpret_cast<char *> (&sz), 4);
8381 ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	375 os.write (reinterpret_cast<char *> (&colp), 1);
18849 aa9ca67f09fb make all permutation matrices column permutations (bug #42418) David Spies <dnspies@gmail.com> parents: 18678 diff changeset	376 const Array<octave_idx_type>& col_perm = matrix.col_perm_vec ();
aa9ca67f09fb make all permutation matrices column permutations (bug #42418) David Spies <dnspies@gmail.com> parents: 18678 diff changeset	377 os.write (reinterpret_cast<const char *> (col_perm.data ()),
aa9ca67f09fb make all permutation matrices column permutations (bug #42418) David Spies <dnspies@gmail.com> parents: 18678 diff changeset	378 col_perm.byte_size ());
8381 ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	379
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	380 return true;
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	381 }
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	382
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	383 bool
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	384 octave_perm_matrix::load_binary (std::istream& is, bool swap,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	385 octave::mach_info::float_format)
8381 ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	386 {
9605 dfc68e6d8741 avoid some gcc warnings John W. Eaton <jwe@octave.org> parents: 8960 diff changeset	387 int32_t sz;
8381 ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	388 bool colp;
9605 dfc68e6d8741 avoid some gcc warnings John W. Eaton <jwe@octave.org> parents: 8960 diff changeset	389 if (! (is.read (reinterpret_cast<char *> (&sz), 4)
8381 ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	390 && is.read (reinterpret_cast<char *> (&colp), 1)))
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	391 return false;
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	392
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	393 MArray<octave_idx_type> m (dim_vector (sz, 1));
8381 ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	394
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	395 if (! is.read (reinterpret_cast<char *> (m.fortran_vec ()), m.byte_size ()))
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	396 return false;
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	397
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	398 if (swap)
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	399 {
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	400 int nel = m.numel ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	401 for (int i = 0; i < nel; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	402 switch (sizeof (octave_idx_type))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	403 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	404 case 8:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	405 swap_bytes<8> (&m(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	406 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	407 case 4:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	408 swap_bytes<4> (&m(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	409 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	410 case 2:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	411 swap_bytes<2> (&m(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	412 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	413 case 1:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	414 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	415 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 9812 diff changeset	416 }
8381 ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	417 }
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	418
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	419 matrix = PermMatrix (m, colp);
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	420 return true;
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	421 }
ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	422
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	423 void
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	424 octave_perm_matrix::print_raw (std::ostream& os,
8381 ad896677a2e2 implement binary saving of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8376 diff changeset	425 bool pr_as_read_syntax) const
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	426 {
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8459 diff changeset	427 return octave_print_internal (os, matrix, pr_as_read_syntax,
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8459 diff changeset	428 current_print_indent_level ());
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	429 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	430
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	431 mxArray *
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	432 octave_perm_matrix::as_mxArray (void) const
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	433 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	434 return to_dense ().as_mxArray ();
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	435 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	436
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	437 bool
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	438 octave_perm_matrix::print_as_scalar (void) const
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	439 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	440 dim_vector dv = dims ();
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	441
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	442 return (dv.all_ones () \|\| dv.any_zero ());
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	443 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	444
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	445 void
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18130 diff changeset	446 octave_perm_matrix::print (std::ostream& os, bool pr_as_read_syntax)
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	447 {
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8459 diff changeset	448 print_raw (os, pr_as_read_syntax);
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8459 diff changeset	449 newline (os);
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	450 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	451
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	452 int
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	453 octave_perm_matrix::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	454 oct_data_conv::data_type output_type, int skip,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	455 octave::mach_info::float_format flt_fmt) const
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	456 {
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	457 return to_dense ().write (os, block_size, output_type, skip, flt_fmt);
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	458 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	459
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	460 void
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	461 octave_perm_matrix::print_info (std::ostream& os,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	462 const std::string& prefix) const
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	463 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	464 matrix.print_info (os, prefix);
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	465 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	466
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	467 octave_value
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	468 octave_perm_matrix::to_dense (void) const
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	469 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	470 if (! dense_cache.is_defined ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	471 dense_cache = Matrix (matrix);
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	472
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	473 return dense_cache;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	474 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	475
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	476 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_perm_matrix,
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	477 "permutation matrix", "double");
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	478
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	479 static octave_base_value *
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	480 default_numeric_conversion_function (const octave_base_value& a)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	481 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	482 const octave_perm_matrix& v = dynamic_cast<const octave_perm_matrix&> (a);
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	483
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	484 return new octave_matrix (v.matrix_value ());
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	485 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	486
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	487 octave_base_value::type_conv_info
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	488 octave_perm_matrix::numeric_conversion_function (void) const
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	489 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	490 return octave_base_value::type_conv_info (default_numeric_conversion_function,
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	491 octave_matrix::static_type_id ());
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	492 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	493
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	494 octave_base_value *
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	495 octave_perm_matrix::try_narrowing_conversion (void)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	496 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	497 octave_base_value *retval = 0;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	498
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 19864 diff changeset	499 if (matrix.numel () == 1)
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	500 retval = new octave_scalar (matrix (0, 0));
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	501
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	502 return retval;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	503 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	504
18650 491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	505 octave_value
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	506 octave_perm_matrix::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	507 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	508 if (n < matrix.numel ())
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	509 {
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	510 octave_idx_type nr = matrix.rows ();
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	511
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	512 octave_idx_type r = n % nr;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	513 octave_idx_type c = n / nr;
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	514
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	515 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	516 }
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	517 else
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	518 return octave_value ();
491b0adfec95 compatibility fixes for printf integer format specifiers John W. Eaton <jwe@octave.org> parents: 18522 diff changeset	519 }
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	520

Mercurial > octave

annotate libinterp/octave-value/ov-perm.cc @ 22407:34ce5be04942