octave: liboctave/array/Sparse.cc annotate

annotate liboctave/array/Sparse.cc @ 32660:f53ac65ffba6

maint: New method rwdata() as clearer alternative to fortran_vec(). * etc/NEWS.10.md: Announce new method and recommend its use in future code. * doc/interpreter/external.txi: Update Octave manual to use rwdata. * liboctave/array/Array.h (rwdata): New function prototype. * liboctave/array/Array.h (fortran_vec): Make inline function that calls rwdata(). * liboctave/array/DiagArray2.h (rwdata): New function prototype. * liboctave/array/DiagArray2.h (fortran_vec): Make inline function that calls rwdata(). * examples/code/fortrandemo.cc, libgui/graphics/QtHandlesUtils.cc, libinterp/corefcn/Cell.cc, libinterp/corefcn/__dsearchn__.cc, libinterp/corefcn/__ichol__.cc, libinterp/corefcn/__ilu__.cc, libinterp/corefcn/__lin_interpn__.cc, libinterp/corefcn/__magick_read__.cc, libinterp/corefcn/__pchip_deriv__.cc, libinterp/corefcn/amd.cc, libinterp/corefcn/data.cc, libinterp/corefcn/dot.cc, libinterp/corefcn/ellipj.cc, libinterp/corefcn/filter.cc, libinterp/corefcn/gcd.cc, libinterp/corefcn/gl-render.cc, libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h, libinterp/corefcn/kron.cc, libinterp/corefcn/ls-mat4.cc, libinterp/corefcn/ls-mat5.cc, libinterp/corefcn/mex.cc, libinterp/corefcn/oct-map.cc, libinterp/corefcn/oct-stream.cc, libinterp/corefcn/ordqz.cc, libinterp/corefcn/ordschur.cc, libinterp/corefcn/perms.cc, libinterp/corefcn/psi.cc, libinterp/corefcn/quadcc.cc, libinterp/corefcn/qz.cc, libinterp/corefcn/rand.cc, libinterp/corefcn/sqrtm.cc, libinterp/corefcn/strfind.cc, libinterp/corefcn/symrcm.cc, libinterp/corefcn/tril.cc, libinterp/corefcn/typecast.cc, libinterp/corefcn/xdiv.cc, libinterp/dldfcn/__delaunayn__.cc, libinterp/dldfcn/__glpk__.cc, libinterp/dldfcn/__ode15__.cc, libinterp/dldfcn/__voronoi__.cc, libinterp/dldfcn/audioread.cc, libinterp/dldfcn/convhulln.cc, libinterp/octave-value/ov-base-int.cc, libinterp/octave-value/ov-bool-mat.cc, libinterp/octave-value/ov-ch-mat.cc, libinterp/octave-value/ov-cx-diag.cc, libinterp/octave-value/ov-cx-mat.cc, libinterp/octave-value/ov-flt-cx-diag.cc, libinterp/octave-value/ov-flt-cx-mat.cc, libinterp/octave-value/ov-flt-re-diag.cc, libinterp/octave-value/ov-flt-re-mat.cc, libinterp/octave-value/ov-intx.h, libinterp/octave-value/ov-java.cc, libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-re-diag.cc, libinterp/octave-value/ov-re-mat.cc, libinterp/octave-value/ov-str-mat.cc, liboctave/array/Array-base.cc, liboctave/array/Array-util.cc, liboctave/array/CColVector.cc, liboctave/array/CDiagMatrix.cc, liboctave/array/CMatrix.cc, liboctave/array/CNDArray.cc, liboctave/array/CRowVector.cc, liboctave/array/CSparse.cc, liboctave/array/DiagArray2.h, liboctave/array/MArray.cc, liboctave/array/PermMatrix.cc, liboctave/array/Range.h, liboctave/array/Sparse.cc, liboctave/array/boolSparse.cc, liboctave/array/dColVector.cc, liboctave/array/dDiagMatrix.cc, liboctave/array/dMatrix.cc, liboctave/array/dNDArray.cc, liboctave/array/dRowVector.cc, liboctave/array/dSparse.cc, liboctave/array/fCColVector.cc, liboctave/array/fCDiagMatrix.cc, liboctave/array/fCMatrix.cc, liboctave/array/fCNDArray.cc, liboctave/array/fCRowVector.cc, liboctave/array/fColVector.cc, liboctave/array/fMatrix.cc, liboctave/array/fNDArray.cc, liboctave/array/fRowVector.cc, liboctave/array/idx-vector.cc, liboctave/numeric/CollocWt.cc, liboctave/numeric/DASPK.cc, liboctave/numeric/DASRT.cc, liboctave/numeric/DASSL.cc, liboctave/numeric/EIG.cc, liboctave/numeric/LSODE.cc, liboctave/numeric/Quad.cc, liboctave/numeric/aepbalance.cc, liboctave/numeric/bsxfun-defs.cc, liboctave/numeric/chol.cc, liboctave/numeric/eigs-base.cc, liboctave/numeric/fEIG.cc, liboctave/numeric/gepbalance.cc, liboctave/numeric/gsvd.cc, liboctave/numeric/hess.cc, liboctave/numeric/lu.cc, liboctave/numeric/oct-convn.cc, liboctave/numeric/oct-rand.cc, liboctave/numeric/qr.cc, liboctave/numeric/qrp.cc, liboctave/numeric/schur.cc, liboctave/numeric/sparse-dmsolve.cc, liboctave/numeric/sparse-lu.cc, liboctave/numeric/sparse-qr.cc, liboctave/numeric/svd.cc, liboctave/operators/mx-inlines.cc, liboctave/operators/mx-op-defs.h, liboctave/util/oct-base64.cc, liboctave/util/oct-binmap.h, liboctave/util/str-vec.cc: Replace calls to fortran_vec() with calls to rwdata().

