octave-nkf: liboctave/array/Sparse.h annotate

annotate liboctave/array/Sparse.h @ 20783:db3286201347 stable

doc: Add explanation of ':' optional input to numel(). * data.cc (Fnumel): Add explanation of ':' optional input.

author	Rik <rik@octave.org>
date	Wed, 07 Oct 2015 14:52:01 -0700
parents	4197fc428c7d
children	00cf2847355d

rev	line source
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1 // Template sparse classes
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2 /*
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3
19898 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19576 diff changeset	4 Copyright (C) 2004-2015 David Bateman
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 10716 diff changeset	5 Copyright (C) 1998-2004 Andy Adler
10521 4d1fc073fbb7 add some missing copyright stmts Jaroslav Hajek <highegg@gmail.com> parents: 10515 diff changeset	6 Copyright (C) 2010 VZLU Prague
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6708 diff changeset	7
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6708 diff changeset	8 This file is part of Octave.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	9
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	10 Octave is free software; you can redistribute it and/or modify it
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	11 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6708 diff changeset	12 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6708 diff changeset	13 option) any later version.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	14
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	15 Octave is distributed in the hope that it will be useful, but WITHOUT
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	18 for more details.
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	19
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	20 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6708 diff changeset	21 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6708 diff changeset	22 <http://www.gnu.org/licenses/>.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	23
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	24 */
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	25
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	26 #if !defined (octave_Sparse_h)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	27 #define octave_Sparse_h 1
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	28
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	29 #include <cassert>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	30 #include <cstddef>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	31
8950 d865363208d6 include <iosfwd> instead of <iostream> in header files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	32 #include <iosfwd>
10514 40c58502a78b improve conversion & copy ctors of sparse matrix Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	33 #include <algorithm>
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	34
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	35 #include "Array.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	36 #include "dim-vector.h"
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	37 #include "lo-error.h"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	38 #include "lo-utils.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	39
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7017 diff changeset	40 #include "oct-sort.h"
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7017 diff changeset	41
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	42 class idx_vector;
13030 b646413c3d0e Make operators do smarter sparse conversions on permutation matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12125 diff changeset	43 class PermMatrix;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	44
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	45 // Two dimensional sparse class. Handles the reference counting for
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	46 // all the derived classes.
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 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	49 class
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	50 Sparse
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	51 {
8181 1ebcb9872ced fix sparse-matrix bool/cmp op instantiation problem John W. Eaton <jwe@octave.org> parents: 7717 diff changeset	52 public:
1ebcb9872ced fix sparse-matrix bool/cmp op instantiation problem John W. Eaton <jwe@octave.org> parents: 7717 diff changeset	53
8918 f5408862892f Consistently use element_type in the array classes. Jason Riedy <jason@acm.org> parents: 8181 diff changeset	54 typedef T element_type;
8181 1ebcb9872ced fix sparse-matrix bool/cmp op instantiation problem John W. Eaton <jwe@octave.org> parents: 7717 diff changeset	55
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	56 protected:
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	57 //--------------------------------------------------------------------
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	58 // The real representation of all Sparse arrays.
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	59 //--------------------------------------------------------------------
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	60
6108 143b556ce725 [project @ 2006-10-27 01:45:54 by jwe] jwe parents: 5900 diff changeset	61 class OCTAVE_API SparseRep
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	62 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	63 public:
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	64
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	65 T *d;
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	66 octave_idx_type *r;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	67 octave_idx_type *c;
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5307 diff changeset	68 octave_idx_type nzmx;
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	69 octave_idx_type nrows;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	70 octave_idx_type ncols;
12125 a21a3875ca83 implement a common class for reference counts Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	71 octave_refcount<int> count;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	72
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	73 SparseRep (void)
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	74 : d (0), r (0), c (new octave_idx_type [1]), nzmx (0), nrows (0),
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	75 ncols (0), count (1)
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	76 {
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	77 c[0] = 0;
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	78 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	79
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	80 SparseRep (octave_idx_type n)
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	81 : d (0), r (0), c (new octave_idx_type [n+1]), nzmx (0), nrows (n),
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	82 ncols (n), count (1)
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	83 {
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	84 for (octave_idx_type i = 0; i < n + 1; i++)
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	85 c[i] = 0;
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	86 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	87
14793 cda76da34693 Remove SparseRep constructor without nz parameter Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14792 diff changeset	88 SparseRep (octave_idx_type nr, octave_idx_type nc, octave_idx_type nz = 0)
15724 911a6ad10e9c fix incorrect sparse array allocation introduced in cda76da34693 John W. Eaton <jwe@octave.org> parents: 15271 diff changeset	89 : d (nz > 0 ? new T [nz] : 0),
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	90 r (nz > 0 ? new octave_idx_type [nz] : 0),
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	91 c (new octave_idx_type [nc+1]), nzmx (nz), nrows (nr),
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	92 ncols (nc), count (1)
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	93 {
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	94 for (octave_idx_type i = 0; i < nc + 1; i++)
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	95 c[i] = 0;
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	96 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	97
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	98 SparseRep (const SparseRep& a)
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	99 : d (new T [a.nzmx]), r (new octave_idx_type [a.nzmx]),
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	100 c (new octave_idx_type [a.ncols + 1]),
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	101 nzmx (a.nzmx), nrows (a.nrows), ncols (a.ncols), count (1)
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	102 {
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	103 octave_idx_type nz = a.nnz ();
19576 af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19007 diff changeset	104 std::copy (a.d, a.d + nz, d);
af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19007 diff changeset	105 std::copy (a.r, a.r + nz, r);
af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19007 diff changeset	106 std::copy (a.c, a.c + ncols + 1, c);
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	107 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	108
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	109 ~SparseRep (void) { delete [] d; delete [] r; delete [] c; }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	110
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5307 diff changeset	111 octave_idx_type length (void) const { return nzmx; }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	112
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	113 octave_idx_type nnz (void) const { return c[ncols]; }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	114
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	115 T& elem (octave_idx_type _r, octave_idx_type _c);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	116
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	117 T 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	118
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	119 T& data (octave_idx_type i) { return d[i]; }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	120
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	121 T cdata (octave_idx_type i) const { return d[i]; }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	122
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	123 octave_idx_type& ridx (octave_idx_type i) { return r[i]; }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	124
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	125 octave_idx_type cridx (octave_idx_type i) const { return r[i]; }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	126
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	127 octave_idx_type& cidx (octave_idx_type i) { return c[i]; }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	128
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	129 octave_idx_type ccidx (octave_idx_type i) const { return c[i]; }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	130
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	131 void maybe_compress (bool remove_zeros);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	132
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	133 void change_length (octave_idx_type nz);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	134
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	135 bool indices_ok (void) const;
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	136
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	137 private:
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	138
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	139 // No assignment!
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 SparseRep& operator = (const SparseRep& a);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	142 };
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	143
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	144 //--------------------------------------------------------------------
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	145
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	146 void make_unique (void)
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	147 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	148 if (rep->count > 1)
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	149 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	150 SparseRep r = new SparseRep (rep);
13985 43cc49c7abd1 Use thread-safe atomic reference counting (GCC and MSVC). Michael Goffioul <michael.goffioul@gmail.com> parents: 13030 diff changeset	151
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	152 if (--rep->count == 0)
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	153 delete rep;
13985 43cc49c7abd1 Use thread-safe atomic reference counting (GCC and MSVC). Michael Goffioul <michael.goffioul@gmail.com> parents: 13030 diff changeset	154
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	155 rep = r;
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	156 }
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	157 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	158
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	159 public:
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	160
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	161 // !!! WARNING !!! -- these should be protected, not public. You
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	162 // should not access these data members directly!
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	163
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	164 typename Sparse<T>::SparseRep *rep;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	165
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	166 dim_vector dimensions;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	167
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	168 private:
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	169
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	170 typename Sparse<T>::SparseRep *nil_rep (void) const
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	171 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	172 static typename Sparse<T>::SparseRep nr;
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	173 return &nr;
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	174 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	175
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	176 public:
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	177
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	178 Sparse (void)
13995 8a566473361e use static storage for Sparse nil rep instead of allocating it with new John W. Eaton <jwe@octave.org> parents: 13985 diff changeset	179 : rep (nil_rep ()), dimensions (dim_vector(0,0))
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	180 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	181 rep->count++;
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	182 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	183
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	184 explicit Sparse (octave_idx_type n)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	185 : rep (new typename Sparse<T>::SparseRep (n)),
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10497 diff changeset	186 dimensions (dim_vector (n, n)) { }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	187
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	188 explicit Sparse (octave_idx_type nr, octave_idx_type nc)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	189 : rep (new typename Sparse<T>::SparseRep (nr, nc)),
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10497 diff changeset	190 dimensions (dim_vector (nr, nc)) { }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	191
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	192 explicit Sparse (octave_idx_type nr, octave_idx_type nc, T val);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	193
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	194 Sparse (const dim_vector& dv, octave_idx_type nz)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	195 : rep (new typename Sparse<T>::SparseRep (dv(0), dv(1), nz)),
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	196 dimensions (dv) { }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	197
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	198 Sparse (octave_idx_type nr, octave_idx_type nc, octave_idx_type nz)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	199 : rep (new typename Sparse<T>::SparseRep (nr, nc, nz)),
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10497 diff changeset	200 dimensions (dim_vector (nr, nc)) { }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	201
13030 b646413c3d0e Make operators do smarter sparse conversions on permutation matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12125 diff changeset	202 // Both SparseMatrix and SparseBoolMatrix need this ctor, and this
b646413c3d0e Make operators do smarter sparse conversions on permutation matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12125 diff changeset	203 // is their only common ancestor.
b646413c3d0e Make operators do smarter sparse conversions on permutation matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12125 diff changeset	204 explicit Sparse (const PermMatrix& a);
b646413c3d0e Make operators do smarter sparse conversions on permutation matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12125 diff changeset	205
10514 40c58502a78b improve conversion & copy ctors of sparse matrix Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	206 // Type conversion case. Preserves capacity ().
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	207 template <class U>
10515 189274f6c7c4 omissions from last patch Jaroslav Hajek <highegg@gmail.com> parents: 10514 diff changeset	208 Sparse (const Sparse<U>& a)
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	209 : rep (new typename Sparse<T>::SparseRep (a.rep->nrows, a.rep->ncols,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	210 a.rep->nzmx)),
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	211 dimensions (a.dimensions)
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	212 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	213 octave_idx_type nz = a.nnz ();
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	214 std::copy (a.rep->d, a.rep->d + nz, rep->d);
19576 af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19007 diff changeset	215 std::copy (a.rep->r, a.rep->r + nz, rep->r);
af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19007 diff changeset	216 std::copy (a.rep->c, a.rep->c + rep->ncols + 1, rep->c);
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	217 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	218
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	219 // No type conversion case.
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	220 Sparse (const Sparse<T>& a)
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10497 diff changeset	221 : rep (a.rep), dimensions (a.dimensions)
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	222 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	223 rep->count++;
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	224 }
5164 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 public:
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	227
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	228 Sparse (const dim_vector& dv);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	229
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	230 Sparse (const Sparse<T>& a, const dim_vector& dv);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	231
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	232 Sparse (const Array<T>& a, const idx_vector& r, const idx_vector& c,
10527 b4d2080b6df7 Replace nzmax by nnz as needed David Bateman <dbateman@free.fr> parents: 10521 diff changeset	233 octave_idx_type nr = -1, octave_idx_type nc = -1,
b4d2080b6df7 Replace nzmax by nnz as needed David Bateman <dbateman@free.fr> parents: 10521 diff changeset	234 bool sum_terms = true, octave_idx_type nzm = -1);
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	235
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	236 // Sparsify a normal matrix
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	237 Sparse (const Array<T>& a);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	238
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	239 virtual ~Sparse (void);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	240
7717 ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	241 Sparse<T>& operator = (const Sparse<T>& a);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	242
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5307 diff changeset	243 // Note that nzmax and capacity are the amount of storage for
19007 9ac2357f19bc doc: Replace "non-zero" with "nonzero" to match existing usage. Rik <rik@octave.org> parents: 18084 diff changeset	244 // nonzero elements, while nnz is the actual number of nonzero
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5307 diff changeset	245 // terms.
2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5307 diff changeset	246 octave_idx_type nzmax (void) const { return rep->length (); }
2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5307 diff changeset	247 octave_idx_type capacity (void) const { return nzmax (); }
2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5307 diff changeset	248 octave_idx_type nnz (void) const { return rep->nnz (); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	249
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	250 // Querying the number of elements (incl. zeros) may overflow the index type,
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	251 // so don't do it unless you really need it.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	252 octave_idx_type numel (void) const
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	253 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	254 return dimensions.safe_numel ();
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	255 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	256
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	257 octave_idx_type nelem (void) const { return capacity (); }
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	258 octave_idx_type length (void) const { return numel (); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	259
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	260 octave_idx_type dim1 (void) const { return dimensions(0); }
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	261 octave_idx_type dim2 (void) const { return dimensions(1); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	262
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	263 octave_idx_type rows (void) const { return dim1 (); }
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	264 octave_idx_type cols (void) const { return dim2 (); }
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	265 octave_idx_type columns (void) const { return dim2 (); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	266
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	267 octave_idx_type get_row_index (octave_idx_type k) { return ridx (k); }
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	268 octave_idx_type get_col_index (octave_idx_type k)
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	269 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	270 octave_idx_type ret = 0;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	271 while (cidx (ret+1) < k)
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	272 ret++;
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	273 return ret;
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	274 }
10358 72fab01e5d68 improve some size_t queries Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	275
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	276 size_t byte_size (void) const
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	277 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	278 return (static_cast<size_t>(cols () + 1) * sizeof (octave_idx_type)
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	279 + static_cast<size_t> (capacity ())
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	280 * (sizeof (T) + sizeof (octave_idx_type)));
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	281 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	282
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	283 dim_vector dims (void) const { return dimensions; }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	284
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	285 Sparse<T> squeeze (void) const { return *this; }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	286
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	287 octave_idx_type 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	288
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	289 T range_error (const char *fcn, octave_idx_type n) const;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	290 T& range_error (const char *fcn, octave_idx_type n);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	291
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	292 T range_error (const char *fcn, octave_idx_type i, octave_idx_type j) const;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	293 T& range_error (const char *fcn, octave_idx_type i, octave_idx_type j);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	294
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	295 T range_error (const char *fcn, const Array<octave_idx_type>& ra_idx) const;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	296 T& range_error (const char *fcn, const Array<octave_idx_type>& ra_idx);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	297
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	298 // No checking, even for multiple references, ever.
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	299
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	300 T& xelem (octave_idx_type n)
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	301 {
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 17769 diff changeset	302 octave_idx_type i = n % rows ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 17769 diff changeset	303 octave_idx_type j = n / rows ();
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	304 return xelem (i, j);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	305 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	306
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	307 T xelem (octave_idx_type n) const
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	308 {
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 17769 diff changeset	309 octave_idx_type i = n % rows ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 17769 diff changeset	310 octave_idx_type j = n / rows ();
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	311 return xelem (i, j);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	312 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	313
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	314 T& xelem (octave_idx_type i, octave_idx_type j) { return rep->elem (i, j); }
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	315 T xelem (octave_idx_type i, octave_idx_type j) const
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	316 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	317 return rep->celem (i, j);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	318 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	319
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	320 T& xelem (const Array<octave_idx_type>& ra_idx)
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	321 { return xelem (compute_index (ra_idx)); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	322
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	323 T xelem (const Array<octave_idx_type>& ra_idx) const
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	324 { return xelem (compute_index (ra_idx)); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	325
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	326 // FIXME: would be nice to fix this so that we don't
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	327 // unnecessarily force a copy, but that is not so easy, and I see no
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	328 // clean way to do it.
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	329
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	330 T& checkelem (octave_idx_type n)
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	331 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	332 if (n < 0 \|\| n >= numel ())
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	333 return range_error ("T& Sparse<T>::checkelem", n);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	334 else
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	335 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	336 make_unique ();
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	337 return xelem (n);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	338 }
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	339 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	340
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	341 T& checkelem (octave_idx_type i, octave_idx_type j)
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	342 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	343 if (i < 0 \|\| j < 0 \|\| i >= dim1 () \|\| j >= dim2 ())
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	344 return range_error ("T& Sparse<T>::checkelem", i, j);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	345 else
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	346 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	347 make_unique ();
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	348 return xelem (i, j);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	349 }
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	350 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	351
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	352 T& checkelem (const Array<octave_idx_type>& ra_idx)
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	353 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	354 octave_idx_type i = compute_index (ra_idx);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	355
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	356 if (i < 0)
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	357 return range_error ("T& Sparse<T>::checkelem", ra_idx);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	358 else
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	359 return elem (i);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	360 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	361
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	362 T& elem (octave_idx_type n)
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	363 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	364 make_unique ();
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	365 return xelem (n);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	366 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	367
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	368 T& elem (octave_idx_type i, octave_idx_type j)
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	369 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	370 make_unique ();
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	371 return xelem (i, j);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	372 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	373
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	374 T& elem (const Array<octave_idx_type>& ra_idx)
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	375 { return Sparse<T>::elem (compute_index (ra_idx)); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	376
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	377 #if defined (BOUNDS_CHECKING)
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	378 T& operator () (octave_idx_type n)
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	379 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	380 return checkelem (n);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	381 }
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	382
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	383 T& operator () (octave_idx_type i, octave_idx_type j)
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	384 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	385 return checkelem (i, j);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	386 }
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	387
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	388 T& operator () (const Array<octave_idx_type>& ra_idx)
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	389 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	390 return checkelem (ra_idx);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	391 }
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	392
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	393 #else
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	394 T& operator () (octave_idx_type n)
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	395 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	396 return elem (n);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	397 }
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	398
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	399 T& operator () (octave_idx_type i, octave_idx_type j)
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	400 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	401 return elem (i, j);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	402 }
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	403
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	404 T& operator () (const Array<octave_idx_type>& ra_idx)
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	405 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	406 return elem (ra_idx);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	407 }
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	408
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	409 #endif
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	410
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	411 T checkelem (octave_idx_type n) const
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	412 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	413 if (n < 0 \|\| n >= numel ())
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	414 return range_error ("T Sparse<T>::checkelem", n);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	415 else
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	416 return xelem (n);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	417 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	418
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	419 T checkelem (octave_idx_type i, octave_idx_type j) const
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	420 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	421 if (i < 0 \|\| j < 0 \|\| i >= dim1 () \|\| j >= dim2 ())
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	422 return range_error ("T Sparse<T>::checkelem", i, j);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	423 else
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	424 return xelem (i, j);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	425 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	426
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	427 T checkelem (const Array<octave_idx_type>& ra_idx) const
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	428 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	429 octave_idx_type i = compute_index (ra_idx);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	430
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	431 if (i < 0)
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	432 return range_error ("T Sparse<T>::checkelem", ra_idx);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	433 else
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	434 return Sparse<T>::elem (i);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	435 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	436
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	437 T elem (octave_idx_type n) const { return xelem (n); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	438
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	439 T elem (octave_idx_type i, octave_idx_type j) const { return xelem (i, j); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	440
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	441 T elem (const Array<octave_idx_type>& ra_idx) const
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	442 { return Sparse<T>::elem (compute_index (ra_idx)); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	443
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	444 #if defined (BOUNDS_CHECKING)
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	445 T operator () (octave_idx_type n) const { return checkelem (n); }
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	446 T operator () (octave_idx_type i, octave_idx_type j) const
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	447 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	448 return checkelem (i, j);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	449 }
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	450
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	451 T operator () (const Array<octave_idx_type>& ra_idx) const
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	452 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	453 return checkelem (ra_idx);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	454 }
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	455
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	456 #else
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	457 T operator () (octave_idx_type n) const { return elem (n); }
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	458 T operator () (octave_idx_type i, octave_idx_type j) const
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	459 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	460 return elem (i, j);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	461 }
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	462
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	463 T operator () (const Array<octave_idx_type>& ra_idx) const
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	464 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	465 return elem (ra_idx);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	466 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	467 #endif
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	468
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	469 Sparse<T> maybe_compress (bool remove_zeros = false)
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	470 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	471 if (remove_zeros)
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	472 make_unique (); // Needs to unshare because elements are removed.
10497 cb7ffe7288f0 improve & fix SparseRep reallocation and compression Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	473
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	474 rep->maybe_compress (remove_zeros);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	475 return (*this);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	476 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	477
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	478 Sparse<T> reshape (const dim_vector& new_dims) const;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	479
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	480 Sparse<T> permute (const Array<octave_idx_type>& vec, bool inv = false) const;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	481
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	482 Sparse<T> ipermute (const Array<octave_idx_type>& vec) const
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	483 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	484 return permute (vec, true);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	485 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	486
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	487 void resize1 (octave_idx_type n);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	488
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	489 void resize (octave_idx_type r, octave_idx_type c);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	490
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	491 void resize (const dim_vector& dv);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	492
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	493 void change_capacity (octave_idx_type nz)
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	494 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	495 if (nz < nnz ())
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	496 make_unique (); // Unshare now because elements will be truncated.
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	497 rep->change_length (nz);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	498 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	499
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	500 Sparse<T>& insert (const Sparse<T>& a, octave_idx_type r, octave_idx_type c);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	501 Sparse<T>& insert (const Sparse<T>& a, const Array<octave_idx_type>& idx);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	502
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	503 bool is_square (void) const { return (dim1 () == dim2 ()); }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	504
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	505 bool is_empty (void) const { return (rows () < 1 && cols () < 1); }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	506
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	507 Sparse<T> transpose (void) const;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	508
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	509 T* data (void) { make_unique (); return rep->d; }
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	510 T& data (octave_idx_type i) { make_unique (); return rep->data (i); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	511 T* xdata (void) { return rep->d; }
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	512 T& xdata (octave_idx_type i) { return rep->data (i); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	513
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	514 T data (octave_idx_type i) const { return rep->data (i); }
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	515 // FIXME: shouldn't this be returning const T*?
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	516 T* data (void) const { return rep->d; }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	517
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	518 octave_idx_type* ridx (void) { make_unique (); return rep->r; }
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	519 octave_idx_type& ridx (octave_idx_type i)
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	520 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	521 make_unique (); return rep->ridx (i);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	522 }
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	523
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	524 octave_idx_type* xridx (void) { return rep->r; }
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	525 octave_idx_type& xridx (octave_idx_type i) { return rep->ridx (i); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	526
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	527 octave_idx_type ridx (octave_idx_type i) const { return rep->cridx (i); }
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	528 // FIXME: shouldn't this be returning const octave_idx_type*?
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	529 octave_idx_type* ridx (void) const { return rep->r; }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	530
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	531 octave_idx_type* cidx (void) { make_unique (); return rep->c; }
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	532 octave_idx_type& cidx (octave_idx_type i)
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	533 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	534 make_unique (); return rep->cidx (i);
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	535 }
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	536
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	537 octave_idx_type* xcidx (void) { return rep->c; }
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	538 octave_idx_type& xcidx (octave_idx_type i) { return rep->cidx (i); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	539
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	540 octave_idx_type cidx (octave_idx_type i) const { return rep->ccidx (i); }
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	541 // FIXME: shouldn't this be returning const octave_idx_type*?
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	542 octave_idx_type* cidx (void) const { return rep->c; }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	543
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	544 octave_idx_type ndims (void) const { return dimensions.length (); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	545
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	546 void delete_elements (const idx_vector& i);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	547
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	548 void delete_elements (int dim, const idx_vector& i);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	549
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	550 void delete_elements (const idx_vector& i, const idx_vector& j);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	551
10421 99e9bae2d81e improve sparse indexing interface Jaroslav Hajek <highegg@gmail.com> parents: 10382 diff changeset	552 Sparse<T> index (const idx_vector& i, bool resize_ok = false) const;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	553
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	554 Sparse<T> index (const idx_vector& i, const idx_vector& j,
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	555 bool resize_ok = false) const;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	556
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10497 diff changeset	557 void assign (const idx_vector& i, const Sparse<T>& rhs);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10497 diff changeset	558
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10497 diff changeset	559 void assign (const idx_vector& i, const idx_vector& j, const Sparse<T>& rhs);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10497 diff changeset	560
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	561 void print_info (std::ostream& os, const std::string& prefix) const;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	562
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5775 diff changeset	563 // Unsafe. These functions exist to support the MEX interface.
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5775 diff changeset	564 // You should not use them anywhere else.
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5775 diff changeset	565 void mex_get_data (void) const { return const_cast<T > (data ()); }
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5775 diff changeset	566
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	567 octave_idx_type *mex_get_ir (void) const
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	568 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	569 return const_cast<octave_idx_type *> (ridx ());
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	570 }
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5775 diff changeset	571
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	572 octave_idx_type *mex_get_jc (void) const
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	573 {
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	574 return const_cast<octave_idx_type *> (cidx ());
8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	575 }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7017 diff changeset	576
7463 2467639bd8c0 eliminate UNDEFINED sort mode John W. Eaton <jwe@octave.org> parents: 7433 diff changeset	577 Sparse<T> sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const;
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7017 diff changeset	578 Sparse<T> sort (Array<octave_idx_type> &sidx, octave_idx_type dim = 0,
14792 8483286c0a13 Update Sparse sources to GNU standards (whitespace changes only) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	579 sortmode mode = ASCENDING) const;
7602 7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	580
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7602 diff changeset	581 Sparse<T> diag (octave_idx_type k = 0) const;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7602 diff changeset	582
10716 f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10537 diff changeset	583 // dim = -1 and dim = -2 are special; see Array<T>::cat description.
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	584 static Sparse<T>
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	585 cat (int dim, octave_idx_type n, const Sparse<T> *sparse_list);
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10527 diff changeset	586
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	587 Array<T> array_value (void) const;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	588
15212 4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	589 // Generic any/all test functionality with arbitrary predicate.
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	590 template <class F, bool zero>
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	591 bool test (F fcn) const
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	592 {
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	593 return any_all_test<F, T, zero> (fcn, data (), nnz ());
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	594 }
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	595
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	596 // Simpler calls.
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	597 template <class F>
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	598 bool test_any (F fcn) const
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	599 { return test<F, false> (fcn); }
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	600
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	601 template <class F>
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	602 bool test_all (F fcn) const
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	603 { return test<F, true> (fcn); }
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	604
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	605 // Overloads for function references.
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	606 bool test_any (bool (&fcn) (T)) const
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	607 { return test<bool (&) (T), false> (fcn); }
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	608
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	609 bool test_any (bool (&fcn) (const T&)) const
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	610 { return test<bool (&) (const T&), false> (fcn); }
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	611
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	612 bool test_all (bool (&fcn) (T)) const
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	613 { return test<bool (&) (T), true> (fcn); }
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	614
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	615 bool test_all (bool (&fcn) (const T&)) const
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	616 { return test<bool (&) (const T&), true> (fcn); }
4bbd3bbb8912 reduce code duplication in too_large_for_float array functions John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	617
7602 7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	618 template <class U, class F>
7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	619 Sparse<U>
7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	620 map (F fcn) const
7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	621 {
7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	622 Sparse<U> result;
7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	623 U f_zero = fcn (0.);
7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	624
7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	625 if (f_zero != 0.)
7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	626 {
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	627 octave_idx_type nr = rows ();
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	628 octave_idx_type nc = cols ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	629
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	630 result = Sparse<U> (nr, nc, f_zero);
7602 7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	631
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	632 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	633 for (octave_idx_type i = cidx (j); i < cidx (j+1); i++)
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	634 {
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	635 octave_quit ();
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	636 /* Use data instead of elem for better performance. */
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	637 result.data (ridx (i) + j * nr) = fcn (data (i));
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	638 }
7602 7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	639
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	640 result.maybe_compress (true);
7602 7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	641 }
7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	642 else
7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	643 {
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	644 octave_idx_type nz = nnz ();
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	645 octave_idx_type nr = rows ();
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	646 octave_idx_type nc = cols ();
7602 7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	647
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	648 result = Sparse<U> (nr, nc, nz);
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	649 octave_idx_type ii = 0;
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	650 result.cidx (ii) = 0;
7602 7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	651
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	652 for (octave_idx_type j = 0; j < nc; j++)
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	653 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	654 for (octave_idx_type i = cidx (j); i < cidx (j+1); i++)
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	655 {
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	656 U val = fcn (data (i));
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	657 if (val != 0.0)
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	658 {
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	659 result.data (ii) = val;
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	660 result.ridx (ii++) = ridx (i);
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	661 }
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	662 octave_quit ();
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	663 }
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	664 result.cidx (j+1) = ii;
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	665 }
7602 7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	666
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	667 result.maybe_compress (false);
7602 7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	668 }
7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	669
7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	670 return result;
7bfaa9611558 Rewrite sparse mappers in terms of a functor template function David Bateman <dbateman@free.fr> parents: 7470 diff changeset	671 }
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	672
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	673 // Overloads for function references.
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	674 template <class U>
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	675 Sparse<U>
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	676 map (U (&fcn) (T)) const
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	677 { return map<U, U (&) (T)> (fcn); }
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	678
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	679 template <class U>
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	680 Sparse<U>
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	681 map (U (&fcn) (const T&)) const
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	682 { return map<U, U (&) (const T&)> (fcn); }
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	683
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	684 bool indices_ok (void) const { return rep->indices_ok (); }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	685 };
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	686
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	687 template<typename T>
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	688 std::istream&
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	689 read_sparse_matrix (std::istream& is, Sparse<T>& a,
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	690 T (*read_fcn) (std::istream&))
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	691 {
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	692 octave_idx_type nr = a.rows ();
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	693 octave_idx_type nc = a.cols ();
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	694 octave_idx_type nz = a.nzmax ();
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	695
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	696 if (nr > 0 && nc > 0)
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	697 {
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	698 octave_idx_type itmp;
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	699 octave_idx_type jtmp;
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	700 octave_idx_type iold = 0;
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	701 octave_idx_type jold = 0;
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	702 octave_idx_type ii = 0;
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	703 T tmp;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	704
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	705 a.cidx (0) = 0;
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	706 for (octave_idx_type i = 0; i < nz; i++)
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	707 {
9829 8fd88cc36fa4 fix loading sparse matrices Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	708 itmp = 0; jtmp = 0;
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	709 is >> itmp;
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	710 itmp--;
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	711
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	712 is >> jtmp;
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	713 jtmp--;
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	714
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	715 if (itmp < 0 \|\| itmp >= nr)
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	716 {
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	717 (*current_liboctave_error_handler)
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	718 ("invalid sparse matrix: row index = %d out of range",
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	719 itmp + 1);
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	720 is.setstate (std::ios::failbit);
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	721 goto done;
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	722 }
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	723
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	724 if (jtmp < 0 \|\| jtmp >= nc)
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	725 {
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	726 (*current_liboctave_error_handler)
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	727 ("invalid sparse matrix: column index = %d out of range",
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	728 jtmp + 1);
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	729 is.setstate (std::ios::failbit);
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	730 goto done;
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	731 }
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	732
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	733 if (jtmp < jold)
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	734 {
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	735 (*current_liboctave_error_handler)
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	736 ("invalid sparse matrix: column indices must appear in ascending order");
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	737 is.setstate (std::ios::failbit);
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	738 goto done;
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	739 }
9829 8fd88cc36fa4 fix loading sparse matrices Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	740 else if (jtmp > jold)
8fd88cc36fa4 fix loading sparse matrices Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	741 {
8fd88cc36fa4 fix loading sparse matrices Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	742 for (octave_idx_type j = jold; j < jtmp; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	743 a.cidx (j+1) = ii;
9829 8fd88cc36fa4 fix loading sparse matrices Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	744 }
8fd88cc36fa4 fix loading sparse matrices Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	745 else if (itmp < iold)
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	746 {
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	747 (*current_liboctave_error_handler)
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	748 ("invalid sparse matrix: row indices must appear in ascending order in each column");
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	749 is.setstate (std::ios::failbit);
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	750 goto done;
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	751 }
9829 8fd88cc36fa4 fix loading sparse matrices Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	752
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	753 iold = itmp;
9829 8fd88cc36fa4 fix loading sparse matrices Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	754 jold = jtmp;
8fd88cc36fa4 fix loading sparse matrices Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	755
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	756 tmp = read_fcn (is);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	757
10312 cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	758 if (is)
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	759 {
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	760 a.data (ii) = tmp;
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	761 a.ridx (ii++) = itmp;
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	762 }
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	763 else
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	764 goto done;
cbc402e64d83 untabify liboctave header files John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	765 }
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	766
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	767 for (octave_idx_type j = jold; j < nc; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	768 a.cidx (j+1) = ii;
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	769 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	770
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	771 done:
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	772
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	773 return is;
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	774 }
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 8950 diff changeset	775
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	776 #endif

Mercurial > hg > octave-nkf

annotate liboctave/array/Sparse.h @ 20783:db3286201347 stable