author	Rik <rik@octave.org>
date	Wed, 27 Dec 2023 16:55:14 -0800
parents	4b601ca024d5
children	7f73e4805a1f

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
32632 2e484f9f1f18 maint: update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 32590 diff changeset	3 // Copyright (C) 1998-2024 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	25
21690 b6a686543080 Only include config.h in files that are compiled separately. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	26 // This file should not include config.h. It is only included in other
b6a686543080 Only include config.h in files that are compiled separately. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	27 // C++ source files that should have included config.h before including
b6a686543080 Only include config.h in files that are compiled separately. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	28 // this file.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	29
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	30 #include <cassert>
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	31 #include <cinttypes>
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	32
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	33 #include <algorithm>
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	34 #include <istream>
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	35 #include <ostream>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	36 #include <sstream>
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	37 #include <vector>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	38
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	39 #include "Array.h"
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	40 #include "MArray.h"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	41 #include "Array-util.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	42 #include "Range.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	43 #include "idx-vector.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	44 #include "lo-error.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	45 #include "quit.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	46 #include "oct-locbuf.h"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	47
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	48 #include "Sparse.h"
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 9177 diff changeset	49 #include "sparse-util.h"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	50 #include "oct-spparms.h"
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	51 #include "mx-inlines.cc"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	52
13030 b646413c3d0e Make operators do smarter sparse conversions on permutation matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12511 diff changeset	53 #include "PermMatrix.h"
b646413c3d0e Make operators do smarter sparse conversions on permutation matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12511 diff changeset	54
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	55 template <typename T, typename Alloc>
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	56 OCTAVE_API typename Sparse<T, Alloc>::SparseRep *
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31706 diff changeset	57 Sparse<T, Alloc>::nil_rep ()
21573 f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 21256 diff changeset	58 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	59 static typename Sparse<T, Alloc>::SparseRep nr;
21573 f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 21256 diff changeset	60 return &nr;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 21256 diff changeset	61 }
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 21256 diff changeset	62
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	63 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	64 OCTAVE_API
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	65 T&
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	66 Sparse<T, Alloc>::SparseRep::elem (octave_idx_type r, octave_idx_type c)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	67 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	68 octave_idx_type i;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	69
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	70 if (m_nzmax <= 0)
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	71 (*current_liboctave_error_handler)
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	72 ("Sparse::SparseRep::elem (octave_idx_type, octave_idx_type): sparse matrix filled");
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	73
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	74 for (i = m_cidx[c]; i < m_cidx[c + 1]; i++)
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	75 if (m_ridx[i] == r)
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	76 return m_data[i];
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	77 else if (m_ridx[i] > r)
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	78 break;
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	79
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	80 // Ok, If we've gotten here, we're in trouble. Have to create a
b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	81 // new element in the sparse array. This' gonna be slow!!!
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	82 if (m_cidx[m_ncols] == m_nzmax)
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	83 (*current_liboctave_error_handler)
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	84 ("Sparse::SparseRep::elem (octave_idx_type, octave_idx_type): sparse matrix filled");
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	85
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	86 octave_idx_type to_move = m_cidx[m_ncols] - i;
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	87 if (to_move != 0)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	88 {
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	89 for (octave_idx_type j = m_cidx[m_ncols]; j > i; j--)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	90 {
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	91 m_data[j] = m_data[j-1];
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	92 m_ridx[j] = m_ridx[j-1];
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	93 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	94 }
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	95
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	96 for (octave_idx_type j = c + 1; j < m_ncols + 1; j++)
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	97 m_cidx[j] = m_cidx[j] + 1;
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	98
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	99 m_data[i] = 0.;
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	100 m_ridx[i] = r;
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	101
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	102 return m_data[i];
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	103 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	104
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	105 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	106 OCTAVE_API
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	107 T
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	108 Sparse<T, Alloc>::SparseRep::celem (octave_idx_type r, octave_idx_type c) const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	109 {
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	110 if (m_nzmax > 0)
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	111 for (octave_idx_type i = m_cidx[c]; i < m_cidx[c + 1]; i++)
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	112 if (m_ridx[i] == r)
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	113 return m_data[i];
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	114 return T ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	115 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	116
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	117 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	118 OCTAVE_API
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	119 void
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	120 Sparse<T, Alloc>::SparseRep::maybe_compress (bool remove_zeros)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	121 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	122 if (remove_zeros)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	123 {
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	124 octave_idx_type i = 0;
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	125 octave_idx_type k = 0;
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	126 for (octave_idx_type j = 1; j <= m_ncols; j++)
10497 cb7ffe7288f0 improve & fix SparseRep reallocation and compression Jaroslav Hajek <highegg@gmail.com> parents: 10494 diff changeset	127 {
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	128 octave_idx_type u = m_cidx[j];
21337 cfe11042fbc0 eliminate useless assignment in for loop John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	129 for (; i < u; i++)
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	130 if (m_data[i] != T ())
10497 cb7ffe7288f0 improve & fix SparseRep reallocation and compression Jaroslav Hajek <highegg@gmail.com> parents: 10494 diff changeset	131 {
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	132 m_data[k] = m_data[i];
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	133 m_ridx[k++] = m_ridx[i];
10497 cb7ffe7288f0 improve & fix SparseRep reallocation and compression Jaroslav Hajek <highegg@gmail.com> parents: 10494 diff changeset	134 }
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	135 m_cidx[j] = k;
10497 cb7ffe7288f0 improve & fix SparseRep reallocation and compression Jaroslav Hajek <highegg@gmail.com> parents: 10494 diff changeset	136 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	137 }
10497 cb7ffe7288f0 improve & fix SparseRep reallocation and compression Jaroslav Hajek <highegg@gmail.com> parents: 10494 diff changeset	138
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	139 change_length (m_cidx[m_ncols]);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	140 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	141
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	142 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	143 OCTAVE_API
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	144 void
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	145 Sparse<T, Alloc>::SparseRep::change_length (octave_idx_type nz)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	146 {
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	147 for (octave_idx_type j = m_ncols; j > 0 && m_cidx[j] > nz; j--)
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	148 m_cidx[j] = nz;
10497 cb7ffe7288f0 improve & fix SparseRep reallocation and compression Jaroslav Hajek <highegg@gmail.com> parents: 10494 diff changeset	149
27081 c0d8ce61c1c9 Always reserve at least 1 element of storage for sparse matrices (bug #56232). Rik <rik@octave.org> parents: 26569 diff changeset	150 // Always preserve space for 1 element.
c0d8ce61c1c9 Always reserve at least 1 element of storage for sparse matrices (bug #56232). Rik <rik@octave.org> parents: 26569 diff changeset	151 nz = (nz > 0 ? nz : 1);
c0d8ce61c1c9 Always reserve at least 1 element of storage for sparse matrices (bug #56232). Rik <rik@octave.org> parents: 26569 diff changeset	152
32626 395ab2ffb0c2 maint: Use constexpr where possible for performance. Rik <rik@octave.org> parents: 32598 diff changeset	153 // Skip reallocation if we have less than 1/FRAC extra elements to discard.
395ab2ffb0c2 maint: Use constexpr where possible for performance. Rik <rik@octave.org> parents: 32598 diff changeset	154 static const int FRAC = 5;
395ab2ffb0c2 maint: Use constexpr where possible for performance. Rik <rik@octave.org> parents: 32598 diff changeset	155 if (nz > m_nzmax \|\| nz < m_nzmax - m_nzmax/FRAC)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	156 {
10497 cb7ffe7288f0 improve & fix SparseRep reallocation and compression Jaroslav Hajek <highegg@gmail.com> parents: 10494 diff changeset	157 // Reallocate.
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	158 octave_idx_type min_nzmax = std::min (nz, m_nzmax);
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	159
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	160 octave_idx_type *new_ridx = idx_type_allocate (nz);
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	161 std::copy_n (m_ridx, min_nzmax, new_ridx);
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	162
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	163 idx_type_deallocate (m_ridx, m_nzmax);
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	164 m_ridx = new_ridx;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	165
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	166 T *new_data = T_allocate (nz);
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	167 std::copy_n (m_data, min_nzmax, new_data);
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	168
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	169 T_deallocate (m_data, m_nzmax);
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	170 m_data = new_data;
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	171
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	172 m_nzmax = nz;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	173 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	174 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	175
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	176 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	177 OCTAVE_API
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 9177 diff changeset	178 bool
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31706 diff changeset	179 Sparse<T, Alloc>::SparseRep::indices_ok () const
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 9177 diff changeset	180 {
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	181 return sparse_indices_ok (m_ridx, m_cidx, m_nrows, m_ncols, nnz ());
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 9177 diff changeset	182 }
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 9177 diff changeset	183
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	184 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	185 OCTAVE_API
21990 efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21751 diff changeset	186 bool
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31706 diff changeset	187 Sparse<T, Alloc>::SparseRep::any_element_is_nan () const
21990 efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21751 diff changeset	188 {
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21751 diff changeset	189 octave_idx_type nz = nnz ();
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21751 diff changeset	190
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21751 diff changeset	191 for (octave_idx_type i = 0; i < nz; i++)
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	192 if (octave::math::isnan (m_data[i]))
21990 efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21751 diff changeset	193 return true;
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21751 diff changeset	194
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21751 diff changeset	195 return false;
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21751 diff changeset	196 }
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21751 diff changeset	197
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	198 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	199 OCTAVE_API
32590 3c2c585965cc maint: C++ style check for liboctave/ before 9.1 release. Rik <rik@octave.org> parents: 32513 diff changeset	200 Sparse<T, Alloc>::Sparse (octave_idx_type nr, octave_idx_type nc, T val)
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	201 : m_rep (nullptr), m_dimensions (dim_vector (nr, nc))
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	202 {
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	203 if (val != T ())
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	204 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	205 m_rep = new typename Sparse<T, Alloc>::SparseRep (nr, nc, m_dimensions.safe_numel ());
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	206
512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	207 octave_idx_type ii = 0;
512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	208 xcidx (0) = 0;
512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	209 for (octave_idx_type j = 0; j < nc; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	210 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	211 for (octave_idx_type i = 0; i < nr; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	212 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	213 xdata (ii) = val;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	214 xridx (ii++) = i;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	215 }
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	216 xcidx (j+1) = ii;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	217 }
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	218 }
512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	219 else
512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	220 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	221 m_rep = new typename Sparse<T, Alloc>::SparseRep (nr, nc, 0);
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	222 for (octave_idx_type j = 0; j < nc+1; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	223 xcidx (j) = 0;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	224 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	225 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	226
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	227 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	228 OCTAVE_API
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	229 Sparse<T, Alloc>::Sparse (const PermMatrix& a)
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	230 : m_rep (new typename Sparse<T, Alloc>::SparseRep (a.rows (), a.cols (), a.rows ())),
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	231 m_dimensions (dim_vector (a.rows (), a.cols ()))
24010 584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	232 {
584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	233 octave_idx_type n = a.rows ();
584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	234 for (octave_idx_type i = 0; i <= n; i++)
584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	235 cidx (i) = i;
584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	236
584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	237 const Array<octave_idx_type> pv = a.col_perm_vec ();
584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	238
584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	239 for (octave_idx_type i = 0; i < n; i++)
584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	240 ridx (i) = pv(i);
584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	241
584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	242 for (octave_idx_type i = 0; i < n; i++)
584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	243 data (i) = 1.0;
584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	244 }
584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	245
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	246 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	247 OCTAVE_API
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	248 Sparse<T, Alloc>::Sparse (const dim_vector& dv)
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	249 : m_rep (nullptr), m_dimensions (dv)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	250 {
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21574 diff changeset	251 if (dv.ndims () != 2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	252 (*current_liboctave_error_handler)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	253 ("Sparse::Sparse (const dim_vector&): dimension mismatch");
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	254
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	255 m_rep = new typename Sparse<T, Alloc>::SparseRep (dv(0), dv(1), 0);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	256 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	257
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	258 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	259 OCTAVE_API
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	260 Sparse<T, Alloc>::Sparse (const Sparse<T, Alloc>& a, const dim_vector& dv)
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	261 : m_rep (nullptr), m_dimensions (dv)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	262 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	263
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	264 // Work in unsigned long long to avoid overflow issues with numel
32513 1de97b475564 maint: Add space " " between C++ cast and argument. Markus Mützel <markus.muetzel@gmx.de> parents: 32046 diff changeset	265 unsigned long long a_nel = static_cast<unsigned long long> (a.rows ()) *
1de97b475564 maint: Add space " " between C++ cast and argument. Markus Mützel <markus.muetzel@gmx.de> parents: 32046 diff changeset	266 static_cast<unsigned long long> (a.cols ());
1de97b475564 maint: Add space " " between C++ cast and argument. Markus Mützel <markus.muetzel@gmx.de> parents: 32046 diff changeset	267 unsigned long long dv_nel = static_cast<unsigned long long> (dv(0)) *
1de97b475564 maint: Add space " " between C++ cast and argument. Markus Mützel <markus.muetzel@gmx.de> parents: 32046 diff changeset	268 static_cast<unsigned long long> (dv(1));
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	269
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	270 if (a_nel != dv_nel)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	271 (*current_liboctave_error_handler)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	272 ("Sparse::Sparse (const Sparse&, const dim_vector&): dimension mismatch");
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	273
32598 2f3b54f81947 avoid dim_vector copies in more places where possible (bug #64962) John W. Eaton <jwe@octave.org> parents: 32590 diff changeset	274 const dim_vector& old_dims = a.dims ();
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	275 octave_idx_type new_nzmax = a.nnz ();
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	276 octave_idx_type new_nr = dv(0);
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	277 octave_idx_type new_nc = dv(1);
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	278 octave_idx_type old_nr = old_dims(0);
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	279 octave_idx_type old_nc = old_dims(1);
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	280
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	281 m_rep = new typename Sparse<T, Alloc>::SparseRep (new_nr, new_nc, new_nzmax);
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	282
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	283 octave_idx_type kk = 0;
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	284 xcidx (0) = 0;
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	285 for (octave_idx_type i = 0; i < old_nc; i++)
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	286 for (octave_idx_type j = a.cidx (i); j < a.cidx (i+1); j++)
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	287 {
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	288 octave_idx_type tmp = i * old_nr + a.ridx (j);
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	289 octave_idx_type ii = tmp % new_nr;
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	290 octave_idx_type jj = (tmp - ii) / new_nr;
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	291 for (octave_idx_type k = kk; k < jj; k++)
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	292 xcidx (k+1) = j;
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	293 kk = jj;
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	294 xdata (j) = a.data (j);
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	295 xridx (j) = ii;
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	296 }
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	297 for (octave_idx_type k = kk; k < new_nc; k++)
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	298 xcidx (k+1) = new_nzmax;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	299 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	300
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	301 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	302 OCTAVE_API
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	303 Sparse<T, Alloc>::Sparse (const Array<T>& a,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	304 const octave::idx_vector& r,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	305 const octave::idx_vector& c,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	306 octave_idx_type nr, octave_idx_type nc,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	307 bool sum_terms, octave_idx_type nzm)
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	308 : m_rep (nullptr), m_dimensions ()
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	309 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	310 if (nr < 0)
11508 41866901ec62 Sparse.cc: more constructor fixes John W. Eaton <jwe@octave.org> parents: 11311 diff changeset	311 nr = r.extent (0);
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	312 else if (r.extent (nr) > nr)
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	313 (*current_liboctave_error_handler)
0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	314 ("sparse: row index %" OCTAVE_IDX_TYPE_FORMAT "out of bound "
0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	315 "%" OCTAVE_IDX_TYPE_FORMAT, r.extent (nr), nr);
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	316
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	317 if (nc < 0)
11508 41866901ec62 Sparse.cc: more constructor fixes John W. Eaton <jwe@octave.org> parents: 11311 diff changeset	318 nc = c.extent (0);
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	319 else if (c.extent (nc) > nc)
11508 41866901ec62 Sparse.cc: more constructor fixes John W. Eaton <jwe@octave.org> parents: 11311 diff changeset	320 (*current_liboctave_error_handler)
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	321 ("sparse: column index %" OCTAVE_IDX_TYPE_FORMAT " out of bound "
0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	322 "%" OCTAVE_IDX_TYPE_FORMAT, r.extent (nc), nc);
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	323
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	324 m_dimensions = dim_vector (nr, nc);
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	325
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	326 octave_idx_type n = a.numel ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	327 octave_idx_type rl = r.length (nr);
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	328 octave_idx_type cl = c.length (nc);
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	329 bool a_scalar = n == 1;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	330 if (a_scalar)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	331 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	332 if (rl != 1)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	333 n = rl;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	334 else if (cl != 1)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	335 n = cl;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	336 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	337
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	338 if ((rl != 1 && rl != n) \|\| (cl != 1 && cl != n))
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	339 (*current_liboctave_error_handler) ("sparse: dimension mismatch");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	340
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	341 // Only create m_rep after input validation to avoid memory leak.
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	342 m_rep = new typename Sparse<T, Alloc>::SparseRep (nr, nc, (nzm > 0 ? nzm : 0));
17664 f4b0430fa5fd Avoid memory leak in Sparse constructor. Rik <rik@octave.org> parents: 17642 diff changeset	343
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	344 if (rl <= 1 && cl <= 1)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	345 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	346 if (n == 1 && a(0) != T ())
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	347 {
10527 b4d2080b6df7 Replace nzmax by nnz as needed David Bateman <dbateman@free.fr> parents: 10521 diff changeset	348 change_capacity (nzm > 1 ? nzm : 1);
18083 938f01339043 maint: Use Octave coding convention for indexing vs. function calls in liboctave/array. Rik <rik@octave.org> parents: 17823 diff changeset	349 xridx (0) = r(0);
938f01339043 maint: Use Octave coding convention for indexing vs. function calls in liboctave/array. Rik <rik@octave.org> parents: 17823 diff changeset	350 xdata (0) = a(0);
24010 584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	351 std::fill_n (xcidx () + c(0) + 1, nc - c(0), 1);
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	352 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	353 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	354 else if (a_scalar)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	355 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	356 // This is completely specialized, because the sorts can be simplified.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	357 T a0 = a(0);
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14844 diff changeset	358 if (a0 == T ())
10509 ddbd812d09aa properly compress sparse matrices after assembly Jaroslav Hajek <highegg@gmail.com> parents: 10506 diff changeset	359 {
ddbd812d09aa properly compress sparse matrices after assembly Jaroslav Hajek <highegg@gmail.com> parents: 10506 diff changeset	360 // Do nothing, it's an empty matrix.
ddbd812d09aa properly compress sparse matrices after assembly Jaroslav Hajek <highegg@gmail.com> parents: 10506 diff changeset	361 }
ddbd812d09aa properly compress sparse matrices after assembly Jaroslav Hajek <highegg@gmail.com> parents: 10506 diff changeset	362 else if (cl == 1)
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	363 {
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	364 // Sparse column vector. Sort row indices.
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	365 octave::idx_vector rs = r.sorted ();
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	366
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	367 octave_quit ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	368
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	369 const octave_idx_type *rd = rs.raw ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	370 // Count unique indices.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	371 octave_idx_type new_nz = 1;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	372 for (octave_idx_type i = 1; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	373 new_nz += rd[i-1] != rd[i];
24010 584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	374
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	375 // Allocate result.
10527 b4d2080b6df7 Replace nzmax by nnz as needed David Bateman <dbateman@free.fr> parents: 10521 diff changeset	376 change_capacity (nzm > new_nz ? nzm : new_nz);
24010 584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	377 std::fill_n (xcidx () + c(0) + 1, nc - c(0), new_nz);
584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	378
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	379 octave_idx_type *rri = ridx ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	380 T *rrd = data ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	381
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	382 octave_quit ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	383
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	384 octave_idx_type k = -1;
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	385 octave_idx_type l = -1;
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	386
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	387 if (sum_terms)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	388 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	389 // Sum repeated indices.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	390 for (octave_idx_type i = 0; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	391 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	392 if (rd[i] != l)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	393 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	394 l = rd[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	395 rri[++k] = rd[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	396 rrd[k] = a0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	397 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	398 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	399 rrd[k] += a0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	400 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	401 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	402 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	403 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	404 // Pick the last one.
11571 0e414f837c58 Fix indexing error in the construction of sparse matrices David Bateman <dbateman@free.fr> parents: 11570 diff changeset	405 for (octave_idx_type i = 0; i < n; i++)
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	406 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	407 if (rd[i] != l)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	408 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	409 l = rd[i];
11571 0e414f837c58 Fix indexing error in the construction of sparse matrices David Bateman <dbateman@free.fr> parents: 11570 diff changeset	410 rri[++k] = rd[i];
0e414f837c58 Fix indexing error in the construction of sparse matrices David Bateman <dbateman@free.fr> parents: 11570 diff changeset	411 rrd[k] = a0;
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	412 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	413 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	414 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	415
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	416 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	417 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	418 {
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	419 octave::idx_vector rr = r;
29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	420 octave::idx_vector cc = c;
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	421 const octave_idx_type *rd = rr.raw ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	422 const octave_idx_type *cd = cc.raw ();
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	423 OCTAVE_LOCAL_BUFFER_INIT (octave_idx_type, ci, nc+1, 0);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	424 ci[0] = 0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	425 // Bin counts of column indices.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	426 for (octave_idx_type i = 0; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	427 ci[cd[i]+1]++;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	428 // Make them cumulative, shifted one to right.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	429 for (octave_idx_type i = 1, s = 0; i <= nc; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	430 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	431 octave_idx_type s1 = s + ci[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	432 ci[i] = s;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	433 s = s1;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	434 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	435
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	436 octave_quit ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	437
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	438 // Bucket sort.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	439 OCTAVE_LOCAL_BUFFER (octave_idx_type, sidx, n);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	440 for (octave_idx_type i = 0; i < n; i++)
11571 0e414f837c58 Fix indexing error in the construction of sparse matrices David Bateman <dbateman@free.fr> parents: 11570 diff changeset	441 if (rl == 1)
0e414f837c58 Fix indexing error in the construction of sparse matrices David Bateman <dbateman@free.fr> parents: 11570 diff changeset	442 sidx[ci[cd[i]+1]++] = rd[0];
0e414f837c58 Fix indexing error in the construction of sparse matrices David Bateman <dbateman@free.fr> parents: 11570 diff changeset	443 else
0e414f837c58 Fix indexing error in the construction of sparse matrices David Bateman <dbateman@free.fr> parents: 11570 diff changeset	444 sidx[ci[cd[i]+1]++] = rd[i];
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	445
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	446 // Subsorts. We don't need a stable sort, all values are equal.
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	447 xcidx (0) = 0;
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	448 for (octave_idx_type j = 0; j < nc; j++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	449 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	450 std::sort (sidx + ci[j], sidx + ci[j+1]);
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	451 octave_idx_type l = -1;
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	452 octave_idx_type nzj = 0;
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	453 // Count.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	454 for (octave_idx_type i = ci[j]; i < ci[j+1]; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	455 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	456 octave_idx_type k = sidx[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	457 if (k != l)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	458 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	459 l = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	460 nzj++;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	461 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	462 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	463 // Set column pointer.
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	464 xcidx (j+1) = xcidx (j) + nzj;
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	465 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	466
10527 b4d2080b6df7 Replace nzmax by nnz as needed David Bateman <dbateman@free.fr> parents: 10521 diff changeset	467 change_capacity (nzm > xcidx (nc) ? nzm : xcidx (nc));
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	468 octave_idx_type *rri = ridx ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	469 T *rrd = data ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	470
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	471 // Fill-in data.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	472 for (octave_idx_type j = 0, jj = -1; j < nc; j++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	473 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	474 octave_quit ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	475 octave_idx_type l = -1;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	476 if (sum_terms)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	477 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	478 // Sum adjacent terms.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	479 for (octave_idx_type i = ci[j]; i < ci[j+1]; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	480 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	481 octave_idx_type k = sidx[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	482 if (k != l)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	483 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	484 l = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	485 rrd[++jj] = a0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	486 rri[jj] = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	487 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	488 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	489 rrd[jj] += a0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	490 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	491 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	492 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	493 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	494 // Use the last one.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	495 for (octave_idx_type i = ci[j]; i < ci[j+1]; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	496 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	497 octave_idx_type k = sidx[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	498 if (k != l)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	499 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	500 l = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	501 rrd[++jj] = a0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	502 rri[jj] = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	503 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	504 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	505 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	506 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	507 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	508 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	509 else if (cl == 1)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	510 {
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	511 // Sparse column vector. Sort row indices.
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	512 Array<octave_idx_type> rsi;
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	513 octave::idx_vector rs = r.sorted (rsi);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	514
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	515 octave_quit ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	516
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	517 const octave_idx_type *rd = rs.raw ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	518 const octave_idx_type *rdi = rsi.data ();
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	519 // Count unique indices.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	520 octave_idx_type new_nz = 1;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	521 for (octave_idx_type i = 1; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	522 new_nz += rd[i-1] != rd[i];
24010 584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	523
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	524 // Allocate result.
10527 b4d2080b6df7 Replace nzmax by nnz as needed David Bateman <dbateman@free.fr> parents: 10521 diff changeset	525 change_capacity (nzm > new_nz ? nzm : new_nz);
24010 584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	526 std::fill_n (xcidx () + c(0) + 1, nc - c(0), new_nz);
584971932def Improve performance of Sparse constructors (bug #51880). Rik <rik@octave.org> parents: 23956 diff changeset	527
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	528 octave_idx_type *rri = ridx ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	529 T *rrd = data ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	530
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	531 octave_quit ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	532
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	533 octave_idx_type k = 0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	534 rri[k] = rd[0];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	535 rrd[k] = a(rdi[0]);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	536
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	537 if (sum_terms)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	538 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	539 // Sum repeated indices.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	540 for (octave_idx_type i = 1; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	541 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	542 if (rd[i] != rd[i-1])
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	543 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	544 rri[++k] = rd[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	545 rrd[k] = a(rdi[i]);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	546 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	547 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	548 rrd[k] += a(rdi[i]);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	549 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	550 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	551 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	552 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	553 // Pick the last one.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	554 for (octave_idx_type i = 1; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	555 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	556 if (rd[i] != rd[i-1])
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	557 rri[++k] = rd[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	558 rrd[k] = a(rdi[i]);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	559 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	560 }
10509 ddbd812d09aa properly compress sparse matrices after assembly Jaroslav Hajek <highegg@gmail.com> parents: 10506 diff changeset	561
ddbd812d09aa properly compress sparse matrices after assembly Jaroslav Hajek <highegg@gmail.com> parents: 10506 diff changeset	562 maybe_compress (true);
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	563 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	564 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	565 {
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	566 octave::idx_vector rr = r;
29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	567 octave::idx_vector cc = c;
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	568 const octave_idx_type *rd = rr.raw ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	569 const octave_idx_type *cd = cc.raw ();
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	570 OCTAVE_LOCAL_BUFFER_INIT (octave_idx_type, ci, nc+1, 0);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	571 ci[0] = 0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	572 // Bin counts of column indices.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	573 for (octave_idx_type i = 0; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	574 ci[cd[i]+1]++;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	575 // Make them cumulative, shifted one to right.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	576 for (octave_idx_type i = 1, s = 0; i <= nc; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	577 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	578 octave_idx_type s1 = s + ci[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	579 ci[i] = s;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	580 s = s1;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	581 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	582
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	583 octave_quit ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	584
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	585 typedef std::pair<octave_idx_type, octave_idx_type> idx_pair;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	586 // Bucket sort.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	587 OCTAVE_LOCAL_BUFFER (idx_pair, spairs, n);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	588 for (octave_idx_type i = 0; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	589 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	590 idx_pair& p = spairs[ci[cd[i]+1]++];
11571 0e414f837c58 Fix indexing error in the construction of sparse matrices David Bateman <dbateman@free.fr> parents: 11570 diff changeset	591 if (rl == 1)
0e414f837c58 Fix indexing error in the construction of sparse matrices David Bateman <dbateman@free.fr> parents: 11570 diff changeset	592 p.first = rd[0];
0e414f837c58 Fix indexing error in the construction of sparse matrices David Bateman <dbateman@free.fr> parents: 11570 diff changeset	593 else
0e414f837c58 Fix indexing error in the construction of sparse matrices David Bateman <dbateman@free.fr> parents: 11570 diff changeset	594 p.first = rd[i];
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	595 p.second = i;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	596 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	597
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	598 // Subsorts. We don't need a stable sort, the second index stabilizes it.
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	599 xcidx (0) = 0;
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	600 for (octave_idx_type j = 0; j < nc; j++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	601 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	602 std::sort (spairs + ci[j], spairs + ci[j+1]);
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	603 octave_idx_type l = -1;
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	604 octave_idx_type nzj = 0;
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	605 // Count.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	606 for (octave_idx_type i = ci[j]; i < ci[j+1]; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	607 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	608 octave_idx_type k = spairs[i].first;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	609 if (k != l)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	610 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	611 l = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	612 nzj++;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	613 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	614 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	615 // Set column pointer.
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	616 xcidx (j+1) = xcidx (j) + nzj;
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	617 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	618
10527 b4d2080b6df7 Replace nzmax by nnz as needed David Bateman <dbateman@free.fr> parents: 10521 diff changeset	619 change_capacity (nzm > xcidx (nc) ? nzm : xcidx (nc));
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	620 octave_idx_type *rri = ridx ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	621 T *rrd = data ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	622
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	623 // Fill-in data.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	624 for (octave_idx_type j = 0, jj = -1; j < nc; j++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	625 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	626 octave_quit ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	627 octave_idx_type l = -1;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	628 if (sum_terms)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	629 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	630 // Sum adjacent terms.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	631 for (octave_idx_type i = ci[j]; i < ci[j+1]; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	632 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	633 octave_idx_type k = spairs[i].first;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	634 if (k != l)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	635 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	636 l = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	637 rrd[++jj] = a(spairs[i].second);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	638 rri[jj] = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	639 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	640 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	641 rrd[jj] += a(spairs[i].second);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	642 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	643 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	644 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	645 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	646 // Use the last one.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	647 for (octave_idx_type i = ci[j]; i < ci[j+1]; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	648 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	649 octave_idx_type k = spairs[i].first;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	650 if (k != l)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	651 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	652 l = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	653 rri[++jj] = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	654 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	655 rrd[jj] = a(spairs[i].second);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	656 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	657 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	658 }
10509 ddbd812d09aa properly compress sparse matrices after assembly Jaroslav Hajek <highegg@gmail.com> parents: 10506 diff changeset	659
ddbd812d09aa properly compress sparse matrices after assembly Jaroslav Hajek <highegg@gmail.com> parents: 10506 diff changeset	660 maybe_compress (true);
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	661 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	662 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	663
23955 520c37805969 sparse: correctly handle scalar column index (bug #51880) John W. Eaton <jwe@octave.org> parents: 23219 diff changeset	664 /*
28579 713398d4a3c3 update bug status of tests marked with bug numbers John W. Eaton <jwe@octave.org> parents: 27933 diff changeset	665 %!assert <*51880> (sparse (1:2, 2, 1:2, 2, 2), sparse ([0, 1; 0, 2]))
713398d4a3c3 update bug status of tests marked with bug numbers John W. Eaton <jwe@octave.org> parents: 27933 diff changeset	666 %!assert <*51880> (sparse (1:2, 1, 1:2, 2, 2), sparse ([1, 0; 2, 0]))
713398d4a3c3 update bug status of tests marked with bug numbers John W. Eaton <jwe@octave.org> parents: 27933 diff changeset	667 %!assert <*51880> (sparse (1:2, 2, 1:2, 2, 3), sparse ([0, 1, 0; 0, 2, 0]))
23955 520c37805969 sparse: correctly handle scalar column index (bug #51880) John W. Eaton <jwe@octave.org> parents: 23219 diff changeset	668 */
520c37805969 sparse: correctly handle scalar column index (bug #51880) John W. Eaton <jwe@octave.org> parents: 23219 diff changeset	669
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	670 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	671 OCTAVE_API
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	672 Sparse<T, Alloc>::Sparse (const Array<T>& a)
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	673 : m_rep (nullptr), m_dimensions (a.dims ())
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	674 {
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	675 if (m_dimensions.ndims () > 2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	676 (*current_liboctave_error_handler)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	677 ("Sparse::Sparse (const Array<T>&): dimension mismatch");
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	678
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	679 octave_idx_type nr = rows ();
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	680 octave_idx_type nc = cols ();
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	681 octave_idx_type len = a.numel ();
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	682 octave_idx_type new_nzmax = 0;
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	683
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	684 // First count the number of nonzero terms
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	685 for (octave_idx_type i = 0; i < len; i++)
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	686 if (a(i) != T ())
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	687 new_nzmax++;
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	688
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	689 m_rep = new typename Sparse<T, Alloc>::SparseRep (nr, nc, new_nzmax);
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	690
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	691 octave_idx_type ii = 0;
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	692 xcidx (0) = 0;
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	693 for (octave_idx_type j = 0; j < nc; j++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	694 {
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	695 for (octave_idx_type i = 0; i < nr; i++)
30394 f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30099 diff changeset	696 if (a.elem (i, j) != T ())
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	697 {
30394 f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30099 diff changeset	698 xdata (ii) = a.elem (i, j);
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	699 xridx (ii++) = i;
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	700 }
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	701 xcidx (j+1) = ii;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	702 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	703 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	704
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	705 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	706 OCTAVE_API
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31706 diff changeset	707 Sparse<T, Alloc>::~Sparse ()
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	708 {
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	709 if (--m_rep->m_count == 0)
be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	710 delete m_rep;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	711 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	712
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	713 template <typename T, typename Alloc>
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	714 Sparse<T, Alloc>&
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	715 Sparse<T, Alloc>::operator = (const Sparse<T, Alloc>& a)
7717 ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	716 {
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	717 if (this != &a)
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	718 {
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	719 if (--m_rep->m_count == 0)
be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	720 delete m_rep;
be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	721
be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	722 m_rep = a.m_rep;
be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	723 m_rep->m_count++;
be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	724
be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	725 m_dimensions = a.m_dimensions;
7717 ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	726 }
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	727
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	728 return *this;
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	729 }
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	730
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	731 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	732 OCTAVE_API
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	733 octave_idx_type
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	734 Sparse<T, Alloc>::compute_index (const Array<octave_idx_type>& ra_idx) const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	735 {
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	736 octave_idx_type n = m_dimensions.ndims ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	737
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	738 if (n <= 0 \|\| n != ra_idx.numel ())
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	739 (*current_liboctave_error_handler)
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	740 ("Sparse<T, Alloc>::compute_index: invalid ra_idxing operation");
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	741
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	742 octave_idx_type retval = -1;
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	743
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	744 retval = ra_idx(--n);
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	745
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	746 while (--n >= 0)
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	747 {
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	748 retval *= m_dimensions(n);
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	749 retval += ra_idx(n);
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	750 }
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	751
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	752 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	753 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	754
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	755 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	756 OCTAVE_API
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	757 T
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	758 Sparse<T, Alloc>::range_error (const char *fcn, octave_idx_type n) const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	759 {
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	760 (*current_liboctave_error_handler) ("%s (%" OCTAVE_IDX_TYPE_FORMAT "): "
0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	761 "range error", fcn, n);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	762 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	763
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	764 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	765 OCTAVE_API
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	766 T&
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	767 Sparse<T, Alloc>::range_error (const char *fcn, octave_idx_type n)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	768 {
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	769 (*current_liboctave_error_handler) ("%s (%" OCTAVE_IDX_TYPE_FORMAT "): "
0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	770 "range error", fcn, n);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	771 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	772
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	773 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	774 OCTAVE_API
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	775 T
32590 3c2c585965cc maint: C++ style check for liboctave/ before 9.1 release. Rik <rik@octave.org> parents: 32513 diff changeset	776 Sparse<T, Alloc>::range_error (const char *fcn,
3c2c585965cc maint: C++ style check for liboctave/ before 9.1 release. Rik <rik@octave.org> parents: 32513 diff changeset	777 octave_idx_type i, octave_idx_type j) const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	778 {
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	779 (*current_liboctave_error_handler)
0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	780 ("%s (%" OCTAVE_IDX_TYPE_FORMAT ", %" OCTAVE_IDX_TYPE_FORMAT "): "
0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	781 "range error", fcn, i, j);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	782 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	783
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	784 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	785 OCTAVE_API
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	786 T&
32590 3c2c585965cc maint: C++ style check for liboctave/ before 9.1 release. Rik <rik@octave.org> parents: 32513 diff changeset	787 Sparse<T, Alloc>::range_error (const char *fcn,
3c2c585965cc maint: C++ style check for liboctave/ before 9.1 release. Rik <rik@octave.org> parents: 32513 diff changeset	788 octave_idx_type i, octave_idx_type j)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	789 {
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	790 (*current_liboctave_error_handler)
0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	791 ("%s (%" OCTAVE_IDX_TYPE_FORMAT ", %" OCTAVE_IDX_TYPE_FORMAT "): "
0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	792 "range error", fcn, i, j);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	793 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	794
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	795 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	796 OCTAVE_API
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	797 T
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	798 Sparse<T, Alloc>::range_error (const char *fcn,
32590 3c2c585965cc maint: C++ style check for liboctave/ before 9.1 release. Rik <rik@octave.org> parents: 32513 diff changeset	799 const Array<octave_idx_type>& ra_idx) const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	800 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	801 std::ostringstream buf;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	802
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	803 buf << fcn << " (";
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	804
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20229 diff changeset	805 octave_idx_type n = ra_idx.numel ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	806
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	807 if (n > 0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	808 buf << ra_idx(0);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	809
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	810 for (octave_idx_type i = 1; i < n; i++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	811 buf << ", " << ra_idx(i);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	812
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	813 buf << "): range error";
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	814
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	815 std::string buf_str = buf.str ();
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	816
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	817 (*current_liboctave_error_handler) ("%s", buf_str.c_str ());
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	818 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	819
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	820 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	821 OCTAVE_API
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	822 T&
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	823 Sparse<T, Alloc>::range_error (const char *fcn,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	824 const Array<octave_idx_type>& ra_idx)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	825 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	826 std::ostringstream buf;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	827
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	828 buf << fcn << " (";
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	829
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20229 diff changeset	830 octave_idx_type n = ra_idx.numel ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	831
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	832 if (n > 0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	833 buf << ra_idx(0);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	834
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	835 for (octave_idx_type i = 1; i < n; i++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	836 buf << ", " << ra_idx(i);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	837
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	838 buf << "): range error";
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	839
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	840 std::string buf_str = buf.str ();
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	841
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	842 (*current_liboctave_error_handler) ("%s", buf_str.c_str ());
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	843 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	844
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	845 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	846 OCTAVE_API
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	847 Sparse<T, Alloc>
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	848 Sparse<T, Alloc>::reshape (const dim_vector& new_dims) const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	849 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	850 Sparse<T, Alloc> retval;
6689 8e0444d90050 [project @ 2007-06-04 22:28:19 by dbateman] dbateman parents: 6101 diff changeset	851 dim_vector dims2 = new_dims;
8e0444d90050 [project @ 2007-06-04 22:28:19 by dbateman] dbateman parents: 6101 diff changeset	852
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21574 diff changeset	853 if (dims2.ndims () > 2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	854 {
19410 95c533ed464b use warning IDs for all warnings in liboctave John W. Eaton <jwe@octave.org> parents: 19381 diff changeset	855 (*current_liboctave_warning_with_id_handler)
95c533ed464b use warning IDs for all warnings in liboctave John W. Eaton <jwe@octave.org> parents: 19381 diff changeset	856 ("Octave:reshape-smashes-dims",
21014 b9d4c3615e89 maint: Capitalize D for dimension in messages and comments. Rik <rik@octave.org> parents: 20673 diff changeset	857 "reshape: sparse reshape to N-D array smashes dims");
6814 8c89a644df8a [project @ 2007-08-14 17:30:59 by jwe] jwe parents: 6813 diff changeset	858
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21574 diff changeset	859 for (octave_idx_type i = 2; i < dims2.ndims (); i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	860 dims2(1) *= dims2(i);
6814 8c89a644df8a [project @ 2007-08-14 17:30:59 by jwe] jwe parents: 6813 diff changeset	861
6689 8e0444d90050 [project @ 2007-06-04 22:28:19 by dbateman] dbateman parents: 6101 diff changeset	862 dims2.resize (2);
8e0444d90050 [project @ 2007-06-04 22:28:19 by dbateman] dbateman parents: 6101 diff changeset	863 }
8e0444d90050 [project @ 2007-06-04 22:28:19 by dbateman] dbateman parents: 6101 diff changeset	864
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	865 if (m_dimensions != dims2)
6689 8e0444d90050 [project @ 2007-06-04 22:28:19 by dbateman] dbateman parents: 6101 diff changeset	866 {
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	867 if (m_dimensions.numel () == dims2.numel ())
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	868 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	869 octave_idx_type new_nnz = nnz ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	870 octave_idx_type new_nr = dims2 (0);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	871 octave_idx_type new_nc = dims2 (1);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	872 octave_idx_type old_nr = rows ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	873 octave_idx_type old_nc = cols ();
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	874 retval = Sparse<T, Alloc> (new_nr, new_nc, new_nnz);
32045 f18da620ab4d Fix floating point exception when Sparse array reshaped to 0x0 (bug #64080) Rik <rik@octave.org> parents: 31706 diff changeset	875 // Special case for empty matrices (bug #64080)
f18da620ab4d Fix floating point exception when Sparse array reshaped to 0x0 (bug #64080) Rik <rik@octave.org> parents: 31706 diff changeset	876 if (new_nr == 0 \|\| new_nc == 0)
f18da620ab4d Fix floating point exception when Sparse array reshaped to 0x0 (bug #64080) Rik <rik@octave.org> parents: 31706 diff changeset	877 return retval;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	878
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	879 octave_idx_type kk = 0;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	880 retval.xcidx (0) = 0;
21562 6c2fd62db1f7 maint: Eliminate accidental double spaces in code. Rik <rik@octave.org> parents: 21337 diff changeset	881 // Quotient and remainder of i * old_nr divided by new_nr.
21256 a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	882 // Track them individually to avoid overflow (bug #42850).
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	883 octave_idx_type i_old_qu = 0;
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	884 octave_idx_type i_old_rm = static_cast<octave_idx_type> (-old_nr);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	885 for (octave_idx_type i = 0; i < old_nc; i++)
21256 a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	886 {
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	887 i_old_rm += old_nr;
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	888 if (i_old_rm >= new_nr)
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	889 {
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	890 i_old_qu += i_old_rm / new_nr;
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	891 i_old_rm = i_old_rm % new_nr;
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	892 }
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	893 for (octave_idx_type j = cidx (i); j < cidx (i+1); j++)
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	894 {
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	895 octave_idx_type ii, jj;
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	896 ii = (i_old_rm + ridx (j)) % new_nr;
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	897 jj = i_old_qu + (i_old_rm + ridx (j)) / new_nr;
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	898
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	899 // Original calculation subject to overflow
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	900 // ii = (i*old_nr + ridx (j)) % new_nr
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	901 // jj = (i*old_nr + ridx (j)) / new_nr
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	902 for (octave_idx_type k = kk; k < jj; k++)
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	903 retval.xcidx (k+1) = j;
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	904 kk = jj;
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	905 retval.xdata (j) = data (j);
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	906 retval.xridx (j) = ii;
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	907 }
a93fa1b0796e Avoid overflow while reshaping large sparse matrices (bug #42850). Lachlan Andrew <lachlanbis@gmail.com> parents: 21255 diff changeset	908 }
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	909 for (octave_idx_type k = kk; k < new_nc; k++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	910 retval.xcidx (k+1) = new_nnz;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	911 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	912 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	913 {
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	914 std::string dimensions_str = m_dimensions.str ();
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	915 std::string new_dims_str = new_dims.str ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	916
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	917 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	918 ("reshape: can't reshape %s array to %s array",
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	919 dimensions_str.c_str (), new_dims_str.c_str ());
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	920 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	921 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	922 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	923 retval = *this;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	924
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	925 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	926 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	927
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	928 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	929 OCTAVE_API
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	930 Sparse<T, Alloc>
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	931 Sparse<T, Alloc>::permute (const Array<octave_idx_type>& perm_vec, bool) const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	932 {
6813 75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	933 // The only valid permutations of a sparse array are [1, 2] and [2, 1].
75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	934
75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	935 bool fail = false;
6817 2e7f62e52c13 [project @ 2007-08-19 19:36:40 by dbateman] dbateman parents: 6814 diff changeset	936 bool trans = false;
6813 75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	937
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20229 diff changeset	938 if (perm_vec.numel () == 2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	939 {
6813 75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	940 if (perm_vec(0) == 0 && perm_vec(1) == 1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	941 /* do nothing */;
6813 75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	942 else if (perm_vec(0) == 1 && perm_vec(1) == 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	943 trans = true;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	944 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	945 fail = true;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	946 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	947 else
6813 75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	948 fail = true;
75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	949
75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	950 if (fail)
75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	951 (*current_liboctave_error_handler)
75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	952 ("permutation vector contains an invalid element");
75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	953
6817 2e7f62e52c13 [project @ 2007-08-19 19:36:40 by dbateman] dbateman parents: 6814 diff changeset	954 return trans ? this->transpose () : *this;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	955 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	956
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	957 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	958 OCTAVE_API
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	959 void
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	960 Sparse<T, Alloc>::resize1 (octave_idx_type n)
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	961 {
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	962 octave_idx_type nr = rows ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	963 octave_idx_type nc = cols ();
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	964
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	965 if (nr == 0)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	966 resize (1, std::max (nc, n));
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	967 else if (nc == 0)
10520 72c90e7132a9 fix failing sparse assignment tests Jaroslav Hajek <highegg@gmail.com> parents: 10516 diff changeset	968 resize (nr, (n + nr - 1) / nr); // Ain't it wicked?
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	969 else if (nr == 1)
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	970 resize (1, n);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	971 else if (nc == 1)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	972 resize (n, 1);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	973 else
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	974 octave::err_invalid_resize ();
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	975 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	976
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	977 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	978 OCTAVE_API
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	979 void
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	980 Sparse<T, Alloc>::resize (const dim_vector& dv)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	981 {
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21574 diff changeset	982 octave_idx_type n = dv.ndims ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	983
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	984 if (n != 2)
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	985 (*current_liboctave_error_handler) ("sparse array must be 2-D");
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	986
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	987 resize (dv(0), dv(1));
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	988 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	989
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	990 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	991 OCTAVE_API
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	992 void
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	993 Sparse<T, Alloc>::resize (octave_idx_type r, octave_idx_type c)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	994 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	995 if (r < 0 \|\| c < 0)
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	996 (*current_liboctave_error_handler) ("can't resize to negative dimension");
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	997
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	998 if (r == dim1 () && c == dim2 ())
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	999 return;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1000
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	1001 // This wouldn't be necessary for r >= rows () if m_nrows wasn't part of the
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	1002 // Sparse rep. It is not good for anything in there.
10499 fabed15083a4 optimize sparse resize Jaroslav Hajek <highegg@gmail.com> parents: 10497 diff changeset	1003 make_unique ();
fabed15083a4 optimize sparse resize Jaroslav Hajek <highegg@gmail.com> parents: 10497 diff changeset	1004
fabed15083a4 optimize sparse resize Jaroslav Hajek <highegg@gmail.com> parents: 10497 diff changeset	1005 if (r < rows ())
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1006 {
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1007 octave_idx_type i = 0;
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1008 octave_idx_type k = 0;
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	1009 for (octave_idx_type j = 1; j <= m_rep->m_ncols; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1010 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1011 octave_idx_type u = xcidx (j);
21337 cfe11042fbc0 eliminate useless assignment in for loop John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1012 for (; i < u; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1013 if (xridx (i) < r)
10499 fabed15083a4 optimize sparse resize Jaroslav Hajek <highegg@gmail.com> parents: 10497 diff changeset	1014 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1015 xdata (k) = xdata (i);
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1016 xridx (k++) = xridx (i);
10499 fabed15083a4 optimize sparse resize Jaroslav Hajek <highegg@gmail.com> parents: 10497 diff changeset	1017 }
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1018 xcidx (j) = k;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1019 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1020 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1021
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	1022 m_rep->m_nrows = m_dimensions(0) = r;
be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	1023
be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	1024 if (c != m_rep->m_ncols)
10499 fabed15083a4 optimize sparse resize Jaroslav Hajek <highegg@gmail.com> parents: 10497 diff changeset	1025 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1026 octave_idx_type *new_cidx = m_rep->idx_type_allocate (c+1);
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	1027 std::copy_n (m_rep->m_cidx, std::min (c, m_rep->m_ncols) + 1, new_cidx);
30883 7ad8385ff106 pass correct length to SparseRep idx_type_deallocate function John W. Eaton <jwe@octave.org> parents: 30791 diff changeset	1028 m_rep->idx_type_deallocate (m_rep->m_cidx, m_rep->m_ncols + 1);
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	1029 m_rep->m_cidx = new_cidx;
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	1030
be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	1031 if (c > m_rep->m_ncols)
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	1032 std::fill_n (m_rep->m_cidx + m_rep->m_ncols + 1, c - m_rep->m_ncols,
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	1033 m_rep->m_cidx[m_rep->m_ncols]);
10499 fabed15083a4 optimize sparse resize Jaroslav Hajek <highegg@gmail.com> parents: 10497 diff changeset	1034 }
fabed15083a4 optimize sparse resize Jaroslav Hajek <highegg@gmail.com> parents: 10497 diff changeset	1035
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	1036 m_rep->m_ncols = m_dimensions(1) = c;
be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	1037
be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	1038 m_rep->change_length (m_rep->nnz ());
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1039 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1040
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1041 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	1042 OCTAVE_API
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1043 Sparse<T, Alloc>&
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1044 Sparse<T, Alloc>::insert (const Sparse<T, Alloc>& a,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1045 octave_idx_type r, octave_idx_type c)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1046 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1047 octave_idx_type a_rows = a.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1048 octave_idx_type a_cols = a.cols ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1049 octave_idx_type nr = rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1050 octave_idx_type nc = cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1051
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1052 if (r < 0 \|\| r + a_rows > rows () \|\| c < 0 \|\| c + a_cols > cols ())
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	1053 (*current_liboctave_error_handler) ("range error for insert");
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1054
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1055 // First count the number of elements in the final array
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1056 octave_idx_type nel = cidx (c) + a.nnz ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1057
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1058 if (c + a_cols < nc)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1059 nel += cidx (nc) - cidx (c + a_cols);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1060
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1061 for (octave_idx_type i = c; i < c + a_cols; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1062 for (octave_idx_type j = cidx (i); j < cidx (i+1); j++)
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1063 if (ridx (j) < r \|\| ridx (j) >= r + a_rows)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1064 nel++;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1065
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1066 Sparse<T, Alloc> tmp (*this);
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	1067 --m_rep->m_count;
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1068 m_rep = new typename Sparse<T, Alloc>::SparseRep (nr, nc, nel);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1069
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1070 for (octave_idx_type i = 0; i < tmp.cidx (c); i++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1071 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1072 data (i) = tmp.data (i);
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1073 ridx (i) = tmp.ridx (i);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1074 }
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1075 for (octave_idx_type i = 0; i < c + 1; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1076 cidx (i) = tmp.cidx (i);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1077
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1078 octave_idx_type ii = cidx (c);
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1079
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1080 for (octave_idx_type i = c; i < c + a_cols; i++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1081 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	1082 octave_quit ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1083
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1084 for (octave_idx_type j = tmp.cidx (i); j < tmp.cidx (i+1); j++)
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1085 if (tmp.ridx (j) < r)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1086 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1087 data (ii) = tmp.data (j);
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1088 ridx (ii++) = tmp.ridx (j);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1089 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1090
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	1091 octave_quit ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1092
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1093 for (octave_idx_type j = a.cidx (i-c); j < a.cidx (i-c+1); j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1094 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1095 data (ii) = a.data (j);
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1096 ridx (ii++) = r + a.ridx (j);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1097 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1098
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	1099 octave_quit ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1100
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1101 for (octave_idx_type j = tmp.cidx (i); j < tmp.cidx (i+1); j++)
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1102 if (tmp.ridx (j) >= r + a_rows)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1103 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1104 data (ii) = tmp.data (j);
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1105 ridx (ii++) = tmp.ridx (j);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1106 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1107
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1108 cidx (i+1) = ii;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1109 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1110
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1111 for (octave_idx_type i = c + a_cols; i < nc; i++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1112 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1113 for (octave_idx_type j = tmp.cidx (i); j < tmp.cidx (i+1); j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1114 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1115 data (ii) = tmp.data (j);
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1116 ridx (ii++) = tmp.ridx (j);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1117 }
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1118 cidx (i+1) = ii;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1119 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1120
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1121 return *this;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1122 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1123
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1124 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	1125 OCTAVE_API
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1126 Sparse<T, Alloc>&
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1127 Sparse<T, Alloc>::insert (const Sparse<T, Alloc>& a,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1128 const Array<octave_idx_type>& ra_idx)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1129 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1130
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20229 diff changeset	1131 if (ra_idx.numel () != 2)
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	1132 (*current_liboctave_error_handler) ("range error for insert");
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1133
20218 b2100e1659ac maint: Use cuddled parentheses when indexing dimension_vectors. Rik <rik@octave.org> parents: 19861 diff changeset	1134 return insert (a, ra_idx(0), ra_idx(1));
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1135 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1136
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1137 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	1138 OCTAVE_API
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1139 Sparse<T, Alloc>
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31706 diff changeset	1140 Sparse<T, Alloc>::transpose () const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1141 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1142 assert (ndims () == 2);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1143
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1144 octave_idx_type nr = rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1145 octave_idx_type nc = cols ();
5648 69a4f320d95a [project @ 2006-03-08 20:17:37 by dbateman] dbateman parents: 5630 diff changeset	1146 octave_idx_type nz = nnz ();
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1147 Sparse<T, Alloc> retval (nc, nr, nz);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1148
5648 69a4f320d95a [project @ 2006-03-08 20:17:37 by dbateman] dbateman parents: 5630 diff changeset	1149 for (octave_idx_type i = 0; i < nz; i++)
8987 542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1150 retval.xcidx (ridx (i) + 1)++;
542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1151 // retval.xcidx[1:nr] holds the row degrees for rows 0:(nr-1)
5648 69a4f320d95a [project @ 2006-03-08 20:17:37 by dbateman] dbateman parents: 5630 diff changeset	1152 nz = 0;
8987 542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1153 for (octave_idx_type i = 1; i <= nr; i++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1154 {
8987 542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1155 const octave_idx_type tmp = retval.xcidx (i);
542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1156 retval.xcidx (i) = nz;
542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1157 nz += tmp;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1158 }
8987 542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1159 // retval.xcidx[1:nr] holds row entry start offsets for rows 0:(nr-1)
5648 69a4f320d95a [project @ 2006-03-08 20:17:37 by dbateman] dbateman parents: 5630 diff changeset	1160
69a4f320d95a [project @ 2006-03-08 20:17:37 by dbateman] dbateman parents: 5630 diff changeset	1161 for (octave_idx_type j = 0; j < nc; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1162 for (octave_idx_type k = cidx (j); k < cidx (j+1); k++)
5648 69a4f320d95a [project @ 2006-03-08 20:17:37 by dbateman] dbateman parents: 5630 diff changeset	1163 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1164 octave_idx_type q = retval.xcidx (ridx (k) + 1)++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1165 retval.xridx (q) = j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1166 retval.xdata (q) = data (k);
5648 69a4f320d95a [project @ 2006-03-08 20:17:37 by dbateman] dbateman parents: 5630 diff changeset	1167 }
8987 542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1168 assert (nnz () == retval.xcidx (nr));
542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1169 // retval.xcidx[1:nr] holds row entry end offsets for rows 0:(nr-1)
542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1170 // and retval.xcidx[0:(nr-1)] holds their row entry start offsets
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1171
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1172 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1173 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1174
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	1175 // Lower bound lookup. Could also use octave_sort, but that has upper bound
b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	1176 // semantics, so requires some manipulation to set right. Uses a plain loop
b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	1177 // for small columns.
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	1178 static
a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	1179 octave_idx_type
10493 2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1180 lblookup (const octave_idx_type *ridx, octave_idx_type nr,
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1181 octave_idx_type ri)
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1182 {
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1183 if (nr <= 8)
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1184 {
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1185 octave_idx_type l;
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1186 for (l = 0; l < nr; l++)
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1187 if (ridx[l] >= ri)
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1188 break;
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1189 return l;
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1190 }
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1191 else
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1192 return std::lower_bound (ridx, ridx + nr, ri) - ridx;
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1193 }
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1194
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1195 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	1196 OCTAVE_API
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1197 void
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1198 Sparse<T, Alloc>::delete_elements (const octave::idx_vector& idx)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1199 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1200 Sparse<T, Alloc> retval;
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1201
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1202 assert (ndims () == 2);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1203
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1204 octave_idx_type nr = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1205 octave_idx_type nc = dim2 ();
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1206 octave_idx_type nz = nnz ();
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1207
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1208 octave_idx_type nel = numel (); // Can throw.
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1209
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1210 const dim_vector idx_dims = idx.orig_dimensions ();
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1211
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1212 if (idx.extent (nel) > nel)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1213 octave::err_del_index_out_of_range (true, idx.extent (nel), nel);
21120 499b851fbfae Replace pattern if/err_XXX/else/code with if/err_XXX/ code. Rik <rik@octave.org> parents: 21118 diff changeset	1214
499b851fbfae Replace pattern if/err_XXX/else/code with if/err_XXX/ code. Rik <rik@octave.org> parents: 21118 diff changeset	1215 if (nc == 1)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1216 {
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1217 // Sparse column vector.
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1218 const Sparse<T, Alloc> tmp = *this; // constant copy to prevent COW.
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1219
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1220 octave_idx_type lb, ub;
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1221
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1222 if (idx.is_cont_range (nel, lb, ub))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1223 {
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1224 // Special-case a contiguous range.
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1225 // Look-up indices first.
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1226 octave_idx_type li = lblookup (tmp.ridx (), nz, lb);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1227 octave_idx_type ui = lblookup (tmp.ridx (), nz, ub);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1228 // Copy data and adjust indices.
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1229 octave_idx_type nz_new = nz - (ui - li);
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1230 *this = Sparse<T, Alloc> (nr - (ub - lb), 1, nz_new);
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1231 std::copy_n (tmp.data (), li, data ());
1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1232 std::copy_n (tmp.ridx (), li, xridx ());
19381 af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19078 diff changeset	1233 std::copy (tmp.data () + ui, tmp.data () + nz, xdata () + li);
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1234 mx_inline_sub (nz - ui, xridx () + li, tmp.ridx () + ui, ub - lb);
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1235 xcidx (1) = nz_new;
10382 1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1236 }
1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1237 else
1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1238 {
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1239 OCTAVE_LOCAL_BUFFER (octave_idx_type, ridx_new, nz);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1240 OCTAVE_LOCAL_BUFFER (T, data_new, nz);
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1241 octave::idx_vector sidx = idx.sorted (true);
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1242 const octave_idx_type *sj = sidx.raw ();
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1243 octave_idx_type sl = sidx.length (nel);
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1244 octave_idx_type nz_new = 0;
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1245 octave_idx_type j = 0;
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1246 for (octave_idx_type i = 0; i < nz; i++)
10382 1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1247 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1248 octave_idx_type r = tmp.ridx (i);
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1249 for (; j < sl && sj[j] < r; j++) ;
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1250 if (j == sl \|\| sj[j] > r)
10382 1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1251 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1252 data_new[nz_new] = tmp.data (i);
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1253 ridx_new[nz_new++] = r - j;
10382 1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1254 }
1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1255 }
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1256
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1257 *this = Sparse<T, Alloc> (nr - sl, 1, nz_new);
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1258 std::copy_n (ridx_new, nz_new, ridx ());
1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1259 std::copy_n (data_new, nz_new, xdata ());
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1260 xcidx (1) = nz_new;
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1261 }
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1262 }
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1263 else if (nr == 1)
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1264 {
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1265 // Sparse row vector.
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1266 octave_idx_type lb, ub;
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1267 if (idx.is_cont_range (nc, lb, ub))
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1268 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1269 const Sparse<T, Alloc> tmp = *this;
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1270 octave_idx_type lbi = tmp.cidx (lb);
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1271 octave_idx_type ubi = tmp.cidx (ub);
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1272 octave_idx_type new_nz = nz - (ubi - lbi);
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1273 *this = Sparse<T, Alloc> (1, nc - (ub - lb), new_nz);
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1274 std::copy_n (tmp.data (), lbi, data ());
27933 863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27923 diff changeset	1275 std::copy (tmp.data () + ubi, tmp.data () + nz, xdata () + lbi);
19381 af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19078 diff changeset	1276 std::fill_n (ridx (), new_nz, static_cast<octave_idx_type> (0));
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1277 std::copy_n (tmp.cidx () + 1, lb, cidx () + 1);
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1278 mx_inline_sub (nc - ub, xcidx () + 1, tmp.cidx () + ub + 1,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1279 ubi - lbi);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1280 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1281 else
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1282 *this = index (idx.complement (nc));
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1283 }
17642 7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1284 else if (idx.length (nel) != 0)
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1285 {
17642 7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1286 if (idx.is_colon_equiv (nel))
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1287 *this = Sparse<T, Alloc> ();
17642 7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1288 else
7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1289 {
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1290 *this = index (octave::idx_vector::colon);
17642 7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1291 delete_elements (idx);
7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1292 *this = transpose (); // We want a row vector.
7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1293 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1294 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1295 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1296
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1297 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	1298 OCTAVE_API
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1299 void
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1300 Sparse<T, Alloc>::delete_elements (const octave::idx_vector& idx_i,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1301 const octave::idx_vector& idx_j)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1302 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1303 assert (ndims () == 2);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1304
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1305 octave_idx_type nr = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1306 octave_idx_type nc = dim2 ();
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1307 octave_idx_type nz = nnz ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1308
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1309 if (idx_i.is_colon ())
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1310 {
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1311 // Deleting columns.
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1312 octave_idx_type lb, ub;
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1313 if (idx_j.extent (nc) > nc)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1314 octave::err_del_index_out_of_range (false, idx_j.extent (nc), nc);
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1315 else if (idx_j.is_cont_range (nc, lb, ub))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1316 {
14794 41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1317 if (lb == 0 && ub == nc)
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1318 {
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1319 // Delete all rows and columns.
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1320 *this = Sparse<T, Alloc> (nr, 0);
14794 41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1321 }
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1322 else if (nz == 0)
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1323 {
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1324 // No elements to preserve; adjust dimensions.
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1325 *this = Sparse<T, Alloc> (nr, nc - (ub - lb));
14794 41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1326 }
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1327 else
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1328 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1329 const Sparse<T, Alloc> tmp = *this;
18083 938f01339043 maint: Use Octave coding convention for indexing vs. function calls in liboctave/array. Rik <rik@octave.org> parents: 17823 diff changeset	1330 octave_idx_type lbi = tmp.cidx (lb);
938f01339043 maint: Use Octave coding convention for indexing vs. function calls in liboctave/array. Rik <rik@octave.org> parents: 17823 diff changeset	1331 octave_idx_type ubi = tmp.cidx (ub);
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1332 octave_idx_type new_nz = nz - (ubi - lbi);
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14791 diff changeset	1333
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1334 *this = Sparse<T, Alloc> (nr, nc - (ub - lb), new_nz);
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1335 std::copy_n (tmp.data (), lbi, data ());
1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1336 std::copy_n (tmp.ridx (), lbi, ridx ());
19381 af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19078 diff changeset	1337 std::copy (tmp.data () + ubi, tmp.data () + nz, xdata () + lbi);
af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19078 diff changeset	1338 std::copy (tmp.ridx () + ubi, tmp.ridx () + nz, xridx () + lbi);
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1339 std::copy_n (tmp.cidx () + 1, lb, cidx () + 1);
14794 41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1340 mx_inline_sub (nc - ub, xcidx () + lb + 1,
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1341 tmp.cidx () + ub + 1, ubi - lbi);
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1342 }
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1343 }
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1344 else
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1345 *this = index (idx_i, idx_j.complement (nc));
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1346 }
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1347 else if (idx_j.is_colon ())
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1348 {
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1349 // Deleting rows.
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1350 octave_idx_type lb, ub;
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1351 if (idx_i.extent (nr) > nr)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1352 octave::err_del_index_out_of_range (false, idx_i.extent (nr), nr);
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1353 else if (idx_i.is_cont_range (nr, lb, ub))
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1354 {
14794 41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1355 if (lb == 0 && ub == nr)
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1356 {
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1357 // Delete all rows and columns.
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1358 *this = Sparse<T, Alloc> (0, nc);
14794 41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1359 }
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1360 else if (nz == 0)
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1361 {
14794 41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1362 // No elements to preserve; adjust dimensions.
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1363 *this = Sparse<T, Alloc> (nr - (ub - lb), nc);
14794 41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1364 }
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1365 else
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1366 {
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1367 // This is more memory-efficient than the approach below.
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1368 const Sparse<T, Alloc> tmpl = index (octave::idx_vector (0, lb), idx_j);
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1369 const Sparse<T, Alloc> tmpu = index (octave::idx_vector (ub, nr), idx_j);
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1370 *this = Sparse<T, Alloc> (nr - (ub - lb), nc,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1371 tmpl.nnz () + tmpu.nnz ());
14794 41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1372 for (octave_idx_type j = 0, k = 0; j < nc; j++)
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1373 {
18083 938f01339043 maint: Use Octave coding convention for indexing vs. function calls in liboctave/array. Rik <rik@octave.org> parents: 17823 diff changeset	1374 for (octave_idx_type i = tmpl.cidx (j); i < tmpl.cidx (j+1);
14794 41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1375 i++)
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1376 {
18083 938f01339043 maint: Use Octave coding convention for indexing vs. function calls in liboctave/array. Rik <rik@octave.org> parents: 17823 diff changeset	1377 xdata (k) = tmpl.data (i);
938f01339043 maint: Use Octave coding convention for indexing vs. function calls in liboctave/array. Rik <rik@octave.org> parents: 17823 diff changeset	1378 xridx (k++) = tmpl.ridx (i);
14794 41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1379 }
18083 938f01339043 maint: Use Octave coding convention for indexing vs. function calls in liboctave/array. Rik <rik@octave.org> parents: 17823 diff changeset	1380 for (octave_idx_type i = tmpu.cidx (j); i < tmpu.cidx (j+1);
14794 41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1381 i++)
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1382 {
18083 938f01339043 maint: Use Octave coding convention for indexing vs. function calls in liboctave/array. Rik <rik@octave.org> parents: 17823 diff changeset	1383 xdata (k) = tmpu.data (i);
938f01339043 maint: Use Octave coding convention for indexing vs. function calls in liboctave/array. Rik <rik@octave.org> parents: 17823 diff changeset	1384 xridx (k++) = tmpu.ridx (i) + lb;
14794 41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1385 }
41dcb2c5bb1a Special-case removing rows or columns from empty sparse matrices John W. Eaton <jwe@octave.org> parents: 14792 diff changeset	1386
18083 938f01339043 maint: Use Octave coding convention for indexing vs. function calls in liboctave/array. Rik <rik@octave.org> parents: 17823 diff changeset	1387 xcidx (j+1) = k;
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1388 }
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1389 }
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1390 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1391 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1392 {
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1393 // This is done by transposing, deleting columns, then transposing
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1394 // again.
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1395 Sparse<T, Alloc> tmp = transpose ();
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1396 tmp.delete_elements (idx_j, idx_i);
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1397 *this = tmp.transpose ();
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1398 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1399 }
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1400 else
17642 7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1401 {
7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1402 // Empty assignment (no elements to delete) is OK if there is at
7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1403 // least one zero-length index and at most one other index that is
7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1404 // non-colon (or equivalent) index. Since we only have two
7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1405 // indices, we just need to check that we have at least one zero
7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1406 // length index. Matlab considers "[]" to be an empty index but
7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1407 // not "false". We accept both.
7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1408
7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1409 bool empty_assignment
7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1410 = (idx_i.length (nr) == 0 \|\| idx_j.length (nc) == 0);
7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1411
7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1412 if (! empty_assignment)
7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1413 (*current_liboctave_error_handler)
7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1414 ("a null assignment can only have one non-colon index");
7ed397c8ca68 improve compatibility of null assignment (bug #31287) John W. Eaton <jwe@octave.org> parents: 17285 diff changeset	1415 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1416 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1417
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1418 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	1419 OCTAVE_API
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1420 void
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1421 Sparse<T, Alloc>::delete_elements (int dim, const octave::idx_vector& idx)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1422 {
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1423 if (dim == 0)
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1424 delete_elements (idx, octave::idx_vector::colon);
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1425 else if (dim == 1)
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1426 delete_elements (octave::idx_vector::colon, idx);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1427 else
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	1428 (*current_liboctave_error_handler) ("invalid dimension in delete_elements");
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1429 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1430
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1431 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	1432 OCTAVE_API
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1433 Sparse<T, Alloc>
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1434 Sparse<T, Alloc>::index (const octave::idx_vector& idx, bool resize_ok) const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1435 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1436 Sparse<T, Alloc> retval;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1437
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1438 assert (ndims () == 2);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1439
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1440 octave_idx_type nr = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1441 octave_idx_type nc = dim2 ();
5681 233d98d95659 [project @ 2006-03-16 17:48:55 by dbateman] dbateman parents: 5648 diff changeset	1442 octave_idx_type nz = nnz ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1443
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1444 octave_idx_type nel = numel (); // Can throw.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1445
19413 e354372e20f2 allow sparse arrays to be indexed by N-d arrays (bug #43855) John W. Eaton <jwe@octave.org> parents: 19410 diff changeset	1446 const dim_vector idx_dims = idx.orig_dimensions ().redim (2);
e354372e20f2 allow sparse arrays to be indexed by N-d arrays (bug #43855) John W. Eaton <jwe@octave.org> parents: 19410 diff changeset	1447
e354372e20f2 allow sparse arrays to be indexed by N-d arrays (bug #43855) John W. Eaton <jwe@octave.org> parents: 19410 diff changeset	1448 if (idx.is_colon ())
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1449 {
10494 e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1450 if (nc == 1)
e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1451 retval = *this;
e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1452 else
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1453 {
10494 e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1454 // Fast magic colon processing.
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1455 retval = Sparse<T, Alloc> (nel, 1, nz);
10494 e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1456
e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1457 for (octave_idx_type i = 0; i < nc; i++)
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1458 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1459 for (octave_idx_type j = cidx (i); j < cidx (i+1); j++)
10494 e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1460 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1461 retval.xdata (j) = data (j);
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1462 retval.xridx (j) = ridx (j) + i * nr;
10494 e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1463 }
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1464 }
10494 e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1465
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1466 retval.xcidx (0) = 0;
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1467 retval.xcidx (1) = nz;
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1468 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1469 }
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1470 else if (idx.extent (nel) > nel)
10421 99e9bae2d81e improve sparse indexing interface Jaroslav Hajek <highegg@gmail.com> parents: 10382 diff changeset	1471 {
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	1472 if (! resize_ok)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1473 octave::err_index_out_of_range (1, 1, idx.extent (nel), nel, dims ());
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	1474
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1475 // resize_ok is completely handled here.
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	1476 octave_idx_type ext = idx.extent (nel);
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1477 Sparse<T, Alloc> tmp = *this;
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	1478 tmp.resize1 (ext);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21100 diff changeset	1479 retval = tmp.index (idx);
10421 99e9bae2d81e improve sparse indexing interface Jaroslav Hajek <highegg@gmail.com> parents: 10382 diff changeset	1480 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1481 else if (nr == 1 && nc == 1)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1482 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1483 // You have to be pretty sick to get to this bit of code,
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1484 // since you have a scalar stored as a sparse matrix, and
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	1485 // then want to make a dense matrix with sparse representation.
b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	1486 // Ok, we'll do it, but you deserve what you get!!
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1487 retval = (Sparse<T, Alloc> (idx_dims(0), idx_dims(1), nz ? data (0) : T ()));
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1488 }
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1489 else if (nc == 1)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1490 {
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1491 // Sparse column vector.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1492 octave_idx_type lb, ub;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1493
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1494 if (idx.is_scalar ())
10382 1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1495 {
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1496 // Scalar index - just a binary lookup.
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1497 octave_idx_type i = lblookup (ridx (), nz, idx(0));
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1498 if (i < nz && ridx (i) == idx(0))
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1499 retval = Sparse (1, 1, data (i));
10382 1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1500 else
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1501 retval = Sparse (1, 1);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1502 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1503 else if (idx.is_cont_range (nel, lb, ub))
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1504 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1505 // Special-case a contiguous range.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1506 // Look-up indices first.
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1507 octave_idx_type li = lblookup (ridx (), nz, lb);
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1508 octave_idx_type ui = lblookup (ridx (), nz, ub);
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1509 // Copy data and adjust indices.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1510 octave_idx_type nz_new = ui - li;
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1511 retval = Sparse<T, Alloc> (ub - lb, 1, nz_new);
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1512 std::copy_n (data () + li, nz_new, retval.data ());
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1513 mx_inline_sub (nz_new, retval.xridx (), ridx () + li, lb);
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1514 retval.xcidx (1) = nz_new;
10382 1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1515 }
23592 80e3bfb7bd5a maint: Deprecate is_vector and replace with isvector. Rik <rik@octave.org> parents: 23577 diff changeset	1516 else if (idx.is_permutation (nel) && idx.isvector ())
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1517 {
f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1518 if (idx.is_range () && idx.increment () == -1)
f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1519 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1520 retval = Sparse<T, Alloc> (nr, 1, nz);
14433 ec660526ae50 Fix sparse range indexing bug (bug #35570) Marco Caliari <marco.caliari@univr.it> parents: 14138 diff changeset	1521
ec660526ae50 Fix sparse range indexing bug (bug #35570) Marco Caliari <marco.caliari@univr.it> parents: 14138 diff changeset	1522 for (octave_idx_type j = 0; j < nz; j++)
ec660526ae50 Fix sparse range indexing bug (bug #35570) Marco Caliari <marco.caliari@univr.it> parents: 14138 diff changeset	1523 retval.ridx (j) = nr - ridx (nz - j - 1) - 1;
ec660526ae50 Fix sparse range indexing bug (bug #35570) Marco Caliari <marco.caliari@univr.it> parents: 14138 diff changeset	1524
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1525 std::copy_n (cidx (), 2, retval.cidx ());
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1526 std::reverse_copy (data (), data () + nz, retval.data ());
f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1527 }
f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1528 else
f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1529 {
f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1530 Array<T> tmp = array_value ();
f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1531 tmp = tmp.index (idx);
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1532 retval = Sparse<T, Alloc> (tmp);
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1533 }
f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1534 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1535 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1536 {
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1537 // If indexing a sparse column vector by a vector, the result is a
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1538 // sparse column vector, otherwise it inherits the shape of index.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1539 // Vector transpose is cheap, so do it right here.
19416 06b23f224f52 fix problem with changeset e354372e20f2 (bug #43855) John W. Eaton <jwe@octave.org> parents: 19413 diff changeset	1540
06b23f224f52 fix problem with changeset e354372e20f2 (bug #43855) John W. Eaton <jwe@octave.org> parents: 19413 diff changeset	1541 Array<octave_idx_type> tmp_idx = idx.as_array ().as_matrix ();
06b23f224f52 fix problem with changeset e354372e20f2 (bug #43855) John W. Eaton <jwe@octave.org> parents: 19413 diff changeset	1542
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	1543 const Array<octave_idx_type> idxa = (idx_dims(0) == 1
19416 06b23f224f52 fix problem with changeset e354372e20f2 (bug #43855) John W. Eaton <jwe@octave.org> parents: 19413 diff changeset	1544 ? tmp_idx.transpose ()
06b23f224f52 fix problem with changeset e354372e20f2 (bug #43855) John W. Eaton <jwe@octave.org> parents: 19413 diff changeset	1545 : tmp_idx);
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1546
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1547 octave_idx_type new_nr = idxa.rows ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1548 octave_idx_type new_nc = idxa.cols ();
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1549
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1550 // Lookup.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1551 // FIXME: Could specialize for sorted idx?
27666 3e8faed1b7d8 Remove wrapper template class NoAlias<T> (bug #56752) Carlo de Falco <carlo.defalco@polimi.it> parents: 27387 diff changeset	1552 Array<octave_idx_type> lidx (dim_vector (new_nr, new_nc));
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1553 for (octave_idx_type i = 0; i < new_nr*new_nc; i++)
27666 3e8faed1b7d8 Remove wrapper template class NoAlias<T> (bug #56752) Carlo de Falco <carlo.defalco@polimi.it> parents: 27387 diff changeset	1554 lidx.xelem (i) = lblookup (ridx (), nz, idxa(i));
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1555
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1556 // Count matches.
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1557 retval = Sparse<T, Alloc> (idxa.rows (), idxa.cols ());
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1558 for (octave_idx_type j = 0; j < new_nc; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1559 {
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1560 octave_idx_type nzj = 0;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1561 for (octave_idx_type i = 0; i < new_nr; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1562 {
27666 3e8faed1b7d8 Remove wrapper template class NoAlias<T> (bug #56752) Carlo de Falco <carlo.defalco@polimi.it> parents: 27387 diff changeset	1563 octave_idx_type l = lidx.xelem (i, j);
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1564 if (l < nz && ridx (l) == idxa(i, j))
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1565 nzj++;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1566 else
27666 3e8faed1b7d8 Remove wrapper template class NoAlias<T> (bug #56752) Carlo de Falco <carlo.defalco@polimi.it> parents: 27387 diff changeset	1567 lidx.xelem (i, j) = nz;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1568 }
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1569 retval.xcidx (j+1) = retval.xcidx (j) + nzj;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1570 }
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1571
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1572 retval.change_capacity (retval.xcidx (new_nc));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	1573
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1574 // Copy data and set row indices.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1575 octave_idx_type k = 0;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1576 for (octave_idx_type j = 0; j < new_nc; j++)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1577 for (octave_idx_type i = 0; i < new_nr; i++)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1578 {
27666 3e8faed1b7d8 Remove wrapper template class NoAlias<T> (bug #56752) Carlo de Falco <carlo.defalco@polimi.it> parents: 27387 diff changeset	1579 octave_idx_type l = lidx.xelem (i, j);
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1580 if (l < nz)
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1581 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1582 retval.data (k) = data (l);
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1583 retval.xridx (k++) = i;
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1584 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1585 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1586 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1587 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1588 else if (nr == 1)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1589 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1590 octave_idx_type lb, ub;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1591 if (idx.is_scalar ())
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1592 retval = Sparse<T, Alloc> (1, 1, elem (0, idx(0)));
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1593 else if (idx.is_cont_range (nel, lb, ub))
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1594 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1595 // Special-case a contiguous range.
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1596 octave_idx_type lbi = cidx (lb);
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1597 octave_idx_type ubi = cidx (ub);
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1598 octave_idx_type new_nz = ubi - lbi;
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1599 retval = Sparse<T, Alloc> (1, ub - lb, new_nz);
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1600 std::copy_n (data () + lbi, new_nz, retval.data ());
19381 af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19078 diff changeset	1601 std::fill_n (retval.ridx (), new_nz, static_cast<octave_idx_type> (0));
10432 10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1602 mx_inline_sub (ub - lb + 1, retval.cidx (), cidx () + lb, lbi);
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1603 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1604 else
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1605 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1606 // Sparse row vectors occupy O(nr) storage anyway, so let's just
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1607 // convert the matrix to full, index, and sparsify the result.
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1608 retval = Sparse<T, Alloc> (array_value ().index (idx));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1609 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1610 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1611 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1612 {
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1613 if (nr != 0 && idx.is_scalar ())
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1614 retval = Sparse<T, Alloc> (1, 1, elem (idx(0) % nr, idx(0) / nr));
10421 99e9bae2d81e improve sparse indexing interface Jaroslav Hajek <highegg@gmail.com> parents: 10382 diff changeset	1615 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1616 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	1617 // Indexing a non-vector sparse matrix by linear indexing.
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1618 // I suppose this is rare (and it may easily overflow), so let's take
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1619 // the easy way, and reshape first to column vector, which is already
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1620 // handled above.
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1621 retval = index (octave::idx_vector::colon).index (idx);
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1622 // In this case we're supposed to always inherit the shape, but
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1623 // column(row) doesn't do it, so we'll do it instead.
10432 10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1624 if (idx_dims(0) == 1 && idx_dims(1) != 1)
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1625 retval = retval.transpose ();
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1626 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1627 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1628
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1629 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1630 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1631
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1632 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	1633 OCTAVE_API
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1634 Sparse<T, Alloc>
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1635 Sparse<T, Alloc>::index (const octave::idx_vector& idx_i,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1636 const octave::idx_vector& idx_j,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1637 bool resize_ok) const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1638 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1639 Sparse<T, Alloc> retval;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1640
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1641 assert (ndims () == 2);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1642
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1643 octave_idx_type nr = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1644 octave_idx_type nc = dim2 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1645
10421 99e9bae2d81e improve sparse indexing interface Jaroslav Hajek <highegg@gmail.com> parents: 10382 diff changeset	1646 octave_idx_type n = idx_i.length (nr);
99e9bae2d81e improve sparse indexing interface Jaroslav Hajek <highegg@gmail.com> parents: 10382 diff changeset	1647 octave_idx_type m = idx_j.length (nc);
99e9bae2d81e improve sparse indexing interface Jaroslav Hajek <highegg@gmail.com> parents: 10382 diff changeset	1648
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1649 octave_idx_type lb, ub;
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1650
10432 10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1651 if (idx_i.extent (nr) > nr \|\| idx_j.extent (nc) > nc)
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1652 {
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1653 // resize_ok is completely handled here.
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1654 if (resize_ok)
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1655 {
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1656 octave_idx_type ext_i = idx_i.extent (nr);
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1657 octave_idx_type ext_j = idx_j.extent (nc);
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1658 Sparse<T, Alloc> tmp = *this;
10432 10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1659 tmp.resize (ext_i, ext_j);
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1660 retval = tmp.index (idx_i, idx_j);
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1661 }
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1662 else if (idx_i.extent (nr) > nr)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1663 octave::err_index_out_of_range (2, 1, idx_i.extent (nr), nr, dims ());
10432 10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1664 else
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1665 octave::err_index_out_of_range (2, 2, idx_j.extent (nc), nc, dims ());
10432 10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1666 }
16803 f4eef73b6e90 When indexing scalars stored as sparse matrices, convert to an array, index and then resparsify (bug #37774) David Bateman <dbateman@free.fr> parents: 15358 diff changeset	1667 else if (nr == 1 && nc == 1)
f4eef73b6e90 When indexing scalars stored as sparse matrices, convert to an array, index and then resparsify (bug #37774) David Bateman <dbateman@free.fr> parents: 15358 diff changeset	1668 {
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1669 // Scalars stored as sparse matrices occupy more memory than
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1670 // a scalar, so let's just convert the matrix to full, index,
16803 f4eef73b6e90 When indexing scalars stored as sparse matrices, convert to an array, index and then resparsify (bug #37774) David Bateman <dbateman@free.fr> parents: 15358 diff changeset	1671 // and sparsify the result.
f4eef73b6e90 When indexing scalars stored as sparse matrices, convert to an array, index and then resparsify (bug #37774) David Bateman <dbateman@free.fr> parents: 15358 diff changeset	1672
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1673 retval = Sparse<T, Alloc> (array_value ().index (idx_i, idx_j));
16803 f4eef73b6e90 When indexing scalars stored as sparse matrices, convert to an array, index and then resparsify (bug #37774) David Bateman <dbateman@free.fr> parents: 15358 diff changeset	1674 }
10432 10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1675 else if (idx_i.is_colon ())
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1676 {
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	1677 // Great, we're just manipulating columns. This is going to be quite
10432 10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1678 // efficient, because the columns can stay compressed as they are.
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1679 if (idx_j.is_colon ())
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1680 retval = *this; // Shallow copy.
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1681 else if (idx_j.is_cont_range (nc, lb, ub))
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1682 {
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1683 // Special-case a contiguous range.
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1684 octave_idx_type lbi = cidx (lb);
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1685 octave_idx_type ubi = cidx (ub);
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1686 octave_idx_type new_nz = ubi - lbi;
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1687 retval = Sparse<T, Alloc> (nr, ub - lb, new_nz);
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1688 std::copy_n (data () + lbi, new_nz, retval.data ());
1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1689 std::copy_n (ridx () + lbi, new_nz, retval.ridx ());
10432 10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1690 mx_inline_sub (ub - lb + 1, retval.cidx (), cidx () + lb, lbi);
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1691 }
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1692 else
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1693 {
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1694 // Count new nonzero elements.
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1695 retval = Sparse<T, Alloc> (nr, m);
10432 10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1696 for (octave_idx_type j = 0; j < m; j++)
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1697 {
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1698 octave_idx_type jj = idx_j(j);
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1699 retval.xcidx (j+1) = retval.xcidx (j) + (cidx (jj+1) - cidx (jj));
10432 10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1700 }
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1701
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1702 retval.change_capacity (retval.xcidx (m));
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1703
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1704 // Copy data & indices.
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1705 for (octave_idx_type j = 0; j < m; j++)
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1706 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1707 octave_idx_type ljj = cidx (idx_j(j));
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1708 octave_idx_type lj = retval.xcidx (j);
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1709 octave_idx_type nzj = retval.xcidx (j+1) - lj;
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1710
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1711 std::copy_n (data () + ljj, nzj, retval.data () + lj);
1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1712 std::copy_n (ridx () + ljj, nzj, retval.ridx () + lj);
10432 10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1713 }
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1714 }
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1715 }
23592 80e3bfb7bd5a maint: Deprecate is_vector and replace with isvector. Rik <rik@octave.org> parents: 23577 diff changeset	1716 else if (nc == 1 && idx_j.is_colon_equiv (nc) && idx_i.isvector ())
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1717 {
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	1718 // It's actually vector indexing. The 1D index is specialized for that.
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1719 retval = index (idx_i);
14790 b8041f48b0ff Return sparse column vectors when the indexing allows it (bug #36656) David Bateman <dbateman@free.fr> parents: 14789 diff changeset	1720
b8041f48b0ff Return sparse column vectors when the indexing allows it (bug #36656) David Bateman <dbateman@free.fr> parents: 14789 diff changeset	1721 // If nr == 1 then the vector indexing will return a column vector!!
b8041f48b0ff Return sparse column vectors when the indexing allows it (bug #36656) David Bateman <dbateman@free.fr> parents: 14789 diff changeset	1722 if (nr == 1)
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14844 diff changeset	1723 retval.transpose ();
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1724 }
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1725 else if (idx_i.is_scalar ())
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1726 {
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1727 octave_idx_type ii = idx_i(0);
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1728 retval = Sparse<T, Alloc> (1, m);
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1729 OCTAVE_LOCAL_BUFFER (octave_idx_type, ij, m);
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1730 for (octave_idx_type j = 0; j < m; j++)
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1731 {
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1732 octave_quit ();
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1733 octave_idx_type jj = idx_j(j);
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1734 octave_idx_type lj = cidx (jj);
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1735 octave_idx_type nzj = cidx (jj+1) - cidx (jj);
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1736
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1737 // Scalar index - just a binary lookup.
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1738 octave_idx_type i = lblookup (ridx () + lj, nzj, ii);
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1739 if (i < nzj && ridx (i+lj) == ii)
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1740 {
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1741 ij[j] = i + lj;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1742 retval.xcidx (j+1) = retval.xcidx (j) + 1;
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1743 }
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1744 else
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1745 retval.xcidx (j+1) = retval.xcidx (j);
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1746 }
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1747
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1748 retval.change_capacity (retval.xcidx (m));
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1749
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1750 // Copy data, adjust row indices.
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1751 for (octave_idx_type j = 0; j < m; j++)
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1752 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1753 octave_idx_type i = retval.xcidx (j);
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1754 if (retval.xcidx (j+1) > i)
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1755 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1756 retval.xridx (i) = 0;
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1757 retval.xdata (i) = data (ij[j]);
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1758 }
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1759 }
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1760 }
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1761 else if (idx_i.is_cont_range (nr, lb, ub))
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1762 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1763 retval = Sparse<T, Alloc> (n, m);
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1764 OCTAVE_LOCAL_BUFFER (octave_idx_type, li, m);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1765 OCTAVE_LOCAL_BUFFER (octave_idx_type, ui, m);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1766 for (octave_idx_type j = 0; j < m; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1767 {
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1768 octave_quit ();
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1769 octave_idx_type jj = idx_j(j);
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1770 octave_idx_type lj = cidx (jj);
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1771 octave_idx_type nzj = cidx (jj+1) - cidx (jj);
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1772 octave_idx_type lij, uij;
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1773
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1774 // Lookup indices.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1775 li[j] = lij = lblookup (ridx () + lj, nzj, lb) + lj;
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1776 ui[j] = uij = lblookup (ridx () + lj, nzj, ub) + lj;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1777 retval.xcidx (j+1) = retval.xcidx (j) + ui[j] - li[j];
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1778 }
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1779
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1780 retval.change_capacity (retval.xcidx (m));
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1781
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1782 // Copy data, adjust row indices.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1783 for (octave_idx_type j = 0, k = 0; j < m; j++)
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1784 {
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1785 octave_quit ();
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1786 for (octave_idx_type i = li[j]; i < ui[j]; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1787 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1788 retval.xdata (k) = data (i);
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1789 retval.xridx (k++) = ridx (i) - lb;
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1790 }
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1791 }
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1792 }
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1793 else if (idx_i.is_permutation (nr))
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1794 {
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1795 // The columns preserve their length, just need to renumber and sort them.
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1796 // Count new nonzero elements.
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1797 retval = Sparse<T, Alloc> (nr, m);
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1798 for (octave_idx_type j = 0; j < m; j++)
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1799 {
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1800 octave_idx_type jj = idx_j(j);
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1801 retval.xcidx (j+1) = retval.xcidx (j) + (cidx (jj+1) - cidx (jj));
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1802 }
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1803
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1804 retval.change_capacity (retval.xcidx (m));
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1805
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1806 octave_quit ();
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1807
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1808 if (idx_i.is_range () && idx_i.increment () == -1)
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1809 {
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	1810 // It's nr:-1:1. Just flip all columns.
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1811 for (octave_idx_type j = 0; j < m; j++)
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1812 {
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1813 octave_quit ();
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1814 octave_idx_type jj = idx_j(j);
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1815 octave_idx_type lj = cidx (jj);
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1816 octave_idx_type nzj = cidx (jj+1) - cidx (jj);
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1817 octave_idx_type li = retval.xcidx (j);
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1818 octave_idx_type uj = lj + nzj - 1;
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1819 for (octave_idx_type i = 0; i < nzj; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1820 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1821 retval.xdata (li + i) = data (uj - i); // Copy in reverse order.
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1822 retval.xridx (li + i) = nr - 1 - ridx (uj - i); // Ditto with transform.
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1823 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1824 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1825 }
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1826 else
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1827 {
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1828 // Get inverse permutation.
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1829 octave::idx_vector idx_iinv = idx_i.inverse_permutation (nr);
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1830 const octave_idx_type *iinv = idx_iinv.raw ();
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1831
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1832 // Scatter buffer.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1833 OCTAVE_LOCAL_BUFFER (T, scb, nr);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1834 octave_idx_type *rri = retval.ridx ();
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1835
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1836 for (octave_idx_type j = 0; j < m; j++)
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1837 {
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1838 octave_quit ();
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1839 octave_idx_type jj = idx_j(j);
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1840 octave_idx_type lj = cidx (jj);
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1841 octave_idx_type nzj = cidx (jj+1) - cidx (jj);
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1842 octave_idx_type li = retval.xcidx (j);
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1843 // Scatter the column, transform indices.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1844 for (octave_idx_type i = 0; i < nzj; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1845 scb[rri[li + i] = iinv[ridx (lj + i)]] = data (lj + i);
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1846
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1847 octave_quit ();
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1848
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1849 // Sort them.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1850 std::sort (rri + li, rri + li + nzj);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1851
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1852 // Gather.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1853 for (octave_idx_type i = 0; i < nzj; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1854 retval.xdata (li + i) = scb[rri[li + i]];
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1855 }
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1856 }
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1857
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1858 }
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1859 else if (idx_j.is_colon ())
f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1860 {
21562 6c2fd62db1f7 maint: Eliminate accidental double spaces in code. Rik <rik@octave.org> parents: 21337 diff changeset	1861 // This requires uncompressing columns, which is generally costly,
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1862 // so we rely on the efficient transpose to handle this.
f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1863 // It may still make sense to optimize some cases here.
f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1864 retval = transpose ();
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1865 retval = retval.index (octave::idx_vector::colon, idx_i);
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1866 retval = retval.transpose ();
f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1867 }
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1868 else
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1869 {
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1870 // A(I, J) is decomposed into A(:, J)(I, :).
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1871 retval = index (octave::idx_vector::colon, idx_j);
29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1872 retval = retval.index (idx_i, octave::idx_vector::colon);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1873 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1874
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1875 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1876 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1877
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1878 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	1879 OCTAVE_API
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1880 void
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1881 Sparse<T, Alloc>::assign (const octave::idx_vector& idx,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1882 const Sparse<T, Alloc>& rhs)
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1883 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1884 Sparse<T, Alloc> retval;
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1885
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1886 assert (ndims () == 2);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1887
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1888 octave_idx_type nr = dim1 ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1889 octave_idx_type nc = dim2 ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1890 octave_idx_type nz = nnz ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1891
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1892 octave_idx_type n = numel (); // Can throw.
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1893
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1894 octave_idx_type rhl = rhs.numel ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1895
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1896 if (idx.length (n) == rhl)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1897 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1898 if (rhl == 0)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1899 return;
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1900
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1901 octave_idx_type nx = idx.extent (n);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	1902 // Try to resize first if necessary.
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1903 if (nx != n)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1904 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1905 resize1 (nx);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1906 n = numel ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1907 nr = rows ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1908 nc = cols ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1909 // nz is preserved.
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1910 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1911
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1912 if (idx.is_colon ())
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1913 {
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	1914 *this = rhs.reshape (m_dimensions);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1915 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1916 else if (nc == 1 && rhs.cols () == 1)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1917 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1918 // Sparse column vector to sparse column vector assignment.
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1919
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1920 octave_idx_type lb, ub;
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1921 if (idx.is_cont_range (nr, lb, ub))
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1922 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1923 // Special-case a contiguous range.
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1924 // Look-up indices first.
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1925 octave_idx_type li = lblookup (ridx (), nz, lb);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1926 octave_idx_type ui = lblookup (ridx (), nz, ub);
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1927 octave_idx_type rnz = rhs.nnz ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1928 octave_idx_type new_nz = nz - (ui - li) + rnz;
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1929
20229 5dfaaaae784f Deprecate Array::capacity() and Sparse::capacity() for numel() and nzmax(). Carnë Draug <carandraug@octave.org> parents: 20218 diff changeset	1930 if (new_nz >= nz && new_nz <= nzmax ())
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1931 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1932 // Adding/overwriting elements, enough capacity allocated.
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1933
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1934 if (new_nz > nz)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1935 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1936 // Make room first.
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1937 std::copy_backward (data () + ui, data () + nz,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1938 data () + nz + rnz);
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1939 std::copy_backward (ridx () + ui, ridx () + nz,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1940 ridx () + nz + rnz);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1941 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	1942
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1943 // Copy data and adjust indices from rhs.
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1944 std::copy_n (rhs.data (), rnz, data () + li);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1945 mx_inline_add (rnz, ridx () + li, rhs.ridx (), lb);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1946 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1947 else
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1948 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1949 // Clearing elements or exceeding capacity, allocate afresh
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1950 // and paste pieces.
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1951 const Sparse<T, Alloc> tmp = *this;
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1952 *this = Sparse<T, Alloc> (nr, 1, new_nz);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1953
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1954 // Head ...
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1955 std::copy_n (tmp.data (), li, data ());
1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1956 std::copy_n (tmp.ridx (), li, ridx ());
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1957
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1958 // new stuff ...
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	1959 std::copy_n (rhs.data (), rnz, data () + li);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1960 mx_inline_add (rnz, ridx () + li, rhs.ridx (), lb);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1961
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1962 // ...tail
19381 af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19078 diff changeset	1963 std::copy (tmp.data () + ui, tmp.data () + nz,
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1964 data () + li + rnz);
19381 af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19078 diff changeset	1965 std::copy (tmp.ridx () + ui, tmp.ridx () + nz,
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1966 ridx () + li + rnz);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1967 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1968
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1969 cidx (1) = new_nz;
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1970 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1971 else if (idx.is_range () && idx.increment () == -1)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1972 {
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	1973 // It's s(u:-1:l) = r. Reverse the assignment.
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1974 assign (idx.sorted (), rhs.index (octave::idx_vector (rhl - 1, 0, -1)));
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1975 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1976 else if (idx.is_permutation (n))
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1977 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1978 *this = rhs.index (idx.inverse_permutation (n));
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1979 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1980 else if (rhs.nnz () == 0)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1981 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1982 // Elements are being zeroed.
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1983 octave_idx_type *ri = ridx ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1984 for (octave_idx_type i = 0; i < rhl; i++)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1985 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1986 octave_idx_type iidx = idx(i);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1987 octave_idx_type li = lblookup (ri, nz, iidx);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1988 if (li != nz && ri[li] == iidx)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	1989 xdata (li) = T ();
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1990 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1991
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1992 maybe_compress (true);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1993 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1994 else
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1995 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	1996 const Sparse<T, Alloc> tmp = *this;
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1997 octave_idx_type new_nz = nz + rhl;
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	1998 // Disassembly our matrix...
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1999 Array<octave_idx_type> new_ri (dim_vector (new_nz, 1));
57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2000 Array<T> new_data (dim_vector (new_nz, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32633 diff changeset	2001 std::copy_n (tmp.ridx (), nz, new_ri.rwdata ());
f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32633 diff changeset	2002 std::copy_n (tmp.data (), nz, new_data.rwdata ());
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2003 // ... insert new data (densified) ...
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32633 diff changeset	2004 idx.copy_data (new_ri.rwdata () + nz);
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	2005 new_data.assign (octave::idx_vector (nz, new_nz), rhs.array_value ());
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2006 // ... reassembly.
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2007 *this = Sparse<T, Alloc> (new_data, new_ri, 0, nr, nc, false);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2008 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2009 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2010 else
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2011 {
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	2012 dim_vector save_dims = m_dimensions;
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	2013 *this = index (octave::idx_vector::colon);
29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	2014 assign (idx, rhs.index (octave::idx_vector::colon));
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2015 *this = reshape (save_dims);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2016 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2017 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2018 else if (rhl == 1)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2019 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2020 rhl = idx.length (n);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2021 if (rhs.nnz () != 0)
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2022 assign (idx, Sparse<T, Alloc> (rhl, 1, rhs.data (0)));
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2023 else
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2024 assign (idx, Sparse<T, Alloc> (rhl, 1));
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2025 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2026 else
30394 f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30099 diff changeset	2027 octave::err_nonconformant ("=", dim_vector(idx.length (n), 1), rhs.dims());
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2028 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2029
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2030 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	2031 OCTAVE_API
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2032 void
32590 3c2c585965cc maint: C++ style check for liboctave/ before 9.1 release. Rik <rik@octave.org> parents: 32513 diff changeset	2033 Sparse<T, Alloc>::assign (const octave::idx_vector& idx, const T& rhs)
29845 2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2034 {
2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2035 // FIXME: Converting the RHS and forwarding to the sparse matrix
2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2036 // assignment function is simpler, but it might be good to have a
2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2037 // specialization...
2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2038
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2039 assign (idx, Sparse<T, Alloc> (1, 1, rhs));
29845 2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2040 }
2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2041
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2042 template <typename T, typename Alloc>
29845 2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2043 OCTAVE_API
2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2044 void
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2045 Sparse<T, Alloc>::assign (const octave::idx_vector& idx_i,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2046 const octave::idx_vector& idx_j,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2047 const Sparse<T, Alloc>& rhs)
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2048 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2049 Sparse<T, Alloc> retval;
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2050
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2051 assert (ndims () == 2);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2052
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2053 octave_idx_type nr = dim1 ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2054 octave_idx_type nc = dim2 ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2055 octave_idx_type nz = nnz ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2056
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2057 octave_idx_type n = rhs.rows ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2058 octave_idx_type m = rhs.columns ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2059
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	2060 // FIXME: this should probably be written more like the
12184 d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2061 // Array<T>::assign function...
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2062
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2063 bool orig_zero_by_zero = (nr == 0 && nc == 0);
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2064
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2065 if (orig_zero_by_zero \|\| (idx_i.length (nr) == n && idx_j.length (nc) == m))
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2066 {
12184 d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2067 octave_idx_type nrx;
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2068 octave_idx_type ncx;
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2069
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2070 if (orig_zero_by_zero)
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2071 {
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2072 if (idx_i.is_colon ())
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2073 {
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2074 nrx = n;
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2075
12184 d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2076 if (idx_j.is_colon ())
12318 211f8c905a4f sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 12184 diff changeset	2077 ncx = m;
12184 d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2078 else
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2079 ncx = idx_j.extent (nc);
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2080 }
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2081 else if (idx_j.is_colon ())
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2082 {
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2083 nrx = idx_i.extent (nr);
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2084 ncx = m;
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2085 }
12318 211f8c905a4f sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 12184 diff changeset	2086 else
211f8c905a4f sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 12184 diff changeset	2087 {
211f8c905a4f sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 12184 diff changeset	2088 nrx = idx_i.extent (nr);
211f8c905a4f sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 12184 diff changeset	2089 ncx = idx_j.extent (nc);
211f8c905a4f sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 12184 diff changeset	2090 }
12184 d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2091 }
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2092 else
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2093 {
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2094 nrx = idx_i.extent (nr);
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2095 ncx = idx_j.extent (nc);
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2096 }
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2097
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2098 // Try to resize first if necessary.
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2099 if (nrx != nr \|\| ncx != nc)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2100 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2101 resize (nrx, ncx);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2102 nr = rows ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2103 nc = cols ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2104 // nz is preserved.
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2105 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2106
12184 d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2107 if (n == 0 \|\| m == 0)
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2108 return;
d8de1a28274c sparse matrix indexed assignment bug John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	2109
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2110 if (idx_i.is_colon ())
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2111 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2112 octave_idx_type lb, ub;
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	2113 // Great, we're just manipulating columns. This is going to be quite
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2114 // efficient, because the columns can stay compressed as they are.
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2115 if (idx_j.is_colon ())
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2116 *this = rhs; // Shallow copy.
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2117 else if (idx_j.is_cont_range (nc, lb, ub))
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2118 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2119 // Special-case a contiguous range.
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	2120 octave_idx_type li = cidx (lb);
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	2121 octave_idx_type ui = cidx (ub);
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	2122 octave_idx_type rnz = rhs.nnz ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	2123 octave_idx_type new_nz = nz - (ui - li) + rnz;
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2124
20229 5dfaaaae784f Deprecate Array::capacity() and Sparse::capacity() for numel() and nzmax(). Carnë Draug <carandraug@octave.org> parents: 20218 diff changeset	2125 if (new_nz >= nz && new_nz <= nzmax ())
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2126 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2127 // Adding/overwriting elements, enough capacity allocated.
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2128
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2129 if (new_nz > nz)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2130 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2131 // Make room first.
21255 6209f428426c Fix memory corruption allocating to sparse arrays (bug #42825). Lachlan Andrew <lachlanbis@gmail.com> parents: 19861 diff changeset	2132 std::copy_backward (data () + ui, data () + nz,
6209f428426c Fix memory corruption allocating to sparse arrays (bug #42825). Lachlan Andrew <lachlanbis@gmail.com> parents: 19861 diff changeset	2133 data () + new_nz);
6209f428426c Fix memory corruption allocating to sparse arrays (bug #42825). Lachlan Andrew <lachlanbis@gmail.com> parents: 19861 diff changeset	2134 std::copy_backward (ridx () + ui, ridx () + nz,
6209f428426c Fix memory corruption allocating to sparse arrays (bug #42825). Lachlan Andrew <lachlanbis@gmail.com> parents: 19861 diff changeset	2135 ridx () + new_nz);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2136 mx_inline_add2 (nc - ub, cidx () + ub + 1, new_nz - nz);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2137 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2138
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2139 // Copy data and indices from rhs.
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	2140 std::copy_n (rhs.data (), rnz, data () + li);
1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	2141 std::copy_n (rhs.ridx (), rnz, ridx () + li);
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	2142 mx_inline_add (ub - lb, cidx () + lb + 1, rhs.cidx () + 1,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	2143 li);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2144
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2145 assert (nnz () == new_nz);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2146 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2147 else
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2148 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2149 // Clearing elements or exceeding capacity, allocate afresh
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2150 // and paste pieces.
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2151 const Sparse<T, Alloc> tmp = *this;
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2152 *this = Sparse<T, Alloc> (nr, nc, new_nz);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2153
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2154 // Head...
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	2155 std::copy_n (tmp.data (), li, data ());
1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	2156 std::copy_n (tmp.ridx (), li, ridx ());
1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	2157 std::copy_n (tmp.cidx () + 1, lb, cidx () + 1);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2158
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2159 // new stuff...
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	2160 std::copy_n (rhs.data (), rnz, data () + li);
1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	2161 std::copy_n (rhs.ridx (), rnz, ridx () + li);
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	2162 mx_inline_add (ub - lb, cidx () + lb + 1, rhs.cidx () + 1,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	2163 li);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2164
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2165 // ...tail.
19381 af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19078 diff changeset	2166 std::copy (tmp.data () + ui, tmp.data () + nz,
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2167 data () + li + rnz);
19381 af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19078 diff changeset	2168 std::copy (tmp.ridx () + ui, tmp.ridx () + nz,
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2169 ridx () + li + rnz);
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	2170 mx_inline_add (nc - ub, cidx () + ub + 1,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	2171 tmp.cidx () + ub + 1, new_nz - nz);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2172
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2173 assert (nnz () == new_nz);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2174 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2175 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2176 else if (idx_j.is_range () && idx_j.increment () == -1)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2177 {
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	2178 // It's s(:,u:-1:l) = r. Reverse the assignment.
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	2179 assign (idx_i, idx_j.sorted (),
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	2180 rhs.index (idx_i, octave::idx_vector (m - 1, 0, -1)));
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2181 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2182 else if (idx_j.is_permutation (nc))
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2183 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2184 *this = rhs.index (idx_i, idx_j.inverse_permutation (nc));
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2185 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2186 else
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2187 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2188 const Sparse<T, Alloc> tmp = *this;
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2189 *this = Sparse<T, Alloc> (nr, nc);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2190 OCTAVE_LOCAL_BUFFER_INIT (octave_idx_type, jsav, nc, -1);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2191
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2192 // Assemble column lengths.
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2193 for (octave_idx_type i = 0; i < nc; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2194 xcidx (i+1) = tmp.cidx (i+1) - tmp.cidx (i);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2195
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2196 for (octave_idx_type i = 0; i < m; i++)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2197 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2198 octave_idx_type j =idx_j(i);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2199 jsav[j] = i;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2200 xcidx (j+1) = rhs.cidx (i+1) - rhs.cidx (i);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2201 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2202
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2203 // Make cumulative.
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2204 for (octave_idx_type i = 0; i < nc; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2205 xcidx (i+1) += xcidx (i);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2206
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2207 change_capacity (nnz ());
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2208
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2209 // Merge columns.
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2210 for (octave_idx_type i = 0; i < nc; i++)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2211 {
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	2212 octave_idx_type l = xcidx (i);
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	2213 octave_idx_type u = xcidx (i+1);
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	2214 octave_idx_type j = jsav[i];
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2215 if (j >= 0)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2216 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2217 // from rhs
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2218 octave_idx_type k = rhs.cidx (j);
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	2219 std::copy_n (rhs.data () + k, u - l, xdata () + l);
1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	2220 std::copy_n (rhs.ridx () + k, u - l, xridx () + l);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2221 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2222 else
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2223 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2224 // original
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2225 octave_idx_type k = tmp.cidx (i);
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	2226 std::copy_n (tmp.data () + k, u - l, xdata () + l);
1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23220 diff changeset	2227 std::copy_n (tmp.ridx () + k, u - l, xridx () + l);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2228 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2229 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2230
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2231 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2232 }
23592 80e3bfb7bd5a maint: Deprecate is_vector and replace with isvector. Rik <rik@octave.org> parents: 23577 diff changeset	2233 else if (nc == 1 && idx_j.is_colon_equiv (nc) && idx_i.isvector ())
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2234 {
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	2235 // It's just vector indexing. The 1D assign is specialized for that.
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2236 assign (idx_i, rhs);
f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2237 }
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2238 else if (idx_j.is_colon ())
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2239 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2240 if (idx_i.is_permutation (nr))
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2241 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2242 *this = rhs.index (idx_i.inverse_permutation (nr), idx_j);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2243 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2244 else
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2245 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2246 // FIXME: optimize more special cases?
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2247 // In general this requires unpacking the columns, which is slow,
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	2248 // especially for many small columns. OTOH, transpose is an
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2249 // efficient O(nr+nc+nnz) operation.
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2250 *this = transpose ();
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	2251 assign (octave::idx_vector::colon, idx_i, rhs.transpose ());
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2252 *this = transpose ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2253 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2254 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2255 else
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2256 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2257 // Split it into 2 assignments and one indexing.
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2258 Sparse<T, Alloc> tmp = index (octave::idx_vector::colon, idx_j);
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	2259 tmp.assign (idx_i, octave::idx_vector::colon, rhs);
29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	2260 assign (octave::idx_vector::colon, idx_j, tmp);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2261 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2262 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2263 else if (m == 1 && n == 1)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2264 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2265 n = idx_i.length (nr);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2266 m = idx_j.length (nc);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2267 if (rhs.nnz () != 0)
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2268 assign (idx_i, idx_j, Sparse<T, Alloc> (n, m, rhs.data (0)));
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2269 else
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2270 assign (idx_i, idx_j, Sparse<T, Alloc> (n, m));
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2271 }
22600 dd80fb1ef949 maint: minor style fixes for C++ code. John W. Eaton <jwe@octave.org> parents: 22489 diff changeset	2272 else if (idx_i.length (nr) == m && idx_j.length (nc) == n
dd80fb1ef949 maint: minor style fixes for C++ code. John W. Eaton <jwe@octave.org> parents: 22489 diff changeset	2273 && (n == 1 \|\| m == 1))
20673 3d8aee0b7415 Allow assigning row vector to column of Sparse array (bug #45589). Lachlan Andrew <lachlanbis@gmail.com> parents: 20542 diff changeset	2274 {
3d8aee0b7415 Allow assigning row vector to column of Sparse array (bug #45589). Lachlan Andrew <lachlanbis@gmail.com> parents: 20542 diff changeset	2275 assign (idx_i, idx_j, rhs.transpose ());
3d8aee0b7415 Allow assigning row vector to column of Sparse array (bug #45589). Lachlan Andrew <lachlanbis@gmail.com> parents: 20542 diff changeset	2276 }
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2277 else
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	2278 octave::err_nonconformant ("=", idx_i.length (nr), idx_j.length (nc), n, m);
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2279 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	2280
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2281 template <typename T, typename Alloc>
29845 2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2282 OCTAVE_API
2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2283 void
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2284 Sparse<T, Alloc>::assign (const octave::idx_vector& idx_i,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2285 const octave::idx_vector& idx_j,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2286 const T& rhs)
29845 2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2287 {
2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2288 // FIXME: Converting the RHS and forwarding to the sparse matrix
2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2289 // assignment function is simpler, but it might be good to have a
2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2290 // specialization...
2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2291
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2292 assign (idx_i, idx_j, Sparse<T, Alloc> (1, 1, rhs));
29845 2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2293 }
2ef9080ca017 allow more mixed-type assignments to work for sparse matrices (bug #60859) John W. Eaton <jwe@octave.org> parents: 29688 diff changeset	2294
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2295 // Can't use versions of these in Array.cc due to duplication of the
29981 0c3d248a3b44 maint: Code cleanup in Sparse::sort routines. Rik <rik@octave.org> parents: 29927 diff changeset	2296 // instantiations for Array<double and Sparse<double>, etc.
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21136 diff changeset	2297 template <typename T>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	2298 OCTAVE_API
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2299 bool
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2300 sparse_ascending_compare (typename ref_param<T>::type a,
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	2301 typename ref_param<T>::type b)
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2302 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2303 return (a < b);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2304 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2305
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21136 diff changeset	2306 template <typename T>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	2307 OCTAVE_API
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2308 bool
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2309 sparse_descending_compare (typename ref_param<T>::type a,
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	2310 typename ref_param<T>::type b)
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2311 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2312 return (a > b);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2313 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2314
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2315 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	2316 OCTAVE_API
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2317 Sparse<T, Alloc>
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2318 Sparse<T, Alloc>::sort (octave_idx_type dim, sortmode mode) const
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2319 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2320 Sparse<T, Alloc> m = *this;
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2321
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2322 octave_idx_type nr = m.rows ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2323 octave_idx_type nc = m.columns ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2324
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20229 diff changeset	2325 if (m.numel () < 1 \|\| dim > 1)
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2326 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2327
29981 0c3d248a3b44 maint: Code cleanup in Sparse::sort routines. Rik <rik@octave.org> parents: 29927 diff changeset	2328 bool sort_by_column = (dim > 0);
0c3d248a3b44 maint: Code cleanup in Sparse::sort routines. Rik <rik@octave.org> parents: 29927 diff changeset	2329 if (sort_by_column)
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2330 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2331 m = m.transpose ();
29981 0c3d248a3b44 maint: Code cleanup in Sparse::sort routines. Rik <rik@octave.org> parents: 29927 diff changeset	2332 std::swap (nr, nc);
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2333 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2334
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2335 octave_sort<T> lsort;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2336
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2337 if (mode == ASCENDING)
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	2338 lsort.set_compare (sparse_ascending_compare<T>);
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2339 else if (mode == DESCENDING)
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	2340 lsort.set_compare (sparse_descending_compare<T>);
7463 2467639bd8c0 eliminate UNDEFINED sort mode John W. Eaton <jwe@octave.org> parents: 7433 diff changeset	2341 else
23448 e1c02e7126a9 avoid calling abort if possible; include cstdlib for declaration if needed John W. Eaton <jwe@octave.org> parents: 23432 diff changeset	2342 (*current_liboctave_error_handler)
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2343 ("Sparse<T, Alloc>::sort: invalid MODE");
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2344
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2345 T *v = m.data ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2346 octave_idx_type *mcidx = m.cidx ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2347 octave_idx_type *mridx = m.ridx ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2348
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2349 for (octave_idx_type j = 0; j < nc; j++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2350 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2351 octave_idx_type ns = mcidx[j + 1] - mcidx[j];
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2352 lsort.sort (v, ns);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2353
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2354 octave_idx_type i;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2355 if (mode == ASCENDING)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2356 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2357 for (i = 0; i < ns; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2358 if (sparse_ascending_compare<T> (static_cast<T> (0), v[i]))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2359 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2360 }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2361 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2362 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2363 for (i = 0; i < ns; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2364 if (sparse_descending_compare<T> (static_cast<T> (0), v[i]))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2365 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2366 }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2367 for (octave_idx_type k = 0; k < i; k++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2368 mridx[k] = k;
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2369 for (octave_idx_type k = i; k < ns; k++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2370 mridx[k] = k - ns + nr;
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2371
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2372 v += ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2373 mridx += ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2374 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2375
29981 0c3d248a3b44 maint: Code cleanup in Sparse::sort routines. Rik <rik@octave.org> parents: 29927 diff changeset	2376 if (sort_by_column)
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	2377 m = m.transpose ();
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2378
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2379 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2380 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2381
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2382 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	2383 OCTAVE_API
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2384 Sparse<T, Alloc>
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2385 Sparse<T, Alloc>::sort (Array<octave_idx_type>& sidx,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2386 octave_idx_type dim, sortmode mode) const
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2387 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2388 Sparse<T, Alloc> m = *this;
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2389
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2390 octave_idx_type nr = m.rows ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2391 octave_idx_type nc = m.columns ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2392
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20229 diff changeset	2393 if (m.numel () < 1 \|\| dim > 1)
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2394 {
10703 5eb420d92307 fix sort and nth_element when trailing singleton dim is specified Jaroslav Hajek <highegg@gmail.com> parents: 10586 diff changeset	2395 sidx = Array<octave_idx_type> (dim_vector (nr, nc), 1);
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2396 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2397 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2398
29981 0c3d248a3b44 maint: Code cleanup in Sparse::sort routines. Rik <rik@octave.org> parents: 29927 diff changeset	2399 bool sort_by_column = (dim > 0);
0c3d248a3b44 maint: Code cleanup in Sparse::sort routines. Rik <rik@octave.org> parents: 29927 diff changeset	2400 if (sort_by_column)
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2401 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2402 m = m.transpose ();
29981 0c3d248a3b44 maint: Code cleanup in Sparse::sort routines. Rik <rik@octave.org> parents: 29927 diff changeset	2403 std::swap (nr, nc);
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2404 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2405
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	2406 octave_sort<T> indexed_sort;
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2407
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2408 if (mode == ASCENDING)
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	2409 indexed_sort.set_compare (sparse_ascending_compare<T>);
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2410 else if (mode == DESCENDING)
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	2411 indexed_sort.set_compare (sparse_descending_compare<T>);
7463 2467639bd8c0 eliminate UNDEFINED sort mode John W. Eaton <jwe@octave.org> parents: 7433 diff changeset	2412 else
23448 e1c02e7126a9 avoid calling abort if possible; include cstdlib for declaration if needed John W. Eaton <jwe@octave.org> parents: 23432 diff changeset	2413 (*current_liboctave_error_handler)
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2414 ("Sparse<T, Alloc>::sort: invalid MODE");
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2415
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2416 T *v = m.data ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2417 octave_idx_type *mcidx = m.cidx ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2418 octave_idx_type *mridx = m.ridx ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2419
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2420 sidx = Array<octave_idx_type> (dim_vector (nr, nc));
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	2421 OCTAVE_LOCAL_BUFFER (octave_idx_type, vi, nr);
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2422
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2423 for (octave_idx_type j = 0; j < nc; j++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2424 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2425 octave_idx_type ns = mcidx[j + 1] - mcidx[j];
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2426 octave_idx_type offset = j * nr;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2427
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2428 if (ns == 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2429 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2430 for (octave_idx_type k = 0; k < nr; k++)
29981 0c3d248a3b44 maint: Code cleanup in Sparse::sort routines. Rik <rik@octave.org> parents: 29927 diff changeset	2431 sidx(offset + k) = k;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2432 }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2433 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2434 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2435 for (octave_idx_type i = 0; i < ns; i++)
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	2436 vi[i] = mridx[i];
06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	2437
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2438 indexed_sort.sort (v, vi, ns);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2439
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2440 octave_idx_type i;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2441 if (mode == ASCENDING)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2442 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2443 for (i = 0; i < ns; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2444 if (sparse_ascending_compare<T> (static_cast<T> (0), v[i]))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2445 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2446 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2447 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2448 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2449 for (i = 0; i < ns; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2450 if (sparse_descending_compare<T> (static_cast<T> (0), v[i]))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2451 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2452 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2453
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2454 octave_idx_type ii = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2455 octave_idx_type jj = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2456 for (octave_idx_type k = 0; k < nr; k++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2457 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2458 if (ii < ns && mridx[ii] == k)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2459 ii++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2460 else
29981 0c3d248a3b44 maint: Code cleanup in Sparse::sort routines. Rik <rik@octave.org> parents: 29927 diff changeset	2461 sidx(offset + jj++) = k;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2462 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2463
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2464 for (octave_idx_type k = 0; k < i; k++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2465 {
29981 0c3d248a3b44 maint: Code cleanup in Sparse::sort routines. Rik <rik@octave.org> parents: 29927 diff changeset	2466 sidx(k + offset) = vi[k];
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2467 mridx[k] = k;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2468 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2469
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2470 for (octave_idx_type k = i; k < ns; k++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2471 {
29981 0c3d248a3b44 maint: Code cleanup in Sparse::sort routines. Rik <rik@octave.org> parents: 29927 diff changeset	2472 sidx(k - ns + nr + offset) = vi[k];
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2473 mridx[k] = k - ns + nr;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2474 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2475
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2476 v += ns;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2477 mridx += ns;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2478 }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2479 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2480
29981 0c3d248a3b44 maint: Code cleanup in Sparse::sort routines. Rik <rik@octave.org> parents: 29927 diff changeset	2481 if (sort_by_column)
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2482 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2483 m = m.transpose ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2484 sidx = sidx.transpose ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2485 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2486
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2487 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2488 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2489
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2490 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	2491 OCTAVE_API
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2492 Sparse<T, Alloc>
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2493 Sparse<T, Alloc>::diag (octave_idx_type k) const
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2494 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2495 octave_idx_type nnr = rows ();
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2496 octave_idx_type nnc = cols ();
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2497 Sparse<T, Alloc> d;
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2498
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2499 if (nnr == 0 \|\| nnc == 0)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2500 ; // do nothing
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2501 else if (nnr != 1 && nnc != 1)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2502 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2503 if (k > 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2504 nnc -= k;
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2505 else if (k < 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2506 nnr += k;
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2507
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2508 if (nnr > 0 && nnc > 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2509 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2510 octave_idx_type ndiag = (nnr < nnc) ? nnr : nnc;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2511
18812 9ac2357f19bc doc: Replace "non-zero" with "nonzero" to match existing usage. Rik <rik@octave.org> parents: 18678 diff changeset	2512 // Count the number of nonzero elements
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2513 octave_idx_type nel = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2514 if (k > 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2515 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2516 for (octave_idx_type i = 0; i < ndiag; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2517 if (elem (i, i+k) != 0.)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2518 nel++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2519 }
18678 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18278 diff changeset	2520 else if (k < 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2521 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2522 for (octave_idx_type i = 0; i < ndiag; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2523 if (elem (i-k, i) != 0.)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2524 nel++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2525 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2526 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2527 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2528 for (octave_idx_type i = 0; i < ndiag; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2529 if (elem (i, i) != 0.)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2530 nel++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2531 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2532
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2533 d = Sparse<T, Alloc> (ndiag, 1, nel);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2534 d.xcidx (0) = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2535 d.xcidx (1) = nel;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2536
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2537 octave_idx_type ii = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2538 if (k > 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2539 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2540 for (octave_idx_type i = 0; i < ndiag; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2541 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2542 T tmp = elem (i, i+k);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2543 if (tmp != 0.)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2544 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2545 d.xdata (ii) = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2546 d.xridx (ii++) = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2547 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2548 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2549 }
18678 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18278 diff changeset	2550 else if (k < 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2551 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2552 for (octave_idx_type i = 0; i < ndiag; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2553 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2554 T tmp = elem (i-k, i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2555 if (tmp != 0.)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2556 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2557 d.xdata (ii) = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2558 d.xridx (ii++) = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2559 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2560 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2561 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2562 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2563 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2564 for (octave_idx_type i = 0; i < ndiag; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2565 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2566 T tmp = elem (i, i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2567 if (tmp != 0.)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2568 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2569 d.xdata (ii) = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2570 d.xridx (ii++) = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2571 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2572 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2573 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2574 }
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2575 else
18278 00539b673cd4 Sparse.cc: Fix C++ function ambiguity (bug #41145). John W. Eaton <jwe@octave.org> parents: 18146 diff changeset	2576 {
00539b673cd4 Sparse.cc: Fix C++ function ambiguity (bug #41145). John W. Eaton <jwe@octave.org> parents: 18146 diff changeset	2577 // Matlab returns [] 0x1 for out-of-range diagonal
00539b673cd4 Sparse.cc: Fix C++ function ambiguity (bug #41145). John W. Eaton <jwe@octave.org> parents: 18146 diff changeset	2578
00539b673cd4 Sparse.cc: Fix C++ function ambiguity (bug #41145). John W. Eaton <jwe@octave.org> parents: 18146 diff changeset	2579 octave_idx_type nr = 0;
00539b673cd4 Sparse.cc: Fix C++ function ambiguity (bug #41145). John W. Eaton <jwe@octave.org> parents: 18146 diff changeset	2580 octave_idx_type nc = 1;
00539b673cd4 Sparse.cc: Fix C++ function ambiguity (bug #41145). John W. Eaton <jwe@octave.org> parents: 18146 diff changeset	2581 octave_idx_type nz = 0;
00539b673cd4 Sparse.cc: Fix C++ function ambiguity (bug #41145). John W. Eaton <jwe@octave.org> parents: 18146 diff changeset	2582
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2583 d = Sparse<T, Alloc> (nr, nc, nz);
18278 00539b673cd4 Sparse.cc: Fix C++ function ambiguity (bug #41145). John W. Eaton <jwe@octave.org> parents: 18146 diff changeset	2584 }
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2585 }
26448 5f402dfe8179 Sparse.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	2586 else // one of dimensions == 1 (vector)
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2587 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2588 octave_idx_type roff = 0;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2589 octave_idx_type coff = 0;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2590 if (k > 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2591 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2592 roff = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2593 coff = k;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2594 }
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2595 else if (k < 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2596 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2597 roff = -k;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2598 coff = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2599 }
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2600
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2601 if (nnr == 1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2602 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2603 octave_idx_type n = nnc + std::abs (k);
10506 bdf5d85cfc5e replace nzmax by nnz where appropriate in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10499 diff changeset	2604 octave_idx_type nz = nnz ();
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2605
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2606 d = Sparse<T, Alloc> (n, n, nz);
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2607
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2608 if (nnz () > 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2609 {
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2610 for (octave_idx_type i = 0; i < coff+1; i++)
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2611 d.xcidx (i) = 0;
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2612
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2613 for (octave_idx_type j = 0; j < nnc; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2614 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2615 for (octave_idx_type i = cidx (j); i < cidx (j+1); i++)
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2616 {
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2617 d.xdata (i) = data (i);
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2618 d.xridx (i) = j + roff;
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2619 }
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2620 d.xcidx (j + coff + 1) = cidx (j+1);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2621 }
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2622
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2623 for (octave_idx_type i = nnc + coff + 1; i < n + 1; i++)
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2624 d.xcidx (i) = nz;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2625 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2626 }
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2627 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2628 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2629 octave_idx_type n = nnr + std::abs (k);
10506 bdf5d85cfc5e replace nzmax by nnz where appropriate in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10499 diff changeset	2630 octave_idx_type nz = nnz ();
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2631
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2632 d = Sparse<T, Alloc> (n, n, nz);
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2633
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2634 if (nnz () > 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2635 {
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2636 octave_idx_type ii = 0;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2637 octave_idx_type ir = ridx (0);
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2638
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2639 for (octave_idx_type i = 0; i < coff+1; i++)
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2640 d.xcidx (i) = 0;
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2641
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2642 for (octave_idx_type i = 0; i < nnr; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2643 {
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2644 if (ir == i)
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2645 {
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2646 d.xdata (ii) = data (ii);
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2647 d.xridx (ii++) = ir + roff;
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2648
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2649 if (ii != nz)
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2650 ir = ridx (ii);
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2651 }
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2652 d.xcidx (i + coff + 1) = ii;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2653 }
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2654
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2655 for (octave_idx_type i = nnr + coff + 1; i < n+1; i++)
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2656 d.xcidx (i) = nz;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2657 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2658 }
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2659 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2660
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2661 return d;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2662 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2663
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2664 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	2665 OCTAVE_API
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2666 Sparse<T, Alloc>
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2667 Sparse<T, Alloc>::cat (int dim, octave_idx_type n,
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2668 const Sparse<T, Alloc> *sparse_list)
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2669 {
10716 f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2670 // Default concatenation.
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2671 bool (dim_vector::*concat_rule) (const dim_vector&, int) = &dim_vector::concat;
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2672
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2673 if (dim == -1 \|\| dim == -2)
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2674 {
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2675 concat_rule = &dim_vector::hvcat;
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2676 dim = -dim - 1;
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2677 }
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2678 else if (dim < 0)
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	2679 (*current_liboctave_error_handler) ("cat: invalid dimension");
10716 f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2680
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2681 dim_vector dv;
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2682 octave_idx_type total_nz = 0;
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	2683 if (dim != 0 && dim != 1)
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10533 diff changeset	2684 (*current_liboctave_error_handler)
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10533 diff changeset	2685 ("cat: invalid dimension for sparse concatenation");
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2686
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	2687 if (n == 1)
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	2688 return sparse_list[0];
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	2689
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	2690 for (octave_idx_type i = 0; i < n; i++)
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	2691 {
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	2692 if (! (dv.*concat_rule) (sparse_list[i].dims (), dim))
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	2693 (*current_liboctave_error_handler) ("cat: dimension mismatch");
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	2694
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	2695 total_nz += sparse_list[i].nnz ();
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	2696 }
7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21120 diff changeset	2697
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2698 Sparse<T, Alloc> retval (dv, total_nz);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11571 diff changeset	2699
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23534 diff changeset	2700 if (retval.isempty ())
10716 f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2701 return retval;
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2702
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2703 switch (dim)
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2704 {
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2705 case 0:
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2706 {
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	2707 // sparse vertcat. This is not efficiently handled by assignment,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	2708 // so we'll do it directly.
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2709 octave_idx_type l = 0;
10533 f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2710 for (octave_idx_type j = 0; j < dv(1); j++)
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2711 {
10533 f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2712 octave_quit ();
f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2713
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2714 octave_idx_type rcum = 0;
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2715 for (octave_idx_type i = 0; i < n; i++)
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2716 {
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2717 const Sparse<T, Alloc>& spi = sparse_list[i];
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	2718 // Skipping empty matrices. See the comment in Array.cc.
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23534 diff changeset	2719 if (spi.isempty ())
10533 f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2720 continue;
f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2721
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	2722 octave_idx_type kl = spi.cidx (j);
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	2723 octave_idx_type ku = spi.cidx (j+1);
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2724 for (octave_idx_type k = kl; k < ku; k++, l++)
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2725 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2726 retval.xridx (l) = spi.ridx (k) + rcum;
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2727 retval.xdata (l) = spi.data (k);
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2728 }
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2729
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2730 rcum += spi.rows ();
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2731 }
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2732
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2733 retval.xcidx (j+1) = l;
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2734 }
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2735
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2736 break;
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2737 }
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2738 case 1:
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2739 {
10533 f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2740 octave_idx_type l = 0;
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2741 for (octave_idx_type i = 0; i < n; i++)
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2742 {
10533 f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2743 octave_quit ();
f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2744
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21704 diff changeset	2745 // Skipping empty matrices. See the comment in Array.cc.
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23534 diff changeset	2746 if (sparse_list[i].isempty ())
10716 f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2747 continue;
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2748
10533 f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2749 octave_idx_type u = l + sparse_list[i].columns ();
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	2750 retval.assign (octave::idx_vector::colon, octave::idx_vector (l, u),
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	2751 sparse_list[i]);
10533 f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2752 l = u;
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2753 }
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2754
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2755 break;
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2756 }
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2757 default:
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10533 diff changeset	2758 assert (false);
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2759 }
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2760
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2761 return retval;
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2762 }
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	2763
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2764 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	2765 OCTAVE_API
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2766 Array<T>
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	2767 Sparse<T, Alloc>::array_value () const
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2768 {
27387 e1968e40e43f Remove use of NoAlias in construction of array_value from Sparse object (bug #56752). Carlo de Falco <carlo.defalco@polimi.it> parents: 27081 diff changeset	2769 Array<T> retval (dims (), T ());
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2770 if (rows () == 1)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2771 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2772 octave_idx_type i = 0;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2773 for (octave_idx_type j = 0, nc = cols (); j < nc; j++)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2774 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2775 if (cidx (j+1) > i)
27387 e1968e40e43f Remove use of NoAlias in construction of array_value from Sparse object (bug #56752). Carlo de Falco <carlo.defalco@polimi.it> parents: 27081 diff changeset	2776 retval.xelem (j) = data (i++);
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2777 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2778 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2779 else
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2780 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2781 for (octave_idx_type j = 0, nc = cols (); j < nc; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2782 for (octave_idx_type i = cidx (j), iu = cidx (j+1); i < iu; i++)
27387 e1968e40e43f Remove use of NoAlias in construction of array_value from Sparse object (bug #56752). Carlo de Falco <carlo.defalco@polimi.it> parents: 27081 diff changeset	2783 retval.xelem (ridx (i), j) = data (i);
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2784 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2785
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2786 return retval;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2787 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2788
21704 ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2789 template <typename T>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	2790 OCTAVE_API
21704 ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2791 std::istream&
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2792 read_sparse_matrix (std::istream& is, Sparse<T>& a,
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2793 T (*read_fcn) (std::istream&))
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2794 {
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2795 octave_idx_type nr = a.rows ();
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2796 octave_idx_type nc = a.cols ();
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2797 octave_idx_type nz = a.nzmax ();
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2798
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2799 if (nr > 0 && nc > 0)
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2800 {
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2801 octave_idx_type itmp;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2802 octave_idx_type jtmp;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2803 octave_idx_type iold = 0;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2804 octave_idx_type jold = 0;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2805 octave_idx_type ii = 0;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2806 T tmp;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2807
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2808 a.cidx (0) = 0;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2809 for (octave_idx_type i = 0; i < nz; i++)
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2810 {
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2811 itmp = 0; jtmp = 0;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2812 is >> itmp;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2813 itmp--;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2814
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2815 is >> jtmp;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2816 jtmp--;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2817
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2818 if (is.fail ())
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2819 {
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2820 is.clear();
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2821 std::string err_field;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2822 is >> err_field;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2823 (*current_liboctave_error_handler)
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	2824 ("invalid sparse matrix: element %" OCTAVE_IDX_TYPE_FORMAT ": "
21704 ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2825 "Symbols '%s' is not an integer format",
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2826 i+1, err_field.c_str ());
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2827 }
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2828
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2829 if (itmp < 0 \|\| itmp >= nr)
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2830 {
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2831 is.setstate (std::ios::failbit);
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2832
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2833 (*current_liboctave_error_handler)
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	2834 ("invalid sparse matrix: element %" OCTAVE_IDX_TYPE_FORMAT ": "
0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	2835 "row index = %" OCTAVE_IDX_TYPE_FORMAT " out of range",
21704 ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2836 i+1, itmp + 1);
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2837 }
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2838
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2839 if (jtmp < 0 \|\| jtmp >= nc)
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2840 {
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2841 is.setstate (std::ios::failbit);
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2842
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2843 (*current_liboctave_error_handler)
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	2844 ("invalid sparse matrix: element %" OCTAVE_IDX_TYPE_FORMAT ": "
0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	2845 "column index = %" OCTAVE_IDX_TYPE_FORMAT " out of range",
21704 ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2846 i+1, jtmp + 1);
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2847 }
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2848
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2849 if (jtmp < jold)
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2850 {
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2851 is.setstate (std::ios::failbit);
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2852
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2853 (*current_liboctave_error_handler)
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	2854 ("invalid sparse matrix: element %" OCTAVE_IDX_TYPE_FORMAT ":"
0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	2855 "column indices must appear in ascending order "
0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	2856 "(%" OCTAVE_IDX_TYPE_FORMAT " < %" OCTAVE_IDX_TYPE_FORMAT ")",
21704 ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2857 i+1, jtmp, jold);
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2858 }
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2859 else if (jtmp > jold)
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2860 {
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2861 for (octave_idx_type j = jold; j < jtmp; j++)
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2862 a.cidx (j+1) = ii;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2863 }
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2864 else if (itmp < iold)
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2865 {
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2866 is.setstate (std::ios::failbit);
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2867
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2868 (*current_liboctave_error_handler)
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	2869 ("invalid sparse matrix: element %" OCTAVE_IDX_TYPE_FORMAT ": "
21704 ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2870 "row indices must appear in ascending order in each column "
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26448 diff changeset	2871 "(%" OCTAVE_IDX_TYPE_FORMAT " < %" OCTAVE_IDX_TYPE_FORMAT ")",
21704 ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2872 i+1, iold, itmp);
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2873 }
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2874
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2875 iold = itmp;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2876 jold = jtmp;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2877
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2878 tmp = read_fcn (is);
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2879
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2880 if (! is)
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2881 return is; // Problem, return is in error state
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2882
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2883 a.data (ii) = tmp;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2884 a.ridx (ii++) = itmp;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2885 }
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2886
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2887 for (octave_idx_type j = jold; j < nc; j++)
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2888 a.cidx (j+1) = ii;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2889 }
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2890
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2891 return is;
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2892 }
ac59b72712fd Clearer error messages when loading buggy sparse matrix files (bug #38414) Lachlan Andrew <lachlanbis@gmail.com> parents: 21690 diff changeset	2893
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2894 /*
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2895 * Tests
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2896 *
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2897
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2898 %!function x = set_slice (x, dim, slice, arg)
16933 e39f00a32dc7 maint: Use parentheses around condition for switch(),while(),if() statements. Rik <rik@octave.org> parents: 16803 diff changeset	2899 %! switch (dim)
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2900 %! case 11
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2901 %! x(slice) = 2;
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2902 %! case 21
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2903 %! x(slice, :) = 2;
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2904 %! case 22
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2905 %! x(:, slice) = 2;
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2906 %! otherwise
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2907 %! error ("invalid dim, '%d'", dim);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2908 %! endswitch
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2909 %!endfunction
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2910
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2911 %!function x = set_slice2 (x, dim, slice)
16933 e39f00a32dc7 maint: Use parentheses around condition for switch(),while(),if() statements. Rik <rik@octave.org> parents: 16803 diff changeset	2912 %! switch (dim)
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	2913 %! case 11
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2914 %! x(slice) = 2 * ones (size (slice));
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	2915 %! case 21
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2916 %! x(slice, :) = 2 * ones (length (slice), columns (x));
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	2917 %! case 22
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2918 %! x(:, slice) = 2 * ones (rows (x), length (slice));
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	2919 %! otherwise
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2920 %! error ("invalid dim, '%d'", dim);
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	2921 %! endswitch
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2922 %!endfunction
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	2923
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2924 %!function test_sparse_slice (size, dim, slice)
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2925 %! x = ones (size);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2926 %! s = set_slice (sparse (x), dim, slice);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2927 %! f = set_slice (x, dim, slice);
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2928 %! assert (nnz (s), nnz (f));
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2929 %! assert (full (s), f);
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2930 %! s = set_slice2 (sparse (x), dim, slice);
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2931 %! f = set_slice2 (x, dim, slice);
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2932 %! assert (nnz (s), nnz (f));
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	2933 %! assert (full (s), f);
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2934 %!endfunction
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2935
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2936 #### 1d indexing
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2937
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2938 ## size = [2 0]
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2939 %!test test_sparse_slice ([2 0], 11, []);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2940 %!assert (set_slice (sparse (ones ([2 0])), 11, 1), sparse ([2 0]')) # sparse different from full
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2941 %!assert (set_slice (sparse (ones ([2 0])), 11, 2), sparse ([0 2]')) # sparse different from full
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2942 %!assert (set_slice (sparse (ones ([2 0])), 11, 3), sparse ([0 0; 2 0]')) # sparse different from full
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2943 %!assert (set_slice (sparse (ones ([2 0])), 11, 4), sparse ([0 0; 0 2]')) # sparse different from full
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2944
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2945 ## size = [0 2]
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2946 %!test test_sparse_slice ([0 2], 11, []);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2947 %!assert (set_slice (sparse (ones ([0 2])), 11, 1), sparse ([2 0])) # sparse different from full
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2948 %!test test_sparse_slice ([0 2], 11, 2);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2949 %!test test_sparse_slice ([0 2], 11, 3);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2950 %!test test_sparse_slice ([0 2], 11, 4);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2951 %!test test_sparse_slice ([0 2], 11, [4, 4]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2952
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2953 ## size = [2 1]
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2954 %!test test_sparse_slice ([2 1], 11, []);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2955 %!test test_sparse_slice ([2 1], 11, 1);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2956 %!test test_sparse_slice ([2 1], 11, 2);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2957 %!test test_sparse_slice ([2 1], 11, 3);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2958 %!test test_sparse_slice ([2 1], 11, 4);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2959 %!test test_sparse_slice ([2 1], 11, [4, 4]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2960
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2961 ## size = [1 2]
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2962 %!test test_sparse_slice ([1 2], 11, []);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2963 %!test test_sparse_slice ([1 2], 11, 1);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2964 %!test test_sparse_slice ([1 2], 11, 2);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2965 %!test test_sparse_slice ([1 2], 11, 3);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2966 %!test test_sparse_slice ([1 2], 11, 4);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2967 %!test test_sparse_slice ([1 2], 11, [4, 4]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2968
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2969 ## size = [2 2]
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2970 %!test test_sparse_slice ([2 2], 11, []);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2971 %!test test_sparse_slice ([2 2], 11, 1);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2972 %!test test_sparse_slice ([2 2], 11, 2);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2973 %!test test_sparse_slice ([2 2], 11, 3);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2974 %!test test_sparse_slice ([2 2], 11, 4);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2975 %!test test_sparse_slice ([2 2], 11, [4, 4]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2976 # These 2 errors are the same as in the full case
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2977 %!error id=Octave:invalid-resize set_slice (sparse (ones ([2 2])), 11, 5)
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2978 %!error id=Octave:invalid-resize set_slice (sparse (ones ([2 2])), 11, 6)
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2979
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2980 #### 2d indexing
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2981
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2982 ## size = [2 0]
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2983 %!test test_sparse_slice ([2 0], 21, []);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2984 %!test test_sparse_slice ([2 0], 21, 1);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2985 %!test test_sparse_slice ([2 0], 21, 2);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2986 %!test test_sparse_slice ([2 0], 21, [2,2]);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2987 %!assert (set_slice (sparse (ones ([2 0])), 21, 3), sparse (3,0))
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2988 %!assert (set_slice (sparse (ones ([2 0])), 21, 4), sparse (4,0))
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2989 %!test test_sparse_slice ([2 0], 22, []);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2990 %!test test_sparse_slice ([2 0], 22, 1);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2991 %!test test_sparse_slice ([2 0], 22, 2);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2992 %!test test_sparse_slice ([2 0], 22, [2,2]);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2993 %!assert (set_slice (sparse (ones ([2 0])), 22, 3), sparse ([0 0 2;0 0 2])) # sparse different from full
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2994 %!assert (set_slice (sparse (ones ([2 0])), 22, 4), sparse ([0 0 0 2;0 0 0 2])) # sparse different from full
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2995
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	2996 ## size = [0 2]
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2997 %!test test_sparse_slice ([0 2], 21, []);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2998 %!test test_sparse_slice ([0 2], 21, 1);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2999 %!test test_sparse_slice ([0 2], 21, 2);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3000 %!test test_sparse_slice ([0 2], 21, [2,2]);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3001 %!assert (set_slice (sparse (ones ([0 2])), 21, 3), sparse ([0 0;0 0;2 2])) # sparse different from full
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3002 %!assert (set_slice (sparse (ones ([0 2])), 21, 4), sparse ([0 0;0 0;0 0;2 2])) # sparse different from full
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3003 %!test test_sparse_slice ([0 2], 22, []);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3004 %!test test_sparse_slice ([0 2], 22, 1);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3005 %!test test_sparse_slice ([0 2], 22, 2);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3006 %!test test_sparse_slice ([0 2], 22, [2,2]);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3007 %!assert (set_slice (sparse (ones ([0 2])), 22, 3), sparse (0,3))
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3008 %!assert (set_slice (sparse (ones ([0 2])), 22, 4), sparse (0,4))
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3009
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3010 ## size = [2 1]
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3011 %!test test_sparse_slice ([2 1], 21, []);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3012 %!test test_sparse_slice ([2 1], 21, 1);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3013 %!test test_sparse_slice ([2 1], 21, 2);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3014 %!test test_sparse_slice ([2 1], 21, [2,2]);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3015 %!test test_sparse_slice ([2 1], 21, 3);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3016 %!test test_sparse_slice ([2 1], 21, 4);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3017 %!test test_sparse_slice ([2 1], 22, []);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3018 %!test test_sparse_slice ([2 1], 22, 1);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3019 %!test test_sparse_slice ([2 1], 22, 2);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3020 %!test test_sparse_slice ([2 1], 22, [2,2]);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3021 %!test test_sparse_slice ([2 1], 22, 3);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3022 %!test test_sparse_slice ([2 1], 22, 4);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3023
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3024 ## size = [1 2]
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3025 %!test test_sparse_slice ([1 2], 21, []);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3026 %!test test_sparse_slice ([1 2], 21, 1);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3027 %!test test_sparse_slice ([1 2], 21, 2);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3028 %!test test_sparse_slice ([1 2], 21, [2,2]);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3029 %!test test_sparse_slice ([1 2], 21, 3);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3030 %!test test_sparse_slice ([1 2], 21, 4);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3031 %!test test_sparse_slice ([1 2], 22, []);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3032 %!test test_sparse_slice ([1 2], 22, 1);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3033 %!test test_sparse_slice ([1 2], 22, 2);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3034 %!test test_sparse_slice ([1 2], 22, [2,2]);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3035 %!test test_sparse_slice ([1 2], 22, 3);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3036 %!test test_sparse_slice ([1 2], 22, 4);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3037
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3038 ## size = [2 2]
14427 d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3039 %!test test_sparse_slice ([2 2], 21, []);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3040 %!test test_sparse_slice ([2 2], 21, 1);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3041 %!test test_sparse_slice ([2 2], 21, 2);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3042 %!test test_sparse_slice ([2 2], 21, [2,2]);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3043 %!test test_sparse_slice ([2 2], 21, 3);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3044 %!test test_sparse_slice ([2 2], 21, 4);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3045 %!test test_sparse_slice ([2 2], 22, []);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3046 %!test test_sparse_slice ([2 2], 22, 1);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3047 %!test test_sparse_slice ([2 2], 22, 2);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3048 %!test test_sparse_slice ([2 2], 22, [2,2]);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3049 %!test test_sparse_slice ([2 2], 22, 3);
d07e989686b0 Use Octave coding conventions in liboctave %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	3050 %!test test_sparse_slice ([2 2], 22, 4);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3051
28579 713398d4a3c3 update bug status of tests marked with bug numbers John W. Eaton <jwe@octave.org> parents: 27933 diff changeset	3052 %!assert <*35570> (speye (3,1)(3:-1:1), sparse ([0; 0; 1]))
22489 93ea313301f9 test: Add bug ids (<#####>) to BIST tests. Rik <rik@octave.org> parents: 22402 diff changeset	3053
93ea313301f9 test: Add bug ids (<#####>) to BIST tests. Rik <rik@octave.org> parents: 22402 diff changeset	3054 ## Test removing columns
28579 713398d4a3c3 update bug status of tests marked with bug numbers John W. Eaton <jwe@octave.org> parents: 27933 diff changeset	3055 %!test <*36656>
14789 62219ea36f05 Assign the sparse column index when deleting contiguous columns (bug #36656) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14433 diff changeset	3056 %! s = sparse (magic (5));
62219ea36f05 Assign the sparse column index when deleting contiguous columns (bug #36656) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14433 diff changeset	3057 %! s(:,2:4) = [];
62219ea36f05 Assign the sparse column index when deleting contiguous columns (bug #36656) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14433 diff changeset	3058 %! assert (s, sparse (magic (5)(:, [1,5])));
62219ea36f05 Assign the sparse column index when deleting contiguous columns (bug #36656) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14433 diff changeset	3059
14790 b8041f48b0ff Return sparse column vectors when the indexing allows it (bug #36656) David Bateman <dbateman@free.fr> parents: 14789 diff changeset	3060 %!test
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	3061 %! s = sparse ([], [], [], 1, 1);
14790 b8041f48b0ff Return sparse column vectors when the indexing allows it (bug #36656) David Bateman <dbateman@free.fr> parents: 14789 diff changeset	3062 %! s(1,:) = [];
b8041f48b0ff Return sparse column vectors when the indexing allows it (bug #36656) David Bateman <dbateman@free.fr> parents: 14789 diff changeset	3063 %! assert (s, sparse ([], [], [], 0, 1));
b8041f48b0ff Return sparse column vectors when the indexing allows it (bug #36656) David Bateman <dbateman@free.fr> parents: 14789 diff changeset	3064
17278 79d4b6089968 Fix isequal for sparse matrix (bug #37321) Stefan Mahr <dac922@gmx.de> parents: 16933 diff changeset	3065 ## Test (bug #37321)
28579 713398d4a3c3 update bug status of tests marked with bug numbers John W. Eaton <jwe@octave.org> parents: 27933 diff changeset	3066 %!test <*37321> a=sparse (0,0); assert (all (a) == sparse ([1]));
713398d4a3c3 update bug status of tests marked with bug numbers John W. Eaton <jwe@octave.org> parents: 27933 diff changeset	3067 %!test <*37321> a=sparse (0,1); assert (all (a) == sparse ([1]));
713398d4a3c3 update bug status of tests marked with bug numbers John W. Eaton <jwe@octave.org> parents: 27933 diff changeset	3068 %!test <*37321> a=sparse (1,0); assert (all (a) == sparse ([1]));
713398d4a3c3 update bug status of tests marked with bug numbers John W. Eaton <jwe@octave.org> parents: 27933 diff changeset	3069 %!test <*37321> a=sparse (1,0); assert (all (a,2) == sparse ([1]));
713398d4a3c3 update bug status of tests marked with bug numbers John W. Eaton <jwe@octave.org> parents: 27933 diff changeset	3070 %!test <*37321> a=sparse (1,0); assert (size (all (a,1)), [1 0]);
713398d4a3c3 update bug status of tests marked with bug numbers John W. Eaton <jwe@octave.org> parents: 27933 diff changeset	3071 %!test <*37321> a=sparse (1,1);
17285 f519560bfcb4 maint: Use Octave spacing conventions in cset 79d4b6089968. Rik <rik@octave.org> parents: 17278 diff changeset	3072 %! assert (all (a) == sparse ([0]));
f519560bfcb4 maint: Use Octave spacing conventions in cset 79d4b6089968. Rik <rik@octave.org> parents: 17278 diff changeset	3073 %! assert (size (all (a)), [1 1]);
28579 713398d4a3c3 update bug status of tests marked with bug numbers John W. Eaton <jwe@octave.org> parents: 27933 diff changeset	3074 %!test <*37321> a=sparse (2,1);
17285 f519560bfcb4 maint: Use Octave spacing conventions in cset 79d4b6089968. Rik <rik@octave.org> parents: 17278 diff changeset	3075 %! assert (all (a) == sparse ([0]));
f519560bfcb4 maint: Use Octave spacing conventions in cset 79d4b6089968. Rik <rik@octave.org> parents: 17278 diff changeset	3076 %! assert (size (all (a)), [1 1]);
28579 713398d4a3c3 update bug status of tests marked with bug numbers John W. Eaton <jwe@octave.org> parents: 27933 diff changeset	3077 %!test <*37321> a=sparse (1,2);
17285 f519560bfcb4 maint: Use Octave spacing conventions in cset 79d4b6089968. Rik <rik@octave.org> parents: 17278 diff changeset	3078 %! assert (all (a) == sparse ([0]));
f519560bfcb4 maint: Use Octave spacing conventions in cset 79d4b6089968. Rik <rik@octave.org> parents: 17278 diff changeset	3079 %! assert (size (all (a)), [1 1]);
28579 713398d4a3c3 update bug status of tests marked with bug numbers John W. Eaton <jwe@octave.org> parents: 27933 diff changeset	3080 %!test <*37321> a=sparse (2,2); assert (isequal (all (a), sparse ([0 0])));
22489 93ea313301f9 test: Add bug ids (<#####>) to BIST tests. Rik <rik@octave.org> parents: 22402 diff changeset	3081
93ea313301f9 test: Add bug ids (<#####>) to BIST tests. Rik <rik@octave.org> parents: 22402 diff changeset	3082 ## Test assigning row to a column slice
93ea313301f9 test: Add bug ids (<#####>) to BIST tests. Rik <rik@octave.org> parents: 22402 diff changeset	3083 %!test <45589>
20673 3d8aee0b7415 Allow assigning row vector to column of Sparse array (bug #45589). Lachlan Andrew <lachlanbis@gmail.com> parents: 20542 diff changeset	3084 %! a = sparse (magic (3));
3d8aee0b7415 Allow assigning row vector to column of Sparse array (bug #45589). Lachlan Andrew <lachlanbis@gmail.com> parents: 20542 diff changeset	3085 %! b = a;
3d8aee0b7415 Allow assigning row vector to column of Sparse array (bug #45589). Lachlan Andrew <lachlanbis@gmail.com> parents: 20542 diff changeset	3086 %! a(1,:) = 1:3;
3d8aee0b7415 Allow assigning row vector to column of Sparse array (bug #45589). Lachlan Andrew <lachlanbis@gmail.com> parents: 20542 diff changeset	3087 %! b(1,:) = (1:3)';
3d8aee0b7415 Allow assigning row vector to column of Sparse array (bug #45589). Lachlan Andrew <lachlanbis@gmail.com> parents: 20542 diff changeset	3088 %! assert (a, b);
3d8aee0b7415 Allow assigning row vector to column of Sparse array (bug #45589). Lachlan Andrew <lachlanbis@gmail.com> parents: 20542 diff changeset	3089
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3090 */
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3091
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	3092 template <typename T, typename Alloc>
29227 a009cb8ef68f Set API tags in files in liboctave/array (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 28579 diff changeset	3093 OCTAVE_API
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3094 void
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	3095 Sparse<T, Alloc>::print_info (std::ostream& os, const std::string& prefix) const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3096 {
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	3097 os << prefix << "m_rep address: " << m_rep << "\n"
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	3098 << prefix << "m_rep->m_nzmax: " << m_rep->m_nzmax << "\n"
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	3099 << prefix << "m_rep->m_nrows: " << m_rep->m_nrows << "\n"
be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	3100 << prefix << "m_rep->m_ncols: " << m_rep->m_ncols << "\n"
29927 6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	3101 << prefix << "m_rep->m_data: " << m_rep->m_data << "\n"
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	3102 << prefix << "m_rep->m_ridx: " << m_rep->m_ridx << "\n"
6a8642d310c8 style fixes for Sparse<T> class John W. Eaton <jwe@octave.org> parents: 29887 diff changeset	3103 << prefix << "m_rep->m_cidx: " << m_rep->m_cidx << "\n"
29887 be669d935fb6 use m_prefix for data members in array classes John W. Eaton <jwe@octave.org> parents: 29845 diff changeset	3104 << prefix << "m_rep->m_count: " << m_rep->m_count << "\n";
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3105 }
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10509 diff changeset	3106
29247 d83ae0145030 Export template class instantiations with clang (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 29227 diff changeset	3107 #if defined (__clang__)
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	3108 # define INSTANTIATE_SPARSE(T) \
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	3109 template class OCTAVE_API Sparse<T>; \
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	3110 template OCTAVE_API std::istream& \
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	3111 read_sparse_matrix<T> (std::istream& is, Sparse<T>& a, \
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	3112 T (*read_fcn) (std::istream&));
29247 d83ae0145030 Export template class instantiations with clang (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 29227 diff changeset	3113 #else
30791 b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	3114 # define INSTANTIATE_SPARSE(T) \
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	3115 template class Sparse<T>; \
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	3116 template OCTAVE_API std::istream& \
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	3117 read_sparse_matrix<T> (std::istream& is, Sparse<T>& a, \
b1301358b040 allocators for Sparse<T> John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	3118 T (*read_fcn) (std::istream&));
29247 d83ae0145030 Export template class instantiations with clang (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 29227 diff changeset	3119 #endif

Mercurial > octave

annotate liboctave/array/Sparse.cc @ 32660:f53ac65ffba6