octave-lyh: liboctave/Sparse.cc annotate

annotate liboctave/Sparse.cc @ 10494:e52f41fd82c7

optimize (:) indexing of sparse column vectors

author	Jaroslav Hajek <highegg@gmail.com>
date	Wed, 07 Apr 2010 13:00:25 +0200
parents	2f8bacc2a57d
children	cb7ffe7288f0

rev	line source
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1 // Template sparse array class
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
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8752 diff changeset	4 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 David Bateman
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6988 diff changeset	5 Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6988 diff changeset	6
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6988 diff changeset	7 This file is part of Octave.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	8
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	9 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	10 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: 6988 diff changeset	11 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6988 diff changeset	12 option) any later version.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	13
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	14 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	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	16 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	17 for more details.
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	18
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	19 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: 6988 diff changeset	20 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6988 diff changeset	21 <http://www.gnu.org/licenses/>.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	22
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 #ifdef HAVE_CONFIG_H
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	26 #include <config.h>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	27 #endif
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 <climits>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	31
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	32 #include <algorithm>
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	33 #include <iostream>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	34 #include <sstream>
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	35 #include <vector>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	36
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	37 #include "Array.h"
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	38 #include "MArray.h"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	39 #include "Array-util.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	40 #include "Range.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	41 #include "idx-vector.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	42 #include "lo-error.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	43 #include "quit.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	44 #include "oct-locbuf.h"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	45
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	46 #include "Sparse.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	47 #include "sparse-sort.h"
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 9177 diff changeset	48 #include "sparse-util.h"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	49 #include "oct-spparms.h"
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	50 #include "mx-inlines.cc"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	51
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	52 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	53 T&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	54 Sparse<T>::SparseRep::elem (octave_idx_type _r, octave_idx_type _c)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	55 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	56 octave_idx_type i;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	57
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	58 if (nzmx > 0)
5164 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 for (i = c[_c]; i < c[_c + 1]; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	61 if (r[i] == _r)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	62 return d[i];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	63 else if (r[i] > _r)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	64 break;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	65
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	66 // Ok, If we've gotten here, we're in trouble.. Have to create a
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	67 // new element in the sparse array. This' gonna be slow!!!
5869 6a23ee71dd86 [project @ 2006-06-29 18:04:20 by jwe] jwe parents: 5828 diff changeset	68 if (c[ncols] == nzmx)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	69 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	70 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	71 ("Sparse::SparseRep::elem (octave_idx_type, octave_idx_type): sparse matrix filled");
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	72 return *d;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	73 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	74
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	75 octave_idx_type to_move = c[ncols] - i;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	76 if (to_move != 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	77 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	78 for (octave_idx_type j = c[ncols]; j > i; j--)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	79 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	80 d[j] = d[j-1];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	81 r[j] = r[j-1];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	82 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	83 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	84
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	85 for (octave_idx_type j = _c + 1; j < ncols + 1; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	86 c[j] = c[j] + 1;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	87
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	88 d[i] = 0.;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	89 r[i] = _r;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	90
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	91 return d[i];
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	92 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	93 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	94 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	95 (*current_liboctave_error_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	96 ("Sparse::SparseRep::elem (octave_idx_type, octave_idx_type): sparse matrix filled");
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	97 return *d;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	98 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	99 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	100
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	101 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	102 T
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	103 Sparse<T>::SparseRep::celem (octave_idx_type _r, octave_idx_type _c) const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	104 {
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	105 if (nzmx > 0)
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	106 for (octave_idx_type i = c[_c]; i < c[_c + 1]; i++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	107 if (r[i] == _r)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	108 return d[i];
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	109 return T ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	110 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	111
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	112 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	113 void
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	114 Sparse<T>::SparseRep::maybe_compress (bool remove_zeros)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	115 {
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	116 octave_idx_type ndel = nzmx - c[ncols];
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	117 octave_idx_type nzero = 0;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	118
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	119 if (remove_zeros)
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	120 for (octave_idx_type i = 0; i < nzmx - ndel; i++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	121 if (d[i] == T ())
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	122 nzero++;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	123
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	124 if (!ndel && !nzero)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	125 return;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	126
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	127 if (!nzero)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	128 {
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	129 octave_idx_type new_nzmx = nzmx - ndel;
2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	130
2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	131 T *new_data = new T [new_nzmx];
2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	132 for (octave_idx_type i = 0; i < new_nzmx; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	133 new_data[i] = d[i];
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	134 delete [] d;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	135 d = new_data;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	136
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	137 octave_idx_type *new_ridx = new octave_idx_type [new_nzmx];
2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	138 for (octave_idx_type i = 0; i < new_nzmx; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	139 new_ridx[i] = r[i];
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	140 delete [] r;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	141 r = new_ridx;
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 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	144 {
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	145 octave_idx_type new_nzmx = nzmx - ndel - nzero;
2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	146
2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	147 T *new_data = new T [new_nzmx];
2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	148 octave_idx_type *new_ridx = new octave_idx_type [new_nzmx];
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	149
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	150 octave_idx_type ii = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	151 octave_idx_type ic = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	152 for (octave_idx_type j = 0; j < ncols; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	153 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	154 for (octave_idx_type k = ic; k < c[j+1]; k++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	155 if (d[k] != T ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	156 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	157 new_data [ii] = d[k];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	158 new_ridx [ii++] = r[k];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	159 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	160 ic = c[j+1];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	161 c[j+1] = ii;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	162 }
5164 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 delete [] d;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	165 d = new_data;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	166
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	167 delete [] r;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	168 r = new_ridx;
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
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	171 nzmx -= ndel + nzero;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	172 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	173
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	174 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	175 void
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	176 Sparse<T>::SparseRep::change_length (octave_idx_type nz)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	177 {
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	178 if (nz != nzmx)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	179 {
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	180 octave_idx_type min_nzmx = (nz < nzmx ? nz : nzmx);
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	181
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	182 octave_idx_type * new_ridx = new octave_idx_type [nz];
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	183 for (octave_idx_type i = 0; i < min_nzmx; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	184 new_ridx[i] = r[i];
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	185
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	186 delete [] r;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	187 r = new_ridx;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	188
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	189 T * new_data = new T [nz];
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	190 for (octave_idx_type i = 0; i < min_nzmx; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	191 new_data[i] = d[i];
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	192
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	193 delete [] d;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	194 d = new_data;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	195
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	196 if (nz < nzmx)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	197 for (octave_idx_type i = 0; i <= ncols; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	198 if (c[i] > nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	199 c[i] = nz;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	200
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	201 nzmx = nz;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	202 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	203 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	204
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	205 template <class T>
9469 c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 9177 diff changeset	206 bool
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 9177 diff changeset	207 Sparse<T>::SparseRep::indices_ok (void) const
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 9177 diff changeset	208 {
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 9177 diff changeset	209 return sparse_indices_ok (r, c, nrows, ncols, nnz ());
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 9177 diff changeset	210 }
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 9177 diff changeset	211
c6edba80dfae sanity checks for loading sparse matrices John W. Eaton <jwe@octave.org> parents: 9177 diff changeset	212 template <class T>
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	213 template <class U>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	214 Sparse<T>::Sparse (const Sparse<U>& a)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	215 : dimensions (a.dimensions), idx (0), idx_count (0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	216 {
5681 233d98d95659 [project @ 2006-03-16 17:48:55 by dbateman] dbateman parents: 5648 diff changeset	217 if (a.nnz () == 0)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	218 rep = new typename Sparse<T>::SparseRep (rows (), cols());
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	219 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	220 {
5681 233d98d95659 [project @ 2006-03-16 17:48:55 by dbateman] dbateman parents: 5648 diff changeset	221 rep = new typename Sparse<T>::SparseRep (rows (), cols (), a.nnz ());
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	222
5681 233d98d95659 [project @ 2006-03-16 17:48:55 by dbateman] dbateman parents: 5648 diff changeset	223 octave_idx_type nz = a.nnz ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	224 octave_idx_type nc = cols ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	225 for (octave_idx_type i = 0; i < nz; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	226 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	227 xdata (i) = T (a.data (i));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	228 xridx (i) = a.ridx (i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	229 }
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	230 for (octave_idx_type i = 0; i < nc + 1; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	231 xcidx (i) = a.cidx (i);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	232 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	233 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	234
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	235 template <class T>
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	236 Sparse<T>::Sparse (octave_idx_type nr, octave_idx_type nc, T val)
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	237 : dimensions (dim_vector (nr, nc)), idx (0), idx_count (0)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	238 {
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	239 if (val != T ())
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	240 {
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	241 rep = new typename Sparse<T>::SparseRep (nr, nc, nr*nc);
512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	242
512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	243 octave_idx_type ii = 0;
512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	244 xcidx (0) = 0;
512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	245 for (octave_idx_type j = 0; j < nc; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	246 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	247 for (octave_idx_type i = 0; i < nr; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	248 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	249 xdata (ii) = val;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	250 xridx (ii++) = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	251 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	252 xcidx (j+1) = ii;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	253 }
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	254 }
512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	255 else
512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	256 {
512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	257 rep = new typename Sparse<T>::SparseRep (nr, nc, 0);
512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5604 diff changeset	258 for (octave_idx_type j = 0; j < nc+1; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	259 xcidx(j) = 0;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	260 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	261 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	262
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	263 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	264 Sparse<T>::Sparse (const dim_vector& dv)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	265 : dimensions (dv), idx (0), idx_count (0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	266 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	267 if (dv.length() != 2)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	268 (*current_liboctave_error_handler)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	269 ("Sparse::Sparse (const dim_vector&): dimension mismatch");
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	270 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	271 rep = new typename Sparse<T>::SparseRep (dv(0), dv(1));
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	272 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	273
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	274 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	275 Sparse<T>::Sparse (const Sparse<T>& a, const dim_vector& dv)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	276 : dimensions (dv), idx (0), idx_count (0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	277 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	278
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	279 // Work in unsigned long long to avoid overflow issues with numel
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	280 unsigned long long a_nel = static_cast<unsigned long long>(a.rows ()) *
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	281 static_cast<unsigned long long>(a.cols ());
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	282 unsigned long long dv_nel = static_cast<unsigned long long>(dv (0)) *
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	283 static_cast<unsigned long long>(dv (1));
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 if (a_nel != dv_nel)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	286 (*current_liboctave_error_handler)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	287 ("Sparse::Sparse (const Sparse&, const dim_vector&): dimension mismatch");
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	288 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	289 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	290 dim_vector old_dims = a.dims();
5681 233d98d95659 [project @ 2006-03-16 17:48:55 by dbateman] dbateman parents: 5648 diff changeset	291 octave_idx_type new_nzmx = a.nnz ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	292 octave_idx_type new_nr = dv (0);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	293 octave_idx_type new_nc = dv (1);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	294 octave_idx_type old_nr = old_dims (0);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	295 octave_idx_type old_nc = old_dims (1);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	296
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	297 rep = new typename Sparse<T>::SparseRep (new_nr, new_nc, new_nzmx);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	298
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	299 octave_idx_type kk = 0;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	300 xcidx(0) = 0;
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	301 for (octave_idx_type i = 0; i < old_nc; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	302 for (octave_idx_type j = a.cidx(i); j < a.cidx(i+1); j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	303 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	304 octave_idx_type tmp = i * old_nr + a.ridx(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	305 octave_idx_type ii = tmp % new_nr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	306 octave_idx_type jj = (tmp - ii) / new_nr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	307 for (octave_idx_type k = kk; k < jj; k++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	308 xcidx(k+1) = j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	309 kk = jj;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	310 xdata(j) = a.data(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	311 xridx(j) = ii;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	312 }
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	313 for (octave_idx_type k = kk; k < new_nc; k++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	314 xcidx(k+1) = new_nzmx;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	315 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	316 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	317
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	318 template <class T>
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	319 Sparse<T>::Sparse (const Array<T>& a, const idx_vector& r,
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	320 const idx_vector& c, octave_idx_type nr,
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	321 octave_idx_type nc, bool sum_terms)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	322 : rep (nil_rep ()), dimensions (), idx (0), idx_count (0)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	323 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	324 if (nr < 0)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	325 nr = r.extent (0);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	326 else if (r.extent (nr) > nr)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	327 (*current_liboctave_error_handler) ("sparse: row index %d out of bound %d",
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	328 r.extent (nr), nr);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	329
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	330 if (nc < 0)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	331 nc = c.extent (0);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	332 else if (c.extent (nc) > nc)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	333 (*current_liboctave_error_handler) ("sparse: column index %d out of bound %d",
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	334 r.extent (nc), nc);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	335
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	336 if (--rep->count == 0)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	337 delete rep;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	338 rep = new SparseRep (nr, nc);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	339
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	340 dimensions = dim_vector (nr, nc);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	341
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	342
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	343 octave_idx_type n = a.numel (), rl = r.length (nr), cl = c.length (nc);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	344 bool a_scalar = n == 1;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	345 if (a_scalar)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	346 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	347 if (rl != 1)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	348 n = rl;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	349 else if (cl != 1)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	350 n = cl;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	351 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	352
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	353 if ((rl != 1 && rl != n) \|\| (cl != 1 && cl != n))
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	354 (*current_liboctave_error_handler) ("sparse: dimension mismatch");
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	355
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	356 if (rl <= 1 && cl <= 1)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	357 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	358 if (n == 1 && a(0) != T ())
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	359 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	360 change_capacity (1);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	361 xridx(0) = r(0);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	362 xdata(0) = a(0);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	363 for (octave_idx_type j = 0; j < nc; j++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	364 xcidx(j+1) = j >= c(0);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	365 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	366 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	367 else if (a_scalar)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	368 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	369 // This is completely specialized, because the sorts can be simplified.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	370 T a0 = a(0);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	371 if (cl == 1)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	372 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	373 // Sparse column vector. Sort row indices.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	374 idx_vector rs = r.sorted ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	375
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	376 octave_quit ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	377
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	378 const octave_idx_type *rd = rs.raw ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	379 // Count unique indices.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	380 octave_idx_type new_nz = 1;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	381 for (octave_idx_type i = 1; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	382 new_nz += rd[i-1] != rd[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	383 // Allocate result.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	384 change_capacity (new_nz);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	385 xcidx (1) = new_nz;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	386 octave_idx_type *rri = ridx ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	387 T *rrd = data ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	388
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	389 octave_quit ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	390
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	391 octave_idx_type k = -1, l = -1;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	392
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	393 if (sum_terms)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	394 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	395 // Sum repeated indices.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	396 for (octave_idx_type i = 0; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	397 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	398 if (rd[i] != l)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	399 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	400 l = rd[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	401 rri[++k] = rd[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	402 rrd[k] = a0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	403 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	404 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	405 rrd[k] += a0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	406 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	407 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	408 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	409 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	410 // Pick the last one.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	411 for (octave_idx_type i = 1; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	412 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	413 if (rd[i] != l)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	414 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	415 l = rd[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	416 rrd[++k] = a0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	417 rri[k] = rd[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	418 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	419 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	420 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	421
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	422 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	423 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	424 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	425 idx_vector rr = r, cc = c;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	426 const octave_idx_type rd = rr.raw (), cd = cc.raw ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	427 OCTAVE_LOCAL_BUFFER_INIT (octave_idx_type, ci, nc+1, 0);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	428 ci[0] = 0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	429 // Bin counts of column indices.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	430 for (octave_idx_type i = 0; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	431 ci[cd[i]+1]++;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	432 // Make them cumulative, shifted one to right.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	433 for (octave_idx_type i = 1, s = 0; i <= nc; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	434 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	435 octave_idx_type s1 = s + ci[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	436 ci[i] = s;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	437 s = s1;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	438 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	439
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	440 octave_quit ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	441
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	442 // Bucket sort.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	443 OCTAVE_LOCAL_BUFFER (octave_idx_type, sidx, n);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	444 for (octave_idx_type i = 0; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	445 sidx[ci[cd[i]+1]++] = rd[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	446
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	447 // Subsorts. We don't need a stable sort, all values are equal.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	448 xcidx(0) = 0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	449 for (octave_idx_type j = 0; j < nc; j++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	450 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	451 std::sort (sidx + ci[j], sidx + ci[j+1]);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	452 octave_idx_type l = -1, nzj = 0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	453 // Count.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	454 for (octave_idx_type i = ci[j]; i < ci[j+1]; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	455 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	456 octave_idx_type k = sidx[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	457 if (k != l)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	458 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	459 l = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	460 nzj++;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	461 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	462 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	463 // Set column pointer.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	464 xcidx(j+1) = xcidx(j) + nzj;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	465 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	466
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	467 change_capacity (xcidx (nc));
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	468 octave_idx_type *rri = ridx ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	469 T *rrd = data ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	470
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	471 // Fill-in data.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	472 for (octave_idx_type j = 0, jj = -1; j < nc; j++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	473 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	474 octave_quit ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	475 octave_idx_type l = -1;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	476 if (sum_terms)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	477 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	478 // Sum adjacent terms.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	479 for (octave_idx_type i = ci[j]; i < ci[j+1]; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	480 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	481 octave_idx_type k = sidx[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	482 if (k != l)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	483 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	484 l = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	485 rrd[++jj] = a0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	486 rri[jj] = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	487 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	488 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	489 rrd[jj] += a0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	490 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	491 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	492 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	493 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	494 // Use the last one.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	495 for (octave_idx_type i = ci[j]; i < ci[j+1]; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	496 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	497 octave_idx_type k = sidx[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	498 if (k != l)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	499 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	500 l = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	501 rrd[++jj] = a0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	502 rri[jj] = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	503 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	504 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	505 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	506 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	507 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	508 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	509 else if (cl == 1)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	510 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	511 // Sparse column vector. Sort row indices.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	512 Array<octave_idx_type> rsi;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	513 idx_vector rs = r.sorted (rsi);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	514
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	515 octave_quit ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	516
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	517 const octave_idx_type rd = rs.raw (), rdi = rsi.data ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	518 // Count unique indices.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	519 octave_idx_type new_nz = 1;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	520 for (octave_idx_type i = 1; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	521 new_nz += rd[i-1] != rd[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	522 // Allocate result.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	523 change_capacity (new_nz);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	524 xcidx(1) = new_nz;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	525 octave_idx_type *rri = ridx ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	526 T *rrd = data ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	527
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	528 octave_quit ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	529
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	530 octave_idx_type k = 0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	531 rri[k] = rd[0];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	532 rrd[k] = a(rdi[0]);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	533
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	534 if (sum_terms)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	535 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	536 // Sum repeated indices.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	537 for (octave_idx_type i = 1; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	538 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	539 if (rd[i] != rd[i-1])
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	540 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	541 rri[++k] = rd[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	542 rrd[k] = a(rdi[i]);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	543 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	544 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	545 rrd[k] += a(rdi[i]);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	546 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	547 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	548 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	549 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	550 // Pick the last one.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	551 for (octave_idx_type i = 1; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	552 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	553 if (rd[i] != rd[i-1])
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	554 rri[++k] = rd[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	555 rrd[k] = a(rdi[i]);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	556 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	557 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	558 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	559 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	560 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	561 idx_vector rr = r, cc = c;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	562 const octave_idx_type rd = rr.raw (), cd = cc.raw ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	563 OCTAVE_LOCAL_BUFFER_INIT (octave_idx_type, ci, nc+1, 0);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	564 ci[0] = 0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	565 // Bin counts of column indices.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	566 for (octave_idx_type i = 0; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	567 ci[cd[i]+1]++;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	568 // Make them cumulative, shifted one to right.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	569 for (octave_idx_type i = 1, s = 0; i <= nc; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	570 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	571 octave_idx_type s1 = s + ci[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	572 ci[i] = s;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	573 s = s1;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	574 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	575
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	576 octave_quit ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	577
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	578 typedef std::pair<octave_idx_type, octave_idx_type> idx_pair;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	579 // Bucket sort.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	580 OCTAVE_LOCAL_BUFFER (idx_pair, spairs, n);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	581 for (octave_idx_type i = 0; i < n; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	582 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	583 idx_pair& p = spairs[ci[cd[i]+1]++];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	584 p.first = rd[i];
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	585 p.second = i;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	586 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	587
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	588 // Subsorts. We don't need a stable sort, the second index stabilizes it.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	589 xcidx(0) = 0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	590 for (octave_idx_type j = 0; j < nc; j++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	591 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	592 std::sort (spairs + ci[j], spairs + ci[j+1]);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	593 octave_idx_type l = -1, nzj = 0;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	594 // Count.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	595 for (octave_idx_type i = ci[j]; i < ci[j+1]; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	596 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	597 octave_idx_type k = spairs[i].first;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	598 if (k != l)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	599 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	600 l = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	601 nzj++;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	602 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	603 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	604 // Set column pointer.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	605 xcidx(j+1) = xcidx(j) + nzj;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	606 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	607
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	608 change_capacity (xcidx (nc));
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	609 octave_idx_type *rri = ridx ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	610 T *rrd = data ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	611
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	612 // Fill-in data.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	613 for (octave_idx_type j = 0, jj = -1; j < nc; j++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	614 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	615 octave_quit ();
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	616 octave_idx_type l = -1;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	617 if (sum_terms)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	618 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	619 // Sum adjacent terms.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	620 for (octave_idx_type i = ci[j]; i < ci[j+1]; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	621 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	622 octave_idx_type k = spairs[i].first;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	623 if (k != l)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	624 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	625 l = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	626 rrd[++jj] = a(spairs[i].second);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	627 rri[jj] = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	628 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	629 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	630 rrd[jj] += a(spairs[i].second);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	631 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	632 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	633 else
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	634 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	635 // Use the last one.
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	636 for (octave_idx_type i = ci[j]; i < ci[j+1]; i++)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	637 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	638 octave_idx_type k = spairs[i].first;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	639 if (k != l)
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	640 {
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	641 l = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	642 rri[++jj] = k;
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	643 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	644 rrd[jj] = a(spairs[i].second);
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	645 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	646 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	647 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	648 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	649 }
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	650
ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10468 diff changeset	651 template <class T>
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	652 Sparse<T>::Sparse (const Array<T>& a)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	653 : dimensions (a.dims ()), idx (0), idx_count (0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	654 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	655 if (dimensions.length () > 2)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	656 (*current_liboctave_error_handler)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	657 ("Sparse::Sparse (const Array<T>&): dimension mismatch");
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	658 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	659 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	660 octave_idx_type nr = rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	661 octave_idx_type nc = cols ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	662 octave_idx_type len = a.length ();
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	663 octave_idx_type new_nzmx = 0;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	664
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	665 // First count the number of non-zero terms
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	666 for (octave_idx_type i = 0; i < len; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	667 if (a(i) != T ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	668 new_nzmx++;
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	669
2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	670 rep = new typename Sparse<T>::SparseRep (nr, nc, new_nzmx);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	671
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	672 octave_idx_type ii = 0;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	673 xcidx(0) = 0;
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	674 for (octave_idx_type j = 0; j < nc; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	675 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	676 for (octave_idx_type i = 0; i < nr; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	677 if (a.elem (i,j) != T ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	678 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	679 xdata(ii) = a.elem (i,j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	680 xridx(ii++) = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	681 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	682 xcidx(j+1) = ii;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	683 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	684 }
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
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	687 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	688 Sparse<T>::~Sparse (void)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	689 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	690 if (--rep->count <= 0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	691 delete rep;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	692
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	693 delete [] idx;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	694 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	695
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	696 template <class T>
7717 ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	697 Sparse<T>&
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	698 Sparse<T>::operator = (const Sparse<T>& a)
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	699 {
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	700 if (this != &a)
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	701 {
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	702 if (--rep->count <= 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	703 delete rep;
7717 ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	704
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	705 rep = a.rep;
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	706 rep->count++;
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	707
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	708 dimensions = a.dimensions;
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	709
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	710 delete [] idx;
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	711 idx_count = 0;
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	712 idx = 0;
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	713 }
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	714
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	715 return *this;
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	716 }
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	717
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7620 diff changeset	718 template <class T>
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	719 octave_idx_type
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	720 Sparse<T>::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	721 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	722 octave_idx_type retval = -1;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	723
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	724 octave_idx_type n = dimensions.length ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	725
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	726 if (n > 0 && n == ra_idx.length ())
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	727 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	728 retval = ra_idx(--n);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	729
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	730 while (--n >= 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	731 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	732 retval *= dimensions(n);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	733 retval += ra_idx(n);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	734 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	735 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	736 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	737 (*current_liboctave_error_handler)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	738 ("Sparse<T>::compute_index: invalid ra_idxing operation");
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	739
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	740 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	741 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	742
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	743 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	744 T
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	745 Sparse<T>::range_error (const char *fcn, octave_idx_type n) const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	746 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	747 (*current_liboctave_error_handler) ("%s (%d): range error", fcn, n);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	748 return T ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	749 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	750
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	751 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	752 T&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	753 Sparse<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	754 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	755 (*current_liboctave_error_handler) ("%s (%d): range error", fcn, n);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	756 static T foo;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	757 return foo;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	758 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	759
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	760 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	761 T
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	762 Sparse<T>::range_error (const char *fcn, octave_idx_type i, octave_idx_type j) const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	763 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	764 (*current_liboctave_error_handler)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	765 ("%s (%d, %d): range error", fcn, i, j);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	766 return T ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	767 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	768
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	769 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	770 T&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	771 Sparse<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	772 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	773 (*current_liboctave_error_handler)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	774 ("%s (%d, %d): range error", fcn, i, j);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	775 static T foo;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	776 return foo;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	777 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	778
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	779 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	780 T
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	781 Sparse<T>::range_error (const char *fcn, const Array<octave_idx_type>& ra_idx) const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	782 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	783 std::ostringstream buf;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	784
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	785 buf << fcn << " (";
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	786
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	787 octave_idx_type n = ra_idx.length ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	788
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	789 if (n > 0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	790 buf << ra_idx(0);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	791
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	792 for (octave_idx_type i = 1; i < n; i++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	793 buf << ", " << ra_idx(i);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	794
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	795 buf << "): range error";
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	796
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	797 std::string buf_str = buf.str ();
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	798
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	799 (*current_liboctave_error_handler) (buf_str.c_str ());
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	800
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	801 return T ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	802 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	803
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	804 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	805 T&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	806 Sparse<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	807 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	808 std::ostringstream buf;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	809
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	810 buf << fcn << " (";
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	811
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	812 octave_idx_type n = ra_idx.length ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	813
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	814 if (n > 0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	815 buf << ra_idx(0);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	816
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	817 for (octave_idx_type i = 1; i < n; i++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	818 buf << ", " << ra_idx(i);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	819
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	820 buf << "): range error";
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	821
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	822 std::string buf_str = buf.str ();
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	823
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	824 (*current_liboctave_error_handler) (buf_str.c_str ());
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	825
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	826 static T foo;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	827 return foo;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	828 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	829
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	830 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	831 Sparse<T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	832 Sparse<T>::reshape (const dim_vector& new_dims) const
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	833 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	834 Sparse<T> retval;
6689 8e0444d90050 [project @ 2007-06-04 22:28:19 by dbateman] dbateman parents: 6101 diff changeset	835 dim_vector dims2 = new_dims;
8e0444d90050 [project @ 2007-06-04 22:28:19 by dbateman] dbateman parents: 6101 diff changeset	836
8e0444d90050 [project @ 2007-06-04 22:28:19 by dbateman] dbateman parents: 6101 diff changeset	837 if (dims2.length () > 2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	838 {
6814 8c89a644df8a [project @ 2007-08-14 17:30:59 by jwe] jwe parents: 6813 diff changeset	839 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	840 ("reshape: sparse reshape to N-d array smashes dims");
6814 8c89a644df8a [project @ 2007-08-14 17:30:59 by jwe] jwe parents: 6813 diff changeset	841
6689 8e0444d90050 [project @ 2007-06-04 22:28:19 by dbateman] dbateman parents: 6101 diff changeset	842 for (octave_idx_type i = 2; i < dims2.length(); i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	843 dims2(1) *= dims2(i);
6814 8c89a644df8a [project @ 2007-08-14 17:30:59 by jwe] jwe parents: 6813 diff changeset	844
6689 8e0444d90050 [project @ 2007-06-04 22:28:19 by dbateman] dbateman parents: 6101 diff changeset	845 dims2.resize (2);
8e0444d90050 [project @ 2007-06-04 22:28:19 by dbateman] dbateman parents: 6101 diff changeset	846 }
8e0444d90050 [project @ 2007-06-04 22:28:19 by dbateman] dbateman parents: 6101 diff changeset	847
8e0444d90050 [project @ 2007-06-04 22:28:19 by dbateman] dbateman parents: 6101 diff changeset	848 if (dimensions != dims2)
8e0444d90050 [project @ 2007-06-04 22:28:19 by dbateman] dbateman parents: 6101 diff changeset	849 {
8e0444d90050 [project @ 2007-06-04 22:28:19 by dbateman] dbateman parents: 6101 diff changeset	850 if (dimensions.numel () == dims2.numel ())
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	851 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	852 octave_idx_type new_nnz = nnz ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	853 octave_idx_type new_nr = dims2 (0);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	854 octave_idx_type new_nc = dims2 (1);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	855 octave_idx_type old_nr = rows ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	856 octave_idx_type old_nc = cols ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	857 retval = Sparse<T> (new_nr, new_nc, new_nnz);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	858
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	859 octave_idx_type kk = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	860 retval.xcidx(0) = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	861 for (octave_idx_type i = 0; i < old_nc; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	862 for (octave_idx_type j = cidx(i); j < cidx(i+1); j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	863 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	864 octave_idx_type tmp = i * old_nr + ridx(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	865 octave_idx_type ii = tmp % new_nr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	866 octave_idx_type jj = (tmp - ii) / new_nr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	867 for (octave_idx_type k = kk; k < jj; k++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	868 retval.xcidx(k+1) = j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	869 kk = jj;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	870 retval.xdata(j) = data(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	871 retval.xridx(j) = ii;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	872 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	873 for (octave_idx_type k = kk; k < new_nc; k++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	874 retval.xcidx(k+1) = new_nnz;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	875 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	876 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	877 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	878 std::string dimensions_str = dimensions.str ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	879 std::string new_dims_str = new_dims.str ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	880
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	881 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	882 ("reshape: can't reshape %s array to %s array",
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	883 dimensions_str.c_str (), new_dims_str.c_str ());
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	884 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	885 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	886 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	887 retval = *this;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	888
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	889 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	890 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	891
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	892 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	893 Sparse<T>
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	894 Sparse<T>::permute (const Array<octave_idx_type>& perm_vec, bool) const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	895 {
6813 75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	896 // The only valid permutations of a sparse array are [1, 2] and [2, 1].
75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	897
75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	898 bool fail = false;
6817 2e7f62e52c13 [project @ 2007-08-19 19:36:40 by dbateman] dbateman parents: 6814 diff changeset	899 bool trans = false;
6813 75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	900
75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	901 if (perm_vec.length () == 2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	902 {
6813 75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	903 if (perm_vec(0) == 0 && perm_vec(1) == 1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	904 /* do nothing */;
6813 75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	905 else if (perm_vec(0) == 1 && perm_vec(1) == 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	906 trans = true;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	907 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	908 fail = true;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	909 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	910 else
6813 75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	911 fail = true;
75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	912
75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	913 if (fail)
75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	914 (*current_liboctave_error_handler)
75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	915 ("permutation vector contains an invalid element");
75d99621f850 [project @ 2007-08-14 17:14:18 by jwe] jwe parents: 6689 diff changeset	916
6817 2e7f62e52c13 [project @ 2007-08-19 19:36:40 by dbateman] dbateman parents: 6814 diff changeset	917 return trans ? this->transpose () : *this;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	918 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	919
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	920 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	921 void
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	922 Sparse<T>::resize1 (octave_idx_type n)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	923 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	924 octave_idx_type nr = rows (), nc = cols ();
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	925
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	926 if (nr == 1 \|\| nr == 0)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	927 resize (1, n);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	928 else if (nc == 1)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	929 resize (n, 1);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	930 else
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	931 gripe_invalid_resize ();
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	932 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	933
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	934 template <class T>
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	935 void
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	936 Sparse<T>::resize (const dim_vector& dv)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	937 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	938 octave_idx_type n = dv.length ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	939
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	940 if (n != 2)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	941 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	942 (*current_liboctave_error_handler) ("sparse array must be 2-D");
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	943 return;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	944 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	945
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	946 resize (dv(0), dv(1));
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	947 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	948
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	949 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	950 void
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	951 Sparse<T>::resize (octave_idx_type r, octave_idx_type c)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	952 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	953 if (r < 0 \|\| c < 0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	954 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	955 (*current_liboctave_error_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	956 ("can't resize to negative dimension");
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	957 return;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	958 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	959
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	960 if (ndims () == 0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	961 dimensions = dim_vector (0, 0);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	962
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	963 if (r == dim1 () && c == dim2 ())
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	964 return;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	965
5731 c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5681 diff changeset	966 typename Sparse<T>::SparseRep *old_rep = rep;
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5681 diff changeset	967
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	968 octave_idx_type nc = cols ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	969 octave_idx_type nr = rows ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	970
5681 233d98d95659 [project @ 2006-03-16 17:48:55 by dbateman] dbateman parents: 5648 diff changeset	971 if (nnz () == 0 \|\| r == 0 \|\| c == 0)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	972 // Special case of redimensioning to/from a sparse matrix with
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	973 // no elements
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	974 rep = new typename Sparse<T>::SparseRep (r, c);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	975 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	976 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	977 octave_idx_type n = 0;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	978 Sparse<T> tmpval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	979 if (r >= nr)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	980 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	981 if (c > nc)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	982 n = xcidx(nc);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	983 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	984 n = xcidx(c);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	985
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	986 tmpval = Sparse<T> (r, c, n);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	987
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	988 if (c > nc)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	989 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	990 for (octave_idx_type i = 0; i < nc + 1; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	991 tmpval.cidx(i) = xcidx(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	992 for (octave_idx_type i = nc + 1; i < c + 1; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	993 tmpval.cidx(i) = tmpval.cidx(i-1);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	994 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	995 else if (c <= nc)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	996 for (octave_idx_type i = 0; i < c + 1; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	997 tmpval.cidx(i) = xcidx(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	998
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	999 for (octave_idx_type i = 0; i < n; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1000 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1001 tmpval.data(i) = xdata(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1002 tmpval.ridx(i) = xridx(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1003 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1004 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1005 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1006 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1007 // Count how many non zero terms before we do anything
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1008 octave_idx_type min_nc = (c < nc ? c : nc);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1009 for (octave_idx_type i = 0; i < min_nc; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1010 for (octave_idx_type j = xcidx(i); j < xcidx(i+1); j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1011 if (xridx(j) < r)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1012 n++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1013
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1014 if (n)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1015 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1016 // Now that we know the size we can do something
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1017 tmpval = Sparse<T> (r, c, n);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1018
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1019 tmpval.cidx(0);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1020 for (octave_idx_type i = 0, ii = 0; i < min_nc; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1021 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1022 for (octave_idx_type j = xcidx(i); j < xcidx(i+1); j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1023 if (xridx(j) < r)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1024 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1025 tmpval.data(ii) = xdata(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1026 tmpval.ridx(ii++) = xridx(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1027 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1028 tmpval.cidx(i+1) = ii;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1029 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1030 if (c > min_nc)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1031 for (octave_idx_type i = nc; i < c; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1032 tmpval.cidx(i+1) = tmpval.cidx(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1033 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1034 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1035 tmpval = Sparse<T> (r, c);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1036 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1037
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1038 rep = tmpval.rep;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1039 rep->count++;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1040 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1041
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1042 dimensions = dim_vector (r, c);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1043
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1044 if (--old_rep->count <= 0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1045 delete old_rep;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1046 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1047
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1048 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1049 Sparse<T>&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1050 Sparse<T>::insert (const Sparse<T>& a, octave_idx_type r, octave_idx_type c)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1051 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1052 octave_idx_type a_rows = a.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1053 octave_idx_type a_cols = a.cols ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1054 octave_idx_type nr = rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1055 octave_idx_type nc = cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1056
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1057 if (r < 0 \|\| r + a_rows > rows () \|\| c < 0 \|\| c + a_cols > cols ())
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1058 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1059 (*current_liboctave_error_handler) ("range error for insert");
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1060 return *this;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1061 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1062
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1063 // First count the number of elements in the final array
5681 233d98d95659 [project @ 2006-03-16 17:48:55 by dbateman] dbateman parents: 5648 diff changeset	1064 octave_idx_type nel = cidx(c) + a.nnz ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1065
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1066 if (c + a_cols < nc)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1067 nel += cidx(nc) - cidx(c + a_cols);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1068
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1069 for (octave_idx_type i = c; i < c + a_cols; i++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1070 for (octave_idx_type j = cidx(i); j < cidx(i+1); j++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1071 if (ridx(j) < r \|\| ridx(j) >= r + a_rows)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1072 nel++;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1073
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1074 Sparse<T> tmp (*this);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1075 --rep->count;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1076 rep = new typename Sparse<T>::SparseRep (nr, nc, nel);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1077
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1078 for (octave_idx_type i = 0; i < tmp.cidx(c); i++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1079 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1080 data(i) = tmp.data(i);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1081 ridx(i) = tmp.ridx(i);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1082 }
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1083 for (octave_idx_type i = 0; i < c + 1; i++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1084 cidx(i) = tmp.cidx(i);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1085
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1086 octave_idx_type ii = cidx(c);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1087
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1088 for (octave_idx_type i = c; i < c + a_cols; i++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1089 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	1090 octave_quit ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1091
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1092 for (octave_idx_type j = tmp.cidx(i); j < tmp.cidx(i+1); j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1093 if (tmp.ridx(j) < r)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1094 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1095 data(ii) = tmp.data(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1096 ridx(ii++) = tmp.ridx(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1097 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1098
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	1099 octave_quit ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1100
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1101 for (octave_idx_type j = a.cidx(i-c); j < a.cidx(i-c+1); j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1102 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1103 data(ii) = a.data(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1104 ridx(ii++) = r + a.ridx(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1105 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1106
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	1107 octave_quit ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1108
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1109 for (octave_idx_type j = tmp.cidx(i); j < tmp.cidx(i+1); j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1110 if (tmp.ridx(j) >= r + a_rows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1111 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1112 data(ii) = tmp.data(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1113 ridx(ii++) = tmp.ridx(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1114 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1115
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1116 cidx(i+1) = ii;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1117 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1118
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1119 for (octave_idx_type i = c + a_cols; i < nc; i++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1120 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1121 for (octave_idx_type j = tmp.cidx(i); j < tmp.cidx(i+1); j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1122 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1123 data(ii) = tmp.data(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1124 ridx(ii++) = tmp.ridx(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1125 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1126 cidx(i+1) = ii;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1127 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1128
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1129 return *this;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1130 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1131
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1132 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1133 Sparse<T>&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1134 Sparse<T>::insert (const Sparse<T>& a, const Array<octave_idx_type>& ra_idx)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1135 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1136
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1137 if (ra_idx.length () != 2)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1138 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1139 (*current_liboctave_error_handler) ("range error for insert");
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1140 return *this;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1141 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1142
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1143 return insert (a, ra_idx (0), ra_idx (1));
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1144 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1145
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1146 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1147 Sparse<T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1148 Sparse<T>::transpose (void) const
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1149 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1150 assert (ndims () == 2);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1151
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1152 octave_idx_type nr = rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1153 octave_idx_type nc = cols ();
5648 69a4f320d95a [project @ 2006-03-08 20:17:37 by dbateman] dbateman parents: 5630 diff changeset	1154 octave_idx_type nz = nnz ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1155 Sparse<T> retval (nc, nr, nz);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1156
5648 69a4f320d95a [project @ 2006-03-08 20:17:37 by dbateman] dbateman parents: 5630 diff changeset	1157 for (octave_idx_type i = 0; i < nz; i++)
8987 542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1158 retval.xcidx (ridx (i) + 1)++;
542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1159 // retval.xcidx[1:nr] holds the row degrees for rows 0:(nr-1)
5648 69a4f320d95a [project @ 2006-03-08 20:17:37 by dbateman] dbateman parents: 5630 diff changeset	1160 nz = 0;
8987 542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1161 for (octave_idx_type i = 1; i <= nr; i++)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1162 {
8987 542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1163 const octave_idx_type tmp = retval.xcidx (i);
542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1164 retval.xcidx (i) = nz;
542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1165 nz += tmp;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1166 }
8987 542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1167 // retval.xcidx[1:nr] holds row entry start offsets for rows 0:(nr-1)
5648 69a4f320d95a [project @ 2006-03-08 20:17:37 by dbateman] dbateman parents: 5630 diff changeset	1168
69a4f320d95a [project @ 2006-03-08 20:17:37 by dbateman] dbateman parents: 5630 diff changeset	1169 for (octave_idx_type j = 0; j < nc; j++)
69a4f320d95a [project @ 2006-03-08 20:17:37 by dbateman] dbateman parents: 5630 diff changeset	1170 for (octave_idx_type k = cidx(j); k < cidx(j+1); k++)
69a4f320d95a [project @ 2006-03-08 20:17:37 by dbateman] dbateman parents: 5630 diff changeset	1171 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1172 octave_idx_type q = retval.xcidx (ridx (k) + 1)++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1173 retval.xridx (q) = j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1174 retval.xdata (q) = data (k);
5648 69a4f320d95a [project @ 2006-03-08 20:17:37 by dbateman] dbateman parents: 5630 diff changeset	1175 }
8987 542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1176 assert (nnz () == retval.xcidx (nr));
542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1177 // retval.xcidx[1:nr] holds row entry end offsets for rows 0:(nr-1)
542015fada9e Eliminate the workspace in sparse transpose. Jason Riedy <jason@acm.org> parents: 8920 diff changeset	1178 // and retval.xcidx[0:(nr-1)] holds their row entry start offsets
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1179
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1180 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1181 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1182
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1183 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1184 void
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1185 Sparse<T>::clear_index (void)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1186 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1187 delete [] idx;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1188 idx = 0;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1189 idx_count = 0;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1190 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1191
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1192 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1193 void
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1194 Sparse<T>::set_index (const idx_vector& idx_arg)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1195 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1196 octave_idx_type nd = ndims ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1197
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1198 if (! idx && nd > 0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1199 idx = new idx_vector [nd];
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1200
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1201 if (idx_count < nd)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1202 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1203 idx[idx_count++] = idx_arg;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1204 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1205 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1206 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1207 idx_vector *new_idx = new idx_vector [idx_count+1];
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1208
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1209 for (octave_idx_type i = 0; i < idx_count; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1210 new_idx[i] = idx[i];
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1211
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1212 new_idx[idx_count++] = idx_arg;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1213
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1214 delete [] idx;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1215
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1216 idx = new_idx;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1217 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1218 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1219
10493 2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1220 // Lower bound lookup. Could also use octave_sort, but that has upper bound
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1221 // semantics, so requires some manipulation to set right. Uses a plain loop for
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1222 // small columns.
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1223 static octave_idx_type
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1224 lblookup (const octave_idx_type *ridx, octave_idx_type nr,
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1225 octave_idx_type ri)
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1226 {
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1227 if (nr <= 8)
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1228 {
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1229 octave_idx_type l;
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1230 for (l = 0; l < nr; l++)
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1231 if (ridx[l] >= ri)
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1232 break;
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1233 return l;
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1234 }
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1235 else
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1236 return std::lower_bound (ridx, ridx + nr, ri) - ridx;
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1237 }
2f8bacc2a57d fix order of func defs in Sparse.cc Jaroslav Hajek <highegg@gmail.com> parents: 10490 diff changeset	1238
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1239 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1240 void
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1241 Sparse<T>::delete_elements (const idx_vector& idx)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1242 {
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1243 Sparse<T> retval;
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1244
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1245 assert (ndims () == 2);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1246
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1247 // FIXME: please don't fix the shadowed member warning yet because
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1248 // Sparse<T>::idx will eventually go away.
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1249
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1250 octave_idx_type nr = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1251 octave_idx_type nc = dim2 ();
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1252 octave_idx_type nz = nnz ();
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1253
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1254 octave_idx_type nel = numel (); // Can throw.
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1255
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1256 const dim_vector idx_dims = idx.orig_dimensions ();
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1257
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1258 if (idx.extent (nel) > nel)
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1259 gripe_del_index_out_of_range (true, idx.extent (nel), nel);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1260 else if (nc == 1)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1261 {
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1262 // Sparse column vector.
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1263 const Sparse<T> tmp = *this; // constant copy to prevent COW.
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1264
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1265 octave_idx_type lb, ub;
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1266
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1267 if (idx.is_cont_range (nel, lb, ub))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1268 {
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1269 // Special-case a contiguous range.
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1270 // Look-up indices first.
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1271 octave_idx_type li = lblookup (tmp.ridx (), nz, lb);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1272 octave_idx_type ui = lblookup (tmp.ridx (), nz, ub);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1273 // Copy data and adjust indices.
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1274 octave_idx_type nz_new = nz - (ui - li);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1275 *this = Sparse<T> (nr - (ub - lb), 1, nz_new);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1276 copy_or_memcpy (li, tmp.data (), data ());
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1277 copy_or_memcpy (li, tmp.ridx (), xridx ());
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1278 copy_or_memcpy (nz - ui, tmp.data () + ui, xdata () + li);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1279 mx_inline_sub (nz - ui, xridx () + li, tmp.ridx () + ui, ub - lb);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1280 xcidx(1) = nz_new;
10382 1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1281 }
1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1282 else
1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1283 {
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1284 OCTAVE_LOCAL_BUFFER (octave_idx_type, ridx_new, nz);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1285 OCTAVE_LOCAL_BUFFER (T, data_new, nz);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1286 idx_vector sidx = idx.sorted (true);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1287 const octave_idx_type *sj = sidx.raw ();
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1288 octave_idx_type sl = sidx.length (nel), nz_new = 0, j = 0;
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1289 for (octave_idx_type i = 0; i < nz; i++)
10382 1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1290 {
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1291 octave_idx_type r = tmp.ridx(i);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1292 for (;j < sl && sj[j] < r; j++) ;
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1293 if (j == sl \|\| sj[j] > r)
10382 1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1294 {
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1295 data_new[nz_new] = tmp.data(i);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1296 ridx_new[nz_new++] = r - j;
10382 1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1297 }
1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1298 }
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1299
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1300 *this = Sparse<T> (nr - sl, 1, nz_new);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1301 copy_or_memcpy (nz_new, ridx_new, ridx ());
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1302 copy_or_memcpy (nz_new, data_new, xdata ());
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1303 xcidx(1) = nz_new;
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1304 }
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1305 }
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1306 else if (nr == 1)
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1307 {
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1308 // Sparse row vector.
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1309 octave_idx_type lb, ub;
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1310 if (idx.is_cont_range (nc, lb, ub))
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1311 {
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1312 const Sparse<T> tmp = *this;
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1313 octave_idx_type lbi = tmp.cidx(lb), ubi = tmp.cidx(ub), new_nz = nz - (ubi - lbi);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1314 *this = Sparse<T> (1, nc - (ub - lb), new_nz);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1315 copy_or_memcpy (lbi, tmp.data (), data ());
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1316 copy_or_memcpy (nz - ubi, tmp.data () + ubi, xdata () + lbi);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1317 fill_or_memset (new_nz, static_cast<octave_idx_type> (0), ridx ());
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1318 copy_or_memcpy (lb, tmp.cidx () + 1, cidx () + 1);
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1319 mx_inline_sub (nc - ub, xcidx () + 1, tmp.cidx () + ub + 1, ubi - lbi);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1320 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1321 else
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1322 *this = index (idx.complement (nc));
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1323 }
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1324 else
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1325 {
6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1326 *this = index (idx_vector::colon);
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1327 delete_elements (idx);
10484 6a9571b57745 rewrite sparse null assignment (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10480 diff changeset	1328 *this = transpose (); // We want a row vector.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1329 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1330 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1331
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1332 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1333 void
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1334 Sparse<T>::delete_elements (const idx_vector& idx_i, const idx_vector& idx_j)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1335 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1336 assert (ndims () == 2);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1337
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1338 octave_idx_type nr = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1339 octave_idx_type nc = dim2 ();
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1340 octave_idx_type nz = nnz ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1341
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1342 if (idx_i.is_colon ())
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1343 {
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1344 // Deleting columns.
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1345 octave_idx_type lb, ub;
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1346 if (idx_j.extent (nc) > nc)
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1347 gripe_del_index_out_of_range (false, idx_j.extent (nc), nc);
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1348 else if (idx_j.is_cont_range (nc, lb, ub))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1349 {
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1350 const Sparse<T> tmp = *this;
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1351 octave_idx_type lbi = tmp.cidx(lb), ubi = tmp.cidx(ub), new_nz = nz - (ubi - lbi);
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1352 *this = Sparse<T> (nr, nc - (ub - lb), new_nz);
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1353 copy_or_memcpy (lbi, tmp.data (), data ());
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1354 copy_or_memcpy (lbi, tmp.ridx (), ridx ());
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1355 copy_or_memcpy (nz - ubi, tmp.data () + ubi, xdata () + lbi);
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1356 copy_or_memcpy (nz - ubi, tmp.ridx () + ubi, xridx () + lbi);
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1357 copy_or_memcpy (lb, tmp.cidx () + 1, cidx () + 1);
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1358 mx_inline_sub (nc - ub, xcidx () + 1, tmp.cidx () + ub + 1, ubi - lbi);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1359 }
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1360 else
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1361 *this = index (idx_i, idx_j.complement (nc));
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1362 }
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1363 else if (idx_j.is_colon ())
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1364 {
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1365 // Deleting rows.
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1366 octave_idx_type lb, ub;
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1367 if (idx_i.extent (nr) > nr)
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1368 gripe_del_index_out_of_range (false, idx_i.extent (nr), nr);
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1369 else if (idx_i.is_cont_range (nr, lb, ub))
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1370 {
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1371 // This is more memory-efficient than the approach below.
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1372 const Sparse<T> tmpl = index (idx_vector (0, lb), idx_j);
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1373 const Sparse<T> tmpu = index (idx_vector (ub, nr), idx_j);
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1374 *this = Sparse<T> (nr - (ub - lb), nc, tmpl.nnz () + tmpu.nnz ());
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1375 for (octave_idx_type j = 0, k = 0; j < nc; j++)
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1376 {
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1377 for (octave_idx_type i = tmpl.cidx(j); i < tmpl.cidx(j+1); i++)
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1378 {
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1379 xdata(k) = tmpl.data(i);
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1380 xridx(k++) = tmpl.ridx(i);
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1381 }
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1382 for (octave_idx_type i = tmpu.cidx(j); i < tmpu.cidx(j+1); i++)
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1383 {
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1384 xdata(k) = tmpu.data(i);
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1385 xridx(k++) = tmpu.ridx(i) + lb;
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1386 }
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1387
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1388 xcidx(j+1) = k;
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1389 }
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1390 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1391 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1392 {
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1393 // This is done by transposing, deleting columns, then transposing
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1394 // again.
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1395 Sparse<T> tmp = transpose ();
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1396 tmp.delete_elements (idx_j, idx_i);
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1397 *this = tmp.transpose ();
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1398 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1399 }
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1400 else
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1401 (*current_liboctave_error_handler)
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1402 ("A null assignment can only have one non-colon index.");
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1403 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1404
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1405 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1406 void
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1407 Sparse<T>::delete_elements (int dim, const idx_vector& idx)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1408 {
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1409 if (dim == 0)
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1410 delete_elements (idx, idx_vector::colon);
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1411 else if (dim == 1)
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1412 delete_elements (idx_vector::colon, idx);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1413 else
10490 fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1414 {
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1415 (*current_liboctave_error_handler)
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1416 ("invalid dimension in delete_elements");
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1417 return;
fdccd69d26bd rewrite sparse null assignment (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10484 diff changeset	1418 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1419 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1420
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1421 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1422 Sparse<T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1423 Sparse<T>::value (void)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1424 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1425 Sparse<T> retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1426
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1427 int n_idx = index_count ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1428
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1429 if (n_idx == 2)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1430 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1431 idx_vector *tmp = get_idx ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1432
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1433 idx_vector idx_i = tmp[0];
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1434 idx_vector idx_j = tmp[1];
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1435
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1436 retval = index (idx_i, idx_j);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1437 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1438 else if (n_idx == 1)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1439 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1440 retval = index (idx[0]);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1441 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1442 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1443 (*current_liboctave_error_handler)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1444 ("Sparse<T>::value: invalid number of indices specified");
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1445
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1446 clear_index ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1447
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1448 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1449 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1450
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1451 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1452 Sparse<T>
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1453 Sparse<T>::index (const idx_vector& idx, bool resize_ok) const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1454 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1455 Sparse<T> retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1456
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1457 assert (ndims () == 2);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1458
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1459 // FIXME: please don't fix the shadowed member warning yet because
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1460 // Sparse<T>::idx will eventually go away.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1461
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1462 octave_idx_type nr = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1463 octave_idx_type nc = dim2 ();
5681 233d98d95659 [project @ 2006-03-16 17:48:55 by dbateman] dbateman parents: 5648 diff changeset	1464 octave_idx_type nz = nnz ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1465
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1466 octave_idx_type nel = numel (); // Can throw.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1467
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1468 const dim_vector idx_dims = idx.orig_dimensions ();
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1469
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1470 if (idx_dims.length () > 2)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1471 (*current_liboctave_error_handler)
10421 99e9bae2d81e improve sparse indexing interface Jaroslav Hajek <highegg@gmail.com> parents: 10382 diff changeset	1472 ("cannot index sparse matrix with an N-D Array");
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1473 else if (idx.is_colon ())
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1474 {
10494 e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1475 if (nc == 1)
e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1476 retval = *this;
e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1477 else
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1478 {
10494 e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1479 // Fast magic colon processing.
e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1480 retval = Sparse<T> (nel, 1, nz);
e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1481
e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1482 for (octave_idx_type i = 0; i < nc; i++)
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1483 {
10494 e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1484 for (octave_idx_type j = cidx(i); j < cidx(i+1); j++)
e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1485 {
e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1486 retval.xdata(j) = data(j);
e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1487 retval.xridx(j) = ridx(j) + i * nr;
e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1488 }
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1489 }
10494 e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1490
e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1491 retval.xcidx(0) = 0;
e52f41fd82c7 optimize (:) indexing of sparse column vectors Jaroslav Hajek <highegg@gmail.com> parents: 10493 diff changeset	1492 retval.xcidx(1) = nz;
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1493 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1494 }
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1495 else if (idx.extent (nel) > nel)
10421 99e9bae2d81e improve sparse indexing interface Jaroslav Hajek <highegg@gmail.com> parents: 10382 diff changeset	1496 {
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1497 // resize_ok is completely handled here.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1498 if (resize_ok)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1499 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1500 octave_idx_type ext = idx.extent (nel);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1501 Sparse<T> tmp = *this;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1502 tmp.resize1 (ext);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1503 retval = tmp.index (idx);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1504 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1505 else
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1506 gripe_index_out_of_range (1, 1, idx.extent (nel), nel);
10421 99e9bae2d81e improve sparse indexing interface Jaroslav Hajek <highegg@gmail.com> parents: 10382 diff changeset	1507 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1508 else if (nr == 1 && nc == 1)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1509 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1510 // You have to be pretty sick to get to this bit of code,
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1511 // since you have a scalar stored as a sparse matrix, and
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1512 // then want to make a dense matrix with sparse
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1513 // representation. Ok, we'll do it, but you deserve what
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1514 // you get!!
10432 10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1515 retval = Sparse<T> (idx_dims(0), idx_dims(1), nz ? data(0) : T ());
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1516 }
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1517 else if (nc == 1)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1518 {
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1519 // Sparse column vector.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1520 octave_idx_type lb, ub;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1521
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1522 if (idx.is_scalar ())
10382 1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1523 {
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1524 // Scalar index - just a binary lookup.
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1525 octave_idx_type i = lblookup (ridx (), nz, idx(0));
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1526 if (i < nz && ridx(i) == idx(0))
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1527 retval = Sparse (1, 1, data(i));
10382 1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1528 else
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1529 retval = Sparse (1, 1);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1530 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1531 else if (idx.is_cont_range (nel, lb, ub))
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1532 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1533 // Special-case a contiguous range.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1534 // Look-up indices first.
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1535 octave_idx_type li = lblookup (ridx (), nz, lb);
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1536 octave_idx_type ui = lblookup (ridx (), nz, ub);
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1537 // Copy data and adjust indices.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1538 octave_idx_type nz_new = ui - li;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1539 retval = Sparse<T> (ub - lb, 1, nz_new);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1540 copy_or_memcpy (nz_new, data () + li, retval.data ());
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1541 mx_inline_sub (nz_new, retval.xridx (), ridx () + li, lb);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1542 retval.xcidx(1) = nz_new;
10382 1766c133674c Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors David Bateman <dbateman@free.fr> parents: 10367 diff changeset	1543 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1544 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1545 {
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1546 // If indexing a sparse column vector by a vector, the result is a
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1547 // sparse column vector, otherwise it inherits the shape of index.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1548 // Vector transpose is cheap, so do it right here.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1549 const Array<octave_idx_type> idxa = (idx_dims(0) == 1
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1550 ? idx.as_array ().transpose ()
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1551 : idx.as_array ());
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1552
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1553 octave_idx_type new_nr = idxa.rows (), new_nc = idxa.cols ();
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1554
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1555 // Lookup.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1556 // FIXME: Could specialize for sorted idx?
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1557 NoAlias< Array<octave_idx_type> > lidx (new_nr, new_nc);
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1558 for (octave_idx_type i = 0; i < new_nr*new_nc; i++)
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1559 lidx(i) = lblookup (ridx (), nz, idxa(i));
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1560
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1561 // Count matches.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1562 retval = Sparse<T> (idxa.rows (), idxa.cols ());
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1563 for (octave_idx_type j = 0; j < new_nc; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1564 {
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1565 octave_idx_type nzj = 0;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1566 for (octave_idx_type i = 0; i < new_nr; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1567 {
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1568 octave_idx_type l = lidx(i, j);
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1569 if (l < nz && ridx(l) == idxa(i, j))
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1570 nzj++;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1571 else
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1572 lidx(i, j) = nz;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1573 }
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1574 retval.xcidx(j+1) = retval.xcidx(j) + nzj;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1575 }
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1576
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1577 retval.change_capacity (retval.xcidx(new_nc));
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1578
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1579 // Copy data and set row indices.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1580 octave_idx_type k = 0;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1581 for (octave_idx_type j = 0; j < new_nc; j++)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1582 for (octave_idx_type i = 0; i < new_nr; i++)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1583 {
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1584 octave_idx_type l = lidx(i, j);
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1585 if (l < nz)
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1586 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1587 retval.data(k) = data(l);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1588 retval.xridx(k++) = i;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1589 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1590 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1591 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1592 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1593 else if (nr == 1)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1594 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1595 octave_idx_type lb, ub;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1596 if (idx.is_scalar ())
10432 10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1597 retval = Sparse<T> (1, 1, elem(0, idx(0)));
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1598 else if (idx.is_cont_range (nel, lb, ub))
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1599 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1600 // Special-case a contiguous range.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1601 octave_idx_type lbi = cidx(lb), ubi = cidx(ub), new_nz = ubi - lbi;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1602 retval = Sparse<T> (1, ub - lb, new_nz);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1603 copy_or_memcpy (new_nz, data () + lbi, retval.data ());
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1604 fill_or_memset (new_nz, static_cast<octave_idx_type> (0), retval.ridx ());
10432 10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1605 mx_inline_sub (ub - lb + 1, retval.cidx (), cidx () + lb, lbi);
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1606 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1607 else
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1608 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1609 // Sparse row vectors occupy O(nr) storage anyway, so let's just
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1610 // convert the matrix to full, index, and sparsify the result.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1611 retval = Sparse<T> (array_value ().index (idx));
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1612 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1613 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1614 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1615 {
7573 755bf7ecc29b eliminate one_zero stuff from idx_vector John W. Eaton <jwe@octave.org> parents: 7546 diff changeset	1616 (*current_liboctave_warning_with_id_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1617 ("Octave:fortran-indexing", "single index used for sparse matrix");
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1618
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1619 if (nr != 0 && idx.is_scalar ())
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1620 retval = Sparse<T> (1, 1, elem (idx(0) % nr, idx(0) / nr));
10421 99e9bae2d81e improve sparse indexing interface Jaroslav Hajek <highegg@gmail.com> parents: 10382 diff changeset	1621 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1622 {
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1623 // Indexing a non-vector sparse matrix by linear indexing.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1624 // I suppose this is rare (and it may easily overflow), so let's take the easy way,
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1625 // and reshape first to column vector, which is already handled above.
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1626 retval = index (idx_vector::colon).index (idx);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1627 // In this case we're supposed to always inherit the shape, but column(row) doesn't do
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1628 // it, so we'll do it instead.
10432 10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1629 if (idx_dims(0) == 1 && idx_dims(1) != 1)
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	1630 retval = retval.transpose ();
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1631 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1632 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1633
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1634 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1635 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1636
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1637 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1638 Sparse<T>
10421 99e9bae2d81e improve sparse indexing interface Jaroslav Hajek <highegg@gmail.com> parents: 10382 diff changeset	1639 Sparse<T>::index (const idx_vector& idx_i, const idx_vector& idx_j, bool resize_ok) const
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1640 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1641 Sparse<T> retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1642
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1643 assert (ndims () == 2);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1644
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1645 octave_idx_type nr = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1646 octave_idx_type nc = dim2 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	1647
10421 99e9bae2d81e improve sparse indexing interface Jaroslav Hajek <highegg@gmail.com> parents: 10382 diff changeset	1648 octave_idx_type n = idx_i.length (nr);
99e9bae2d81e improve sparse indexing interface Jaroslav Hajek <highegg@gmail.com> parents: 10382 diff changeset	1649 octave_idx_type m = idx_j.length (nc);
99e9bae2d81e improve sparse indexing interface Jaroslav Hajek <highegg@gmail.com> parents: 10382 diff changeset	1650
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1651 octave_idx_type lb, ub;
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1652
10432 10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1653 if (idx_i.extent (nr) > nr \|\| idx_j.extent (nc) > nc)
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1654 {
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1655 // resize_ok is completely handled here.
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1656 if (resize_ok)
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1657 {
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1658 octave_idx_type ext_i = idx_i.extent (nr);
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1659 octave_idx_type ext_j = idx_j.extent (nc);
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1660 Sparse<T> tmp = *this;
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1661 tmp.resize (ext_i, ext_j);
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1662 retval = tmp.index (idx_i, idx_j);
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1663 }
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1664 else if (idx_i.extent (nr) > nr)
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1665 gripe_index_out_of_range (2, 1, idx_i.extent (nr), nr);
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1666 else
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1667 gripe_index_out_of_range (2, 2, idx_j.extent (nc), nc);
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1668 }
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1669 else if (idx_i.is_colon ())
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1670 {
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1671 // Great, we're just manipulating columns. This is going to be quite
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1672 // efficient, because the columns can stay compressed as they are.
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1673 if (idx_j.is_colon ())
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1674 retval = *this; // Shallow copy.
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1675 else if (idx_j.is_cont_range (nc, lb, ub))
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1676 {
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1677 // Special-case a contiguous range.
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1678 octave_idx_type lbi = cidx(lb), ubi = cidx(ub), new_nz = ubi - lbi;
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1679 retval = Sparse<T> (nr, ub - lb, new_nz);
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1680 copy_or_memcpy (new_nz, data () + lbi, retval.data ());
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1681 copy_or_memcpy (new_nz, ridx () + lbi, retval.ridx ());
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1682 mx_inline_sub (ub - lb + 1, retval.cidx (), cidx () + lb, lbi);
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1683 }
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1684 else
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1685 {
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1686 // Count new nonzero elements.
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1687 retval = Sparse<T> (nr, m);
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1688 for (octave_idx_type j = 0; j < m; j++)
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1689 {
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1690 octave_idx_type jj = idx_j(j);
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1691 retval.xcidx(j+1) = retval.xcidx(j) + (cidx(jj+1) - cidx(jj));
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1692 }
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1693
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1694 retval.change_capacity (retval.xcidx (m));
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1695
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1696 // Copy data & indices.
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1697 for (octave_idx_type j = 0; j < m; j++)
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1698 {
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1699 octave_idx_type ljj = cidx(idx_j(j));
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1700 octave_idx_type lj = retval.xcidx(j), nzj = retval.xcidx(j+1) - lj;
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1701 copy_or_memcpy (nzj, data () + ljj, retval.data () + lj);
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1702 copy_or_memcpy (nzj, ridx () + ljj, retval.ridx () + lj);
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1703 }
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1704 }
10207338603a improve sparse 2D indexing (part 1) Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1705 }
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1706 else if (idx_i.is_scalar ())
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1707 {
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1708 octave_idx_type ii = idx_i(0);
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1709 retval = Sparse<T> (1, m);
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1710 OCTAVE_LOCAL_BUFFER (octave_idx_type, ij, m);
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1711 for (octave_idx_type j = 0; j < m; j++)
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1712 {
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1713 octave_quit ();
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1714 octave_idx_type jj = idx_j(j), lj = cidx(jj), nzj = cidx(jj+1) - cidx(jj);
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1715 // Scalar index - just a binary lookup.
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1716 octave_idx_type i = lblookup (ridx () + lj, nzj, ii);
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1717 if (i < nzj && ridx(i+lj) == ii)
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1718 {
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1719 ij[j] = i + lj;
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1720 retval.xcidx(j+1) = retval.xcidx(j) + 1;
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1721 }
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1722 else
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1723 retval.xcidx(j+1) = retval.xcidx(j);
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1724 }
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1725
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1726 retval.change_capacity (retval.xcidx(m));
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1727
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1728 // Copy data, adjust row indices.
10442 3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1729 for (octave_idx_type j = 0; j < m; j++)
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1730 {
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1731 octave_idx_type i = retval.xcidx(j);
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1732 if (retval.xcidx(j+1) > i)
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1733 {
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1734 retval.xridx(i) = 0;
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1735 retval.xdata(i) = data(ij[j]);
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1736 }
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1737 }
3011d1765a6e improve sparse 2d indexing (part 2) Jaroslav Hajek <highegg@gmail.com> parents: 10432 diff changeset	1738 }
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1739 else if (idx_i.is_cont_range (nr, lb, ub))
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1740 {
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1741 retval = Sparse<T> (n, m);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1742 OCTAVE_LOCAL_BUFFER (octave_idx_type, li, m);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1743 OCTAVE_LOCAL_BUFFER (octave_idx_type, ui, m);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1744 for (octave_idx_type j = 0; j < m; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1745 {
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1746 octave_quit ();
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1747 octave_idx_type jj = idx_j(j), lj = cidx(jj), nzj = cidx(jj+1) - cidx(jj);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1748 octave_idx_type lij, uij;
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1749 // Lookup indices.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1750 li[j] = lij = lblookup (ridx () + lj, nzj, lb) + lj;
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1751 ui[j] = uij = lblookup (ridx () + lj, nzj, ub) + lj;
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1752 retval.xcidx(j+1) = retval.xcidx(j) + ui[j] - li[j];
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1753 }
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1754
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1755 retval.change_capacity (retval.xcidx(m));
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1756
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1757 // Copy data, adjust row indices.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1758 for (octave_idx_type j = 0, k = 0; j < m; j++)
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1759 {
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1760 octave_quit ();
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1761 for (octave_idx_type i = li[j]; i < ui[j]; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1762 {
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1763 retval.xdata(k) = data(i);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1764 retval.xridx(k++) = ridx(i) - lb;
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1765 }
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1766 }
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1767 }
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1768 else if (idx_i.is_permutation (nr))
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1769 {
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1770 // The columns preserve their length, we just need to renumber and sort them.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1771 // Count new nonzero elements.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1772 retval = Sparse<T> (nr, m);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1773 for (octave_idx_type j = 0; j < m; j++)
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1774 {
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1775 octave_idx_type jj = idx_j(j);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1776 retval.xcidx(j+1) = retval.xcidx(j) + (cidx(jj+1) - cidx(jj));
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1777 }
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1778
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1779 retval.change_capacity (retval.xcidx (m));
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1780
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1781 octave_quit ();
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1782
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1783 if (idx_i.is_range () && idx_i.increment () == -1)
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1784 {
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1785 // It's nr:-1:1. Just flip all columns.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1786 for (octave_idx_type j = 0; j < m; j++)
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1787 {
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1788 octave_quit ();
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1789 octave_idx_type jj = idx_j(j), lj = cidx(jj), nzj = cidx(jj+1) - cidx(jj);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1790 octave_idx_type li = retval.xcidx(j), uj = lj + nzj - 1;
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1791 for (octave_idx_type i = 0; i < nzj; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1792 {
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1793 retval.xdata(li + i) = data(uj - i); // Copy in reverse order.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1794 retval.xridx(li + i) = nr - 1 - ridx(uj - i); // Ditto with transform.
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1795 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1796 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1797 }
10468 197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1798 else
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1799 {
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1800 // Get inverse permutation.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1801 OCTAVE_LOCAL_BUFFER (octave_idx_type, iinv, nr);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1802 const Array<octave_idx_type> ia = idx_i.as_array ();
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1803 for (octave_idx_type i = 0; i < nr; i++)
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1804 iinv[ia(i)] = i;
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1805
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1806 // Scatter buffer.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1807 OCTAVE_LOCAL_BUFFER (T, scb, nr);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1808 octave_idx_type *rri = retval.ridx ();
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1809
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1810 for (octave_idx_type j = 0; j < m; j++)
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1811 {
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1812 octave_quit ();
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1813 octave_idx_type jj = idx_j(j), lj = cidx(jj), nzj = cidx(jj+1) - cidx(jj);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1814 octave_idx_type li = retval.xcidx(j);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1815 // Scatter the column, transform indices.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1816 for (octave_idx_type i = 0; i < nzj; i++)
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1817 scb[rri[li + i] = iinv[ridx(lj + i)]] = data(lj + i);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1818
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1819 octave_quit ();
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1820
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1821 // Sort them.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1822 std::sort (rri + li, rri + li + nzj);
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1823
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1824 // Gather.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1825 for (octave_idx_type i = 0; i < nzj; i++)
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1826 retval.xdata(li + i) = scb[rri[li + i]];
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1827 }
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1828 }
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1829
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1830 }
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1831 else
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1832 {
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1833 // This is the most general case, where all optimizations failed.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1834 // I suppose this is a relatively rare case, so it will be done
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1835 // as s(i,j) = ((s(:,j).')(:,i)).'
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1836 // Note that if j is :, the first indexing expr. is a shallow copy.
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1837 retval = index (idx_vector::colon, idx_j).transpose ();
197b096001b7 improve sparse 2d indexing (part 3) Jaroslav Hajek <highegg@gmail.com> parents: 10442 diff changeset	1838 retval = retval.index (idx_vector::colon, idx_i).transpose ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1839 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1840
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1841 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1842 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	1843
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1844 // Can't use versions of these in Array.cc due to duplication of the
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1845 // instantiations for Array<double and Sparse<double>, etc
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1846 template <class T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1847 bool
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	1848 sparse_ascending_compare (typename ref_param<T>::type a,
06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	1849 typename ref_param<T>::type b)
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1850 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1851 return (a < b);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1852 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1853
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1854 template <class T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1855 bool
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	1856 sparse_descending_compare (typename ref_param<T>::type a,
06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	1857 typename ref_param<T>::type b)
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1858 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1859 return (a > b);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1860 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1861
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1862 template <class T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1863 Sparse<T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1864 Sparse<T>::sort (octave_idx_type dim, sortmode mode) const
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1865 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1866 Sparse<T> m = *this;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1867
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1868 octave_idx_type nr = m.rows ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1869 octave_idx_type nc = m.columns ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1870
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1871 if (m.length () < 1)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1872 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1873
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1874 if (dim > 0)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1875 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1876 m = m.transpose ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1877 nr = m.rows ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1878 nc = m.columns ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1879 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1880
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1881 octave_sort<T> lsort;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1882
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1883 if (mode == ASCENDING)
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	1884 lsort.set_compare (sparse_ascending_compare<T>);
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1885 else if (mode == DESCENDING)
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	1886 lsort.set_compare (sparse_descending_compare<T>);
7463 2467639bd8c0 eliminate UNDEFINED sort mode John W. Eaton <jwe@octave.org> parents: 7433 diff changeset	1887 else
2467639bd8c0 eliminate UNDEFINED sort mode John W. Eaton <jwe@octave.org> parents: 7433 diff changeset	1888 abort ();
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1889
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1890 T *v = m.data ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1891 octave_idx_type *mcidx = m.cidx ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1892 octave_idx_type *mridx = m.ridx ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1893
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1894 for (octave_idx_type j = 0; j < nc; j++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1895 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1896 octave_idx_type ns = mcidx [j + 1] - mcidx [j];
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1897 lsort.sort (v, ns);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1898
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1899 octave_idx_type i;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1900 if (mode == ASCENDING)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1901 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1902 for (i = 0; i < ns; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1903 if (sparse_ascending_compare<T> (static_cast<T> (0), v [i]))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1904 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1905 }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1906 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1907 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1908 for (i = 0; i < ns; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1909 if (sparse_descending_compare<T> (static_cast<T> (0), v [i]))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1910 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1911 }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1912 for (octave_idx_type k = 0; k < i; k++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1913 mridx [k] = k;
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1914 for (octave_idx_type k = i; k < ns; k++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1915 mridx [k] = k - ns + nr;
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1916
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1917 v += ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1918 mridx += ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1919 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1920
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1921 if (dim > 0)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1922 m = m.transpose ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1923
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1924 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1925 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1926
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1927 template <class T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1928 Sparse<T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1929 Sparse<T>::sort (Array<octave_idx_type> &sidx, octave_idx_type dim,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1930 sortmode mode) const
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1931 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1932 Sparse<T> m = *this;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1933
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1934 octave_idx_type nr = m.rows ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1935 octave_idx_type nc = m.columns ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1936
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1937 if (m.length () < 1)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1938 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1939 sidx = Array<octave_idx_type> (dim_vector (nr, nc));
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1940 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1941 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1942
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1943 if (dim > 0)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1944 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1945 m = m.transpose ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1946 nr = m.rows ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1947 nc = m.columns ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1948 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1949
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	1950 octave_sort<T> indexed_sort;
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1951
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1952 if (mode == ASCENDING)
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	1953 indexed_sort.set_compare (sparse_ascending_compare<T>);
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1954 else if (mode == DESCENDING)
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	1955 indexed_sort.set_compare (sparse_descending_compare<T>);
7463 2467639bd8c0 eliminate UNDEFINED sort mode John W. Eaton <jwe@octave.org> parents: 7433 diff changeset	1956 else
2467639bd8c0 eliminate UNDEFINED sort mode John W. Eaton <jwe@octave.org> parents: 7433 diff changeset	1957 abort ();
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1958
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1959 T *v = m.data ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1960 octave_idx_type *mcidx = m.cidx ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1961 octave_idx_type *mridx = m.ridx ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1962
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1963 sidx = Array<octave_idx_type> (dim_vector (nr, nc));
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	1964 OCTAVE_LOCAL_BUFFER (octave_idx_type, vi, nr);
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1965
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1966 for (octave_idx_type j = 0; j < nc; j++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1967 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1968 octave_idx_type ns = mcidx [j + 1] - mcidx [j];
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1969 octave_idx_type offset = j * nr;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1970
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1971 if (ns == 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1972 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1973 for (octave_idx_type k = 0; k < nr; k++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1974 sidx (offset + k) = k;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1975 }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	1976 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1977 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1978 for (octave_idx_type i = 0; i < ns; i++)
8752 06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	1979 vi[i] = mridx[i];
06b9903a029b fix & clean up complex & sparse sorting Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	1980
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1981 indexed_sort.sort (v, vi, ns);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1982
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1983 octave_idx_type i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1984 if (mode == ASCENDING)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1985 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1986 for (i = 0; i < ns; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1987 if (sparse_ascending_compare<T> (static_cast<T> (0), v[i]))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1988 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1989 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1990 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1991 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1992 for (i = 0; i < ns; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1993 if (sparse_descending_compare<T> (static_cast<T> (0), v[i]))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1994 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1995 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1996
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1997 octave_idx_type ii = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1998 octave_idx_type jj = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1999 for (octave_idx_type k = 0; k < nr; k++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2000 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2001 if (ii < ns && mridx[ii] == k)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2002 ii++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2003 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2004 sidx (offset + jj++) = k;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2005 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2006
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2007 for (octave_idx_type k = 0; k < i; k++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2008 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2009 sidx (k + offset) = vi [k];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2010 mridx [k] = k;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2011 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2012
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2013 for (octave_idx_type k = i; k < ns; k++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2014 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2015 sidx (k - ns + nr + offset) = vi [k];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2016 mridx [k] = k - ns + nr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2017 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2018
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2019 v += ns;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2020 mridx += ns;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2021 }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2022 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2023
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2024 if (dim > 0)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2025 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2026 m = m.transpose ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2027 sidx = sidx.transpose ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2028 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2029
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2030 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2031 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7356 diff changeset	2032
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2033 template <class T>
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2034 Sparse<T>
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2035 Sparse<T>::diag (octave_idx_type k) const
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2036 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2037 octave_idx_type nnr = rows ();
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2038 octave_idx_type nnc = cols ();
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2039 Sparse<T> d;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2040
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2041 if (nnr == 0 \|\| nnc == 0)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2042 ; // do nothing
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2043 else if (nnr != 1 && nnc != 1)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2044 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2045 if (k > 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2046 nnc -= k;
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2047 else if (k < 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2048 nnr += k;
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2049
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2050 if (nnr > 0 && nnc > 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2051 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2052 octave_idx_type ndiag = (nnr < nnc) ? nnr : nnc;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2053
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2054 // Count the number of non-zero elements
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2055 octave_idx_type nel = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2056 if (k > 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2057 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2058 for (octave_idx_type i = 0; i < ndiag; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2059 if (elem (i, i+k) != 0.)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2060 nel++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2061 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2062 else if ( k < 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2063 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2064 for (octave_idx_type i = 0; i < ndiag; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2065 if (elem (i-k, i) != 0.)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2066 nel++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2067 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2068 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2069 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2070 for (octave_idx_type i = 0; i < ndiag; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2071 if (elem (i, i) != 0.)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2072 nel++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2073 }
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2074
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2075 d = Sparse<T> (ndiag, 1, nel);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2076 d.xcidx (0) = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2077 d.xcidx (1) = nel;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2078
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2079 octave_idx_type ii = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2080 if (k > 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2081 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2082 for (octave_idx_type i = 0; i < ndiag; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2083 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2084 T tmp = elem (i, i+k);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2085 if (tmp != 0.)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2086 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2087 d.xdata (ii) = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2088 d.xridx (ii++) = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2089 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2090 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2091 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2092 else if ( k < 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2093 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2094 for (octave_idx_type i = 0; i < ndiag; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2095 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2096 T tmp = elem (i-k, i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2097 if (tmp != 0.)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2098 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2099 d.xdata (ii) = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2100 d.xridx (ii++) = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2101 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2102 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2103 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2104 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2105 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2106 for (octave_idx_type i = 0; i < ndiag; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2107 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2108 T tmp = elem (i, i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2109 if (tmp != 0.)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2110 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2111 d.xdata (ii) = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2112 d.xridx (ii++) = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2113 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2114 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2115 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2116 }
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2117 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2118 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2119 ("diag: requested diagonal out of range");
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2120 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2121 else if (nnr != 0 && nnc != 0)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2122 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2123 octave_idx_type roff = 0;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2124 octave_idx_type coff = 0;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2125 if (k > 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2126 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2127 roff = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2128 coff = k;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2129 }
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2130 else if (k < 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2131 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2132 roff = -k;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2133 coff = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2134 }
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2135
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2136 if (nnr == 1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2137 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2138 octave_idx_type n = nnc + std::abs (k);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2139 octave_idx_type nz = nzmax ();
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2140
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2141 d = Sparse<T> (n, n, nz);
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2142
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2143 if (nnz () > 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2144 {
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2145 for (octave_idx_type i = 0; i < coff+1; i++)
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2146 d.xcidx (i) = 0;
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2147
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2148 for (octave_idx_type j = 0; j < nnc; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2149 {
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2150 for (octave_idx_type i = cidx(j); i < cidx(j+1); i++)
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2151 {
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2152 d.xdata (i) = data (i);
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2153 d.xridx (i) = j + roff;
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2154 }
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2155 d.xcidx (j + coff + 1) = cidx(j+1);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2156 }
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2157
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2158 for (octave_idx_type i = nnc + coff + 1; i < n + 1; i++)
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2159 d.xcidx (i) = nz;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2160 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2161 }
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2162 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2163 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2164 octave_idx_type n = nnr + std::abs (k);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2165 octave_idx_type nz = nzmax ();
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2166
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2167 d = Sparse<T> (n, n, nz);
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2168
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2169 if (nnz () > 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2170 {
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2171 octave_idx_type ii = 0;
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2172 octave_idx_type ir = ridx(0);
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2173
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2174 for (octave_idx_type i = 0; i < coff+1; i++)
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2175 d.xcidx (i) = 0;
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2176
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2177 for (octave_idx_type i = 0; i < nnr; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2178 {
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2179 if (ir == i)
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2180 {
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2181 d.xdata (ii) = data (ii);
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2182 d.xridx (ii++) = ir + roff;
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2183
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2184 if (ii != nz)
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2185 ir = ridx (ii);
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2186 }
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2187 d.xcidx (i + coff + 1) = ii;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2188 }
10367 173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2189
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2190 for (octave_idx_type i = nnr + coff + 1; i < n+1; i++)
173e10268080 avoid indexing nonexistent elements in sparse diag John W. Eaton <jwe@octave.org> parents: 10352 diff changeset	2191 d.xcidx (i) = nz;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2192 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2193 }
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2194 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2195
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2196 return d;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2197 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7573 diff changeset	2198
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2199 template <class T>
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2200 Array<T>
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2201 Sparse<T>::array_value () const
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2202 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2203 NoAlias< Array<T> > retval (dims (), T());
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2204 if (rows () == 1)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2205 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2206 octave_idx_type i = 0;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2207 for (octave_idx_type j = 0, nc = cols (); j < nc; j++)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2208 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2209 if (cidx(j+1) > i)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2210 retval(j) = data (i++);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2211 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2212 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2213 else
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2214 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2215 for (octave_idx_type j = 0, nc = cols (); j < nc; j++)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2216 for (octave_idx_type i = cidx(j), iu = cidx(j+1); i < iu; i++)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2217 retval (ridx(i), j) = data (i);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2218 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2219
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2220 return retval;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2221 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10421 diff changeset	2222
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5766 diff changeset	2223 // FIXME
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2224 // Unfortunately numel can overflow for very large but very sparse matrices.
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2225 // For now just flag an error when this happens.
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2226 template <class LT, class RT>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2227 int
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2228 assign1 (Sparse<LT>& lhs, const Sparse<RT>& rhs)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2229 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2230 int retval = 1;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2231
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2232 idx_vector *idx_tmp = lhs.get_idx ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2233
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2234 idx_vector lhs_idx = idx_tmp[0];
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2235
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	2236 octave_idx_type lhs_len = lhs.numel ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	2237 octave_idx_type rhs_len = rhs.numel ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2238
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	2239 uint64_t long_lhs_len =
22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	2240 static_cast<uint64_t> (lhs.rows ()) *
22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	2241 static_cast<uint64_t> (lhs.cols ());
22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	2242
22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	2243 uint64_t long_rhs_len =
22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	2244 static_cast<uint64_t> (rhs.rows ()) *
22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	2245 static_cast<uint64_t> (rhs.cols ());
22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	2246
22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	2247 if (long_rhs_len != static_cast<uint64_t>(rhs_len) \|\|
22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	2248 long_lhs_len != static_cast<uint64_t>(lhs_len))
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2249 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2250 (*current_liboctave_error_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2251 ("A(I) = X: Matrix dimensions too large to ensure correct\n",
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2252 "operation. This is an limitation that should be removed\n",
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2253 "in the future.");
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2254
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2255 lhs.clear_index ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2256 return 0;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2257 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2258
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	2259 octave_idx_type nr = lhs.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	2260 octave_idx_type nc = lhs.cols ();
5681 233d98d95659 [project @ 2006-03-16 17:48:55 by dbateman] dbateman parents: 5648 diff changeset	2261 octave_idx_type nz = lhs.nnz ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	2262
5781 faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5775 diff changeset	2263 octave_idx_type n = lhs_idx.freeze (lhs_len, "vector", true);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2264
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2265 if (n != 0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2266 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	2267 octave_idx_type max_idx = lhs_idx.max () + 1;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2268 max_idx = max_idx < lhs_len ? lhs_len : max_idx;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2269
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2270 // Take a constant copy of lhs. This means that elem won't
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2271 // create missing elements.
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2272 const Sparse<LT> c_lhs (lhs);
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2273
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2274 if (rhs_len == n)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2275 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2276 octave_idx_type new_nzmx = lhs.nnz ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2277
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2278 OCTAVE_LOCAL_BUFFER (octave_idx_type, rhs_idx, n);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2279 if (! lhs_idx.is_colon ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2280 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2281 // Ok here we have to be careful with the indexing,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2282 // to treat cases like "a([3,2,1]) = b", and still
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2283 // handle the need for strict sorting of the sparse
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2284 // elements.
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2285 OCTAVE_LOCAL_BUFFER (octave_idx_vector_sort *, sidx, n);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2286 OCTAVE_LOCAL_BUFFER (octave_idx_vector_sort, sidxX, n);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2287
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2288 for (octave_idx_type i = 0; i < n; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2289 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2290 sidx[i] = &sidxX[i];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2291 sidx[i]->i = lhs_idx.elem(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2292 sidx[i]->idx = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2293 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2294
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2295 octave_quit ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2296 octave_sort<octave_idx_vector_sort *>
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2297 sort (octave_idx_vector_comp);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2298
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2299 sort.sort (sidx, n);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2300
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2301 intNDArray<octave_idx_type> new_idx (dim_vector (n,1));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2302
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2303 for (octave_idx_type i = 0; i < n; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2304 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2305 new_idx.xelem(i) = sidx[i]->i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2306 rhs_idx[i] = sidx[i]->idx;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2307 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2308
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2309 lhs_idx = idx_vector (new_idx);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2310 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2311 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2312 for (octave_idx_type i = 0; i < n; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2313 rhs_idx[i] = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2314
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2315 // First count the number of non-zero elements
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2316 for (octave_idx_type i = 0; i < n; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2317 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2318 octave_quit ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2319
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2320 octave_idx_type ii = lhs_idx.elem (i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2321 if (i < n - 1 && lhs_idx.elem (i + 1) == ii)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2322 continue;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2323 if (ii < lhs_len && c_lhs.elem(ii) != LT ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2324 new_nzmx--;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2325 if (rhs.elem(rhs_idx[i]) != RT ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2326 new_nzmx++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2327 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2328
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2329 if (nr > 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2330 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2331 Sparse<LT> tmp ((max_idx > nr ? max_idx : nr), 1, new_nzmx);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2332 tmp.cidx(0) = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2333 tmp.cidx(1) = new_nzmx;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2334
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2335 octave_idx_type i = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2336 octave_idx_type ii = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2337 if (i < nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2338 ii = c_lhs.ridx(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2339
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2340 octave_idx_type j = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2341 octave_idx_type jj = lhs_idx.elem(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2342
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2343 octave_idx_type kk = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2344
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2345 while (j < n \|\| i < nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2346 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2347 if (j < n - 1 && lhs_idx.elem (j + 1) == jj)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2348 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2349 j++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2350 jj = lhs_idx.elem (j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2351 continue;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2352 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2353 if (j == n \|\| (i < nz && ii < jj))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2354 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2355 tmp.xdata (kk) = c_lhs.data (i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2356 tmp.xridx (kk++) = ii;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2357 if (++i < nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2358 ii = c_lhs.ridx(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2359 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2360 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2361 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2362 RT rtmp = rhs.elem (rhs_idx[j]);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2363 if (rtmp != RT ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2364 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2365 tmp.xdata (kk) = rtmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2366 tmp.xridx (kk++) = jj;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2367 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2368
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2369 if (ii == jj && i < nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2370 if (++i < nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2371 ii = c_lhs.ridx(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2372 if (++j < n)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2373 jj = lhs_idx.elem(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2374 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2375 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2376
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2377 lhs = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2378 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2379 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2380 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2381 Sparse<LT> tmp (1, (max_idx > nc ? max_idx : nc), new_nzmx);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2382
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2383 octave_idx_type i = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2384 octave_idx_type ii = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2385 while (ii < nc && c_lhs.cidx(ii+1) <= i)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2386 ii++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2387
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2388 octave_idx_type j = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2389 octave_idx_type jj = lhs_idx.elem(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2390
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2391 octave_idx_type kk = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2392 octave_idx_type ic = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2393
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2394 while (j < n \|\| i < nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2395 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2396 if (j < n - 1 && lhs_idx.elem (j + 1) == jj)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2397 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2398 j++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2399 jj = lhs_idx.elem (j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2400 continue;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2401 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2402 if (j == n \|\| (i < nz && ii < jj))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2403 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2404 while (ic <= ii)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2405 tmp.xcidx (ic++) = kk;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2406 tmp.xdata (kk) = c_lhs.data (i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2407 tmp.xridx (kk++) = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2408 i++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2409 while (ii < nc && c_lhs.cidx(ii+1) <= i)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2410 ii++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2411 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2412 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2413 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2414 while (ic <= jj)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2415 tmp.xcidx (ic++) = kk;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2416
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2417 RT rtmp = rhs.elem (rhs_idx[j]);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2418 if (rtmp != RT ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2419 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2420 tmp.xdata (kk) = rtmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2421 tmp.xridx (kk++) = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2422 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2423 if (ii == jj)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2424 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2425 i++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2426 while (ii < nc && c_lhs.cidx(ii+1) <= i)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2427 ii++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2428 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2429 j++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2430 if (j < n)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2431 jj = lhs_idx.elem(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2432 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2433 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2434
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2435 for (octave_idx_type iidx = ic; iidx < max_idx+1; iidx++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2436 tmp.xcidx(iidx) = kk;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2437
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2438 lhs = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2439 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2440 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2441 else if (rhs_len == 1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2442 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2443 octave_idx_type new_nzmx = lhs.nnz ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2444 RT scalar = rhs.elem (0);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2445 bool scalar_non_zero = (scalar != RT ());
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2446 lhs_idx.sort (true);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2447 n = lhs_idx.length (n);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2448
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2449 // First count the number of non-zero elements
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2450 if (scalar != RT ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2451 new_nzmx += n;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2452 for (octave_idx_type i = 0; i < n; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2453 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2454 octave_quit ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2455
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2456 octave_idx_type ii = lhs_idx.elem (i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2457 if (ii < lhs_len && c_lhs.elem(ii) != LT ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2458 new_nzmx--;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2459 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2460
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2461 if (nr > 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2462 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2463 Sparse<LT> tmp ((max_idx > nr ? max_idx : nr), 1, new_nzmx);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2464 tmp.cidx(0) = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2465 tmp.cidx(1) = new_nzmx;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2466
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2467 octave_idx_type i = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2468 octave_idx_type ii = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2469 if (i < nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2470 ii = c_lhs.ridx(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2471
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2472 octave_idx_type j = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2473 octave_idx_type jj = lhs_idx.elem(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2474
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2475 octave_idx_type kk = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2476
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2477 while (j < n \|\| i < nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2478 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2479 if (j == n \|\| (i < nz && ii < jj))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2480 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2481 tmp.xdata (kk) = c_lhs.data (i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2482 tmp.xridx (kk++) = ii;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2483 if (++i < nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2484 ii = c_lhs.ridx(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2485 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2486 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2487 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2488 if (scalar_non_zero)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2489 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2490 tmp.xdata (kk) = scalar;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2491 tmp.xridx (kk++) = jj;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2492 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2493
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2494 if (ii == jj && i < nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2495 if (++i < nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2496 ii = c_lhs.ridx(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2497 if (++j < n)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2498 jj = lhs_idx.elem(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2499 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2500 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2501
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2502 lhs = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2503 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2504 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2505 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2506 Sparse<LT> tmp (1, (max_idx > nc ? max_idx : nc), new_nzmx);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2507
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2508 octave_idx_type i = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2509 octave_idx_type ii = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2510 while (ii < nc && c_lhs.cidx(ii+1) <= i)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2511 ii++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2512
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2513 octave_idx_type j = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2514 octave_idx_type jj = lhs_idx.elem(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2515
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2516 octave_idx_type kk = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2517 octave_idx_type ic = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2518
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2519 while (j < n \|\| i < nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2520 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2521 if (j == n \|\| (i < nz && ii < jj))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2522 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2523 while (ic <= ii)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2524 tmp.xcidx (ic++) = kk;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2525 tmp.xdata (kk) = c_lhs.data (i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2526 i++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2527 while (ii < nc && c_lhs.cidx(ii+1) <= i)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2528 ii++;
9177 39be2c4531c8 fix sparse indexing bug Jaroslav Hajek <highegg@gmail.com> parents: 8987 diff changeset	2529 tmp.xridx (kk++) = 0;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2530 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2531 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2532 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2533 while (ic <= jj)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2534 tmp.xcidx (ic++) = kk;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2535 if (scalar_non_zero)
9177 39be2c4531c8 fix sparse indexing bug Jaroslav Hajek <highegg@gmail.com> parents: 8987 diff changeset	2536 {
39be2c4531c8 fix sparse indexing bug Jaroslav Hajek <highegg@gmail.com> parents: 8987 diff changeset	2537 tmp.xdata (kk) = scalar;
39be2c4531c8 fix sparse indexing bug Jaroslav Hajek <highegg@gmail.com> parents: 8987 diff changeset	2538 tmp.xridx (kk++) = 0;
39be2c4531c8 fix sparse indexing bug Jaroslav Hajek <highegg@gmail.com> parents: 8987 diff changeset	2539 }
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2540 if (ii == jj)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2541 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2542 i++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2543 while (ii < nc && c_lhs.cidx(ii+1) <= i)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2544 ii++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2545 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2546 j++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2547 if (j < n)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2548 jj = lhs_idx.elem(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2549 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2550 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2551
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2552 for (octave_idx_type iidx = ic; iidx < max_idx+1; iidx++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2553 tmp.xcidx(iidx) = kk;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2554
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2555 lhs = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2556 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2557 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2558 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2559 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2560 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2561 ("A(I) = X: X must be a scalar or a vector with same length as I");
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2562
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2563 retval = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2564 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2565 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2566 else if (lhs_idx.is_colon ())
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2567 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2568 if (lhs_len == 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2569 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2570
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2571 octave_idx_type new_nzmx = rhs.nnz ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2572 Sparse<LT> tmp (1, rhs_len, new_nzmx);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2573
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2574 octave_idx_type ii = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2575 octave_idx_type jj = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2576 for (octave_idx_type i = 0; i < rhs.cols(); i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2577 for (octave_idx_type j = rhs.cidx(i); j < rhs.cidx(i+1); j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2578 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2579 octave_quit ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2580 for (octave_idx_type k = jj; k <= i * rhs.rows() + rhs.ridx(j); k++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2581 tmp.cidx(jj++) = ii;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2582
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2583 tmp.data(ii) = rhs.data(j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2584 tmp.ridx(ii++) = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2585 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2586
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2587 for (octave_idx_type i = jj; i < rhs_len + 1; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2588 tmp.cidx(i) = ii;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2589
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2590 lhs = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2591 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2592 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2593 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2594 ("A(:) = X: A must be the same size as X");
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2595 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2596 else if (! (rhs_len == 1 \|\| rhs_len == 0))
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2597 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2598 (*current_liboctave_error_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2599 ("A([]) = X: X must also be an empty matrix or a scalar");
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2600
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2601 retval = 0;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2602 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2603
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2604 lhs.clear_index ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2605
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2606 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2607 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2608
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2609 template <class LT, class RT>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2610 int
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2611 assign (Sparse<LT>& lhs, const Sparse<RT>& rhs)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2612 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2613 int retval = 1;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2614
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2615 int n_idx = lhs.index_count ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2616
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	2617 octave_idx_type lhs_nr = lhs.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	2618 octave_idx_type lhs_nc = lhs.cols ();
5681 233d98d95659 [project @ 2006-03-16 17:48:55 by dbateman] dbateman parents: 5648 diff changeset	2619 octave_idx_type lhs_nz = lhs.nnz ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	2620
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	2621 octave_idx_type rhs_nr = rhs.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5166 diff changeset	2622 octave_idx_type rhs_nc = rhs.cols ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2623
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2624 idx_vector *tmp = lhs.get_idx ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2625
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2626 idx_vector idx_i;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2627 idx_vector idx_j;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2628
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2629 if (n_idx > 2)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2630 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2631 (*current_liboctave_error_handler)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2632 ("A(I, J) = X: can only have 1 or 2 indexes for sparse matrices");
6092 30beea6739da [project @ 2006-10-25 23:45:16 by jwe] jwe parents: 6079 diff changeset	2633
30beea6739da [project @ 2006-10-25 23:45:16 by jwe] jwe parents: 6079 diff changeset	2634 lhs.clear_index ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2635 return 0;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2636 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2637
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2638 if (n_idx > 1)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2639 idx_j = tmp[1];
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2640
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2641 if (n_idx > 0)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2642 idx_i = tmp[0];
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2643
6988 c7484dcadd4d [project @ 2007-10-09 19:58:32 by dbateman] dbateman parents: 6817 diff changeset	2644 // Take a constant copy of lhs. This means that ridx and family won't
c7484dcadd4d [project @ 2007-10-09 19:58:32 by dbateman] dbateman parents: 6817 diff changeset	2645 // call make_unique.
c7484dcadd4d [project @ 2007-10-09 19:58:32 by dbateman] dbateman parents: 6817 diff changeset	2646 const Sparse<LT> c_lhs (lhs);
c7484dcadd4d [project @ 2007-10-09 19:58:32 by dbateman] dbateman parents: 6817 diff changeset	2647
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2648 if (n_idx == 2)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2649 {
5781 faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5775 diff changeset	2650 octave_idx_type n = idx_i.freeze (lhs_nr, "row", true);
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5775 diff changeset	2651 octave_idx_type m = idx_j.freeze (lhs_nc, "column", true);
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2652
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2653 int idx_i_is_colon = idx_i.is_colon ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2654 int idx_j_is_colon = idx_j.is_colon ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2655
7238 22f210ca8cc1 [project @ 2007-12-03 20:10:01 by dbateman] dbateman parents: 7017 diff changeset	2656 if (lhs_nr == 0 && lhs_nc == 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2657 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2658 if (idx_i_is_colon)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2659 n = rhs_nr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2660
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2661 if (idx_j_is_colon)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2662 m = rhs_nc;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2663 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2664
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	2665 if (idx_i && idx_j)
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2666 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2667 if (rhs_nr == 1 && rhs_nc == 1 && n >= 0 && m >= 0)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2668 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2669 if (n > 0 && m > 0)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2670 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2671 idx_i.sort (true);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2672 n = idx_i.length (n);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2673 idx_j.sort (true);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2674 m = idx_j.length (m);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2675
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2676 octave_idx_type max_row_idx = idx_i_is_colon ? rhs_nr :
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2677 idx_i.max () + 1;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2678 octave_idx_type max_col_idx = idx_j_is_colon ? rhs_nc :
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2679 idx_j.max () + 1;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2680 octave_idx_type new_nr = max_row_idx > lhs_nr ?
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2681 max_row_idx : lhs_nr;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2682 octave_idx_type new_nc = max_col_idx > lhs_nc ?
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2683 max_col_idx : lhs_nc;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2684 RT scalar = rhs.elem (0, 0);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2685
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2686 // Count the number of non-zero terms
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2687 octave_idx_type new_nzmx = lhs.nnz ();
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2688 for (octave_idx_type j = 0; j < m; j++)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2689 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2690 octave_idx_type jj = idx_j.elem (j);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2691 if (jj < lhs_nc)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2692 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2693 for (octave_idx_type i = 0; i < n; i++)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2694 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	2695 octave_quit ();
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2696
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2697 octave_idx_type ii = idx_i.elem (i);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2698
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2699 if (ii < lhs_nr)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2700 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2701 for (octave_idx_type k = c_lhs.cidx(jj);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2702 k < c_lhs.cidx(jj+1); k++)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2703 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2704 if (c_lhs.ridx(k) == ii)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2705 new_nzmx--;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2706 if (c_lhs.ridx(k) >= ii)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2707 break;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2708 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2709 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2710 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2711 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2712 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2713
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2714 if (scalar != RT())
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2715 new_nzmx += m * n;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2716
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2717 Sparse<LT> stmp (new_nr, new_nc, new_nzmx);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2718
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2719 octave_idx_type jji = 0;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2720 octave_idx_type jj = idx_j.elem (jji);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2721 octave_idx_type kk = 0;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2722 stmp.cidx(0) = 0;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2723 for (octave_idx_type j = 0; j < new_nc; j++)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2724 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2725 if (jji < m && jj == j)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2726 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2727 octave_idx_type iii = 0;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2728 octave_idx_type ii = idx_i.elem (iii);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2729 octave_idx_type ppp = 0;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2730 octave_idx_type ppi = (j >= lhs_nc ? 0 :
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2731 c_lhs.cidx(j+1) -
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2732 c_lhs.cidx(j));
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2733 octave_idx_type pp = (ppp < ppi ?
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2734 c_lhs.ridx(c_lhs.cidx(j)+ppp) :
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2735 new_nr);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2736 while (ppp < ppi \|\| iii < n)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2737 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2738 if (iii < n && ii <= pp)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2739 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2740 if (scalar != RT ())
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2741 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2742 stmp.data(kk) = scalar;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2743 stmp.ridx(kk++) = ii;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2744 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2745 if (ii == pp)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2746 pp = (++ppp < ppi ? c_lhs.ridx(c_lhs.cidx(j)+ppp) : new_nr);
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2747 if (++iii < n)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2748 ii = idx_i.elem(iii);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2749 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2750 else
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2751 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2752 stmp.data(kk) =
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2753 c_lhs.data(c_lhs.cidx(j)+ppp);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2754 stmp.ridx(kk++) = pp;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2755 pp = (++ppp < ppi ? c_lhs.ridx(c_lhs.cidx(j)+ppp) : new_nr);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2756 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2757 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2758 if (++jji < m)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2759 jj = idx_j.elem(jji);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2760 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2761 else if (j < lhs_nc)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2762 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2763 for (octave_idx_type i = c_lhs.cidx(j);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2764 i < c_lhs.cidx(j+1); i++)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2765 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2766 stmp.data(kk) = c_lhs.data(i);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2767 stmp.ridx(kk++) = c_lhs.ridx(i);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2768 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2769 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2770 stmp.cidx(j+1) = kk;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2771 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2772
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2773 lhs = stmp;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2774 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2775 else
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2776 {
7253 c5a024013d2d [project @ 2007-12-04 20:51:24 by jwe] jwe parents: 7246 diff changeset	2777 #if 0
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2778 // FIXME -- the following code will make this
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2779 // function behave the same as the full matrix
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2780 // case for things like
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2781 //
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2782 // x = sparse (ones (2));
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2783 // x([],3) = 2;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2784 //
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2785 // x =
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2786 //
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2787 // Compressed Column Sparse (rows = 2, cols = 3, nnz = 4)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2788 //
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2789 // (1, 1) -> 1
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2790 // (2, 1) -> 1
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2791 // (1, 2) -> 1
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2792 // (2, 2) -> 1
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2793 //
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2794 // However, Matlab doesn't resize in this case
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2795 // even though it does in the full matrix case.
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2796
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2797 if (n > 0)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2798 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2799 octave_idx_type max_row_idx = idx_i_is_colon ?
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2800 rhs_nr : idx_i.max () + 1;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2801 octave_idx_type new_nr = max_row_idx > lhs_nr ?
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2802 max_row_idx : lhs_nr;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2803 octave_idx_type new_nc = lhs_nc;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2804
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2805 lhs.resize (new_nr, new_nc);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2806 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2807 else if (m > 0)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2808 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2809 octave_idx_type max_col_idx = idx_j_is_colon ?
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2810 rhs_nc : idx_j.max () + 1;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2811 octave_idx_type new_nr = lhs_nr;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2812 octave_idx_type new_nc = max_col_idx > lhs_nc ?
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2813 max_col_idx : lhs_nc;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2814
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2815 lhs.resize (new_nr, new_nc);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2816 }
7253 c5a024013d2d [project @ 2007-12-04 20:51:24 by jwe] jwe parents: 7246 diff changeset	2817 #endif
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2818 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2819 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2820 else if (n == rhs_nr && m == rhs_nc)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2821 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2822 if (n > 0 && m > 0)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2823 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2824 octave_idx_type max_row_idx = idx_i_is_colon ? rhs_nr :
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2825 idx_i.max () + 1;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2826 octave_idx_type max_col_idx = idx_j_is_colon ? rhs_nc :
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2827 idx_j.max () + 1;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2828 octave_idx_type new_nr = max_row_idx > lhs_nr ?
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2829 max_row_idx : lhs_nr;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2830 octave_idx_type new_nc = max_col_idx > lhs_nc ?
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2831 max_col_idx : lhs_nc;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2832
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2833 OCTAVE_LOCAL_BUFFER (octave_idx_type, rhs_idx_i, n);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2834 if (! idx_i.is_colon ())
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2835 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2836 // Ok here we have to be careful with the indexing,
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2837 // to treat cases like "a([3,2,1],:) = b", and still
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2838 // handle the need for strict sorting of the sparse
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2839 // elements.
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2840 OCTAVE_LOCAL_BUFFER (octave_idx_vector_sort *,
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2841 sidx, n);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2842 OCTAVE_LOCAL_BUFFER (octave_idx_vector_sort,
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2843 sidxX, n);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2844
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2845 for (octave_idx_type i = 0; i < n; i++)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2846 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2847 sidx[i] = &sidxX[i];
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2848 sidx[i]->i = idx_i.elem(i);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2849 sidx[i]->idx = i;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2850 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2851
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	2852 octave_quit ();
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2853 octave_sort<octave_idx_vector_sort *>
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2854 sort (octave_idx_vector_comp);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2855
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2856 sort.sort (sidx, n);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2857
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2858 intNDArray<octave_idx_type> new_idx (dim_vector (n,1));
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2859
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2860 for (octave_idx_type i = 0; i < n; i++)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2861 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2862 new_idx.xelem(i) = sidx[i]->i;
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2863 rhs_idx_i[i] = sidx[i]->idx;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2864 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2865
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2866 idx_i = idx_vector (new_idx);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2867 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2868 else
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2869 for (octave_idx_type i = 0; i < n; i++)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2870 rhs_idx_i[i] = i;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2871
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2872 OCTAVE_LOCAL_BUFFER (octave_idx_type, rhs_idx_j, m);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2873 if (! idx_j.is_colon ())
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2874 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2875 // Ok here we have to be careful with the indexing,
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2876 // to treat cases like "a([3,2,1],:) = b", and still
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2877 // handle the need for strict sorting of the sparse
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2878 // elements.
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2879 OCTAVE_LOCAL_BUFFER (octave_idx_vector_sort *,
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2880 sidx, m);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2881 OCTAVE_LOCAL_BUFFER (octave_idx_vector_sort,
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2882 sidxX, m);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2883
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2884 for (octave_idx_type i = 0; i < m; i++)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2885 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2886 sidx[i] = &sidxX[i];
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2887 sidx[i]->i = idx_j.elem(i);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2888 sidx[i]->idx = i;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2889 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2890
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9469 diff changeset	2891 octave_quit ();
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2892 octave_sort<octave_idx_vector_sort *>
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2893 sort (octave_idx_vector_comp);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2894
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2895 sort.sort (sidx, m);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2896
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2897 intNDArray<octave_idx_type> new_idx (dim_vector (m,1));
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2898
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2899 for (octave_idx_type i = 0; i < m; i++)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2900 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2901 new_idx.xelem(i) = sidx[i]->i;
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2902 rhs_idx_j[i] = sidx[i]->idx;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2903 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2904
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2905 idx_j = idx_vector (new_idx);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2906 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2907 else
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2908 for (octave_idx_type i = 0; i < m; i++)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2909 rhs_idx_j[i] = i;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2910
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2911 // Maximum number of non-zero elements
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2912 octave_idx_type new_nzmx = lhs.nnz() + rhs.nnz();
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2913
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2914 Sparse<LT> stmp (new_nr, new_nc, new_nzmx);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2915
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2916 octave_idx_type jji = 0;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2917 octave_idx_type jj = idx_j.elem (jji);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2918 octave_idx_type kk = 0;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2919 stmp.cidx(0) = 0;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2920 for (octave_idx_type j = 0; j < new_nc; j++)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2921 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2922 if (jji < m && jj == j)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2923 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2924 octave_idx_type iii = 0;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2925 octave_idx_type ii = idx_i.elem (iii);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2926 octave_idx_type ppp = 0;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2927 octave_idx_type ppi = (j >= lhs_nc ? 0 :
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2928 c_lhs.cidx(j+1) -
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2929 c_lhs.cidx(j));
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2930 octave_idx_type pp = (ppp < ppi ?
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2931 c_lhs.ridx(c_lhs.cidx(j)+ppp) :
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2932 new_nr);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2933 while (ppp < ppi \|\| iii < n)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2934 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2935 if (iii < n && ii <= pp)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2936 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2937 if (iii < n - 1 &&
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2938 idx_i.elem (iii + 1) == ii)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2939 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2940 iii++;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2941 ii = idx_i.elem(iii);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2942 continue;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2943 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2944
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2945 RT rtmp = rhs.elem (rhs_idx_i[iii],
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2946 rhs_idx_j[jji]);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2947 if (rtmp != RT ())
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2948 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2949 stmp.data(kk) = rtmp;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2950 stmp.ridx(kk++) = ii;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2951 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2952 if (ii == pp)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2953 pp = (++ppp < ppi ? c_lhs.ridx(c_lhs.cidx(j)+ppp) : new_nr);
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2954 if (++iii < n)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2955 ii = idx_i.elem(iii);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2956 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2957 else
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2958 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2959 stmp.data(kk) =
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2960 c_lhs.data(c_lhs.cidx(j)+ppp);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2961 stmp.ridx(kk++) = pp;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2962 pp = (++ppp < ppi ? c_lhs.ridx(c_lhs.cidx(j)+ppp) : new_nr);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2963 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2964 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2965 if (++jji < m)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2966 jj = idx_j.elem(jji);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2967 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2968 else if (j < lhs_nc)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2969 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2970 for (octave_idx_type i = c_lhs.cidx(j);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2971 i < c_lhs.cidx(j+1); i++)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2972 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2973 stmp.data(kk) = c_lhs.data(i);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2974 stmp.ridx(kk++) = c_lhs.ridx(i);
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2975 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2976 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2977 stmp.cidx(j+1) = kk;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2978 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2979
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2980 stmp.maybe_compress();
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2981 lhs = stmp;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2982 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2983 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2984 else if (n == 0 && m == 0)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2985 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2986 if (! ((rhs_nr == 1 && rhs_nc == 1)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2987 \|\| (rhs_nr == 0 \|\| rhs_nc == 0)))
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2988 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2989 (*current_liboctave_error_handler)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2990 ("A([], []) = X: X must be an empty matrix or a scalar");
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2991
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2992 retval = 0;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2993 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2994 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2995 else
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2996 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2997 (*current_liboctave_error_handler)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2998 ("A(I, J) = X: X must be a scalar or the number of elements in I must");
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	2999 (*current_liboctave_error_handler)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3000 ("match the number of rows in X and the number of elements in J must");
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3001 (*current_liboctave_error_handler)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3002 ("match the number of columns in X");
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3003
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3004 retval = 0;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3005 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3006 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3007 // idx_vector::freeze() printed an error message for us.
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3008 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3009 else if (n_idx == 1)
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3010 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3011 int lhs_is_empty = lhs_nr == 0 \|\| lhs_nc == 0;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3012
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3013 if (lhs_is_empty \|\| (lhs_nr == 1 && lhs_nc == 1))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3014 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3015 octave_idx_type lhs_len = lhs.length ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3016
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3017 // Called for side-effects on idx_i.
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3018 idx_i.freeze (lhs_len, 0, true);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3019
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3020 if (idx_i)
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3021 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3022 if (lhs_is_empty
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3023 && idx_i.is_colon ()
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3024 && ! (rhs_nr == 1 \|\| rhs_nc == 1))
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3025 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3026 (*current_liboctave_warning_with_id_handler)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3027 ("Octave:fortran-indexing",
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3028 "A(:) = X: X is not a vector or scalar");
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3029 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3030 else
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3031 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3032 octave_idx_type idx_nr = idx_i.orig_rows ();
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3033 octave_idx_type idx_nc = idx_i.orig_columns ();
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3034
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3035 if (! (rhs_nr == idx_nr && rhs_nc == idx_nc))
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3036 (*current_liboctave_warning_with_id_handler)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3037 ("Octave:fortran-indexing",
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3038 "A(I) = X: X does not have same shape as I");
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3039 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3040
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3041 if (! assign1 (lhs, rhs))
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3042 retval = 0;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3043 }
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3044 // idx_vector::freeze() printed an error message for us.
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3045 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3046 else if (lhs_nr == 1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3047 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3048 idx_i.freeze (lhs_nc, "vector", true);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3049
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3050 if (idx_i)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3051 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3052 if (! assign1 (lhs, rhs))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3053 retval = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3054 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3055 // idx_vector::freeze() printed an error message for us.
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3056 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3057 else if (lhs_nc == 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3058 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3059 idx_i.freeze (lhs_nr, "vector", true);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3060
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3061 if (idx_i)
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3062 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3063 if (! assign1 (lhs, rhs))
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3064 retval = 0;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 7717 diff changeset	3065 }
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3066 // idx_vector::freeze() printed an error message for us.
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3067 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3068 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3069 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3070 if (! idx_i.is_colon ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3071 (*current_liboctave_warning_with_id_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3072 ("Octave:fortran-indexing", "single index used for matrix");
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3073
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3074 octave_idx_type lhs_len = lhs.length ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3075
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3076 octave_idx_type len = idx_i.freeze (lhs_nr * lhs_nc, "matrix");
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3077
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3078 if (idx_i)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3079 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3080 if (len == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3081 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3082 if (! ((rhs_nr == 1 && rhs_nc == 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3083 \|\| (rhs_nr == 0 \|\| rhs_nc == 0)))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3084 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3085 ("A([]) = X: X must be an empty matrix or scalar");
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3086 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3087 else if (len == rhs_nr * rhs_nc)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3088 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3089 octave_idx_type new_nzmx = lhs_nz;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3090 OCTAVE_LOCAL_BUFFER (octave_idx_type, rhs_idx, len);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3091
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3092 if (! idx_i.is_colon ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3093 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3094 // Ok here we have to be careful with the indexing, to
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3095 // treat cases like "a([3,2,1]) = b", and still handle
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3096 // the need for strict sorting of the sparse elements.
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3097
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3098 OCTAVE_LOCAL_BUFFER (octave_idx_vector_sort *, sidx,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3099 len);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3100 OCTAVE_LOCAL_BUFFER (octave_idx_vector_sort, sidxX,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3101 len);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3102
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3103 for (octave_idx_type i = 0; i < len; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3104 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3105 sidx[i] = &sidxX[i];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3106 sidx[i]->i = idx_i.elem(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3107 sidx[i]->idx = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3108 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3109
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3110 octave_quit ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3111 octave_sort<octave_idx_vector_sort *>
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3112 sort (octave_idx_vector_comp);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3113
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3114 sort.sort (sidx, len);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3115
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3116 intNDArray<octave_idx_type> new_idx (dim_vector (len,1));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3117
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3118 for (octave_idx_type i = 0; i < len; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3119 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3120 new_idx.xelem(i) = sidx[i]->i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3121 rhs_idx[i] = sidx[i]->idx;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3122 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3123
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3124 idx_i = idx_vector (new_idx);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3125 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3126 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3127 for (octave_idx_type i = 0; i < len; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3128 rhs_idx[i] = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3129
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3130 // First count the number of non-zero elements
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3131 for (octave_idx_type i = 0; i < len; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3132 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3133 octave_quit ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3134
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3135 octave_idx_type ii = idx_i.elem (i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3136 if (i < len - 1 && idx_i.elem (i + 1) == ii)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3137 continue;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3138 if (ii < lhs_len && c_lhs.elem(ii) != LT ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3139 new_nzmx--;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3140 if (rhs.elem(rhs_idx[i]) != RT ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3141 new_nzmx++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3142 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3143
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3144 Sparse<LT> stmp (lhs_nr, lhs_nc, new_nzmx);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3145
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3146 octave_idx_type i = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3147 octave_idx_type ii = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3148 octave_idx_type ic = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3149 if (i < lhs_nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3150 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3151 while (ic < lhs_nc && i >= c_lhs.cidx(ic+1))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3152 ic++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3153 ii = ic * lhs_nr + c_lhs.ridx(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3154 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3155
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3156 octave_idx_type j = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3157 octave_idx_type jj = idx_i.elem (j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3158 octave_idx_type jr = jj % lhs_nr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3159 octave_idx_type jc = (jj - jr) / lhs_nr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3160
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3161 octave_idx_type kk = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3162 octave_idx_type kc = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3163
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3164 while (j < len \|\| i < lhs_nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3165 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3166 if (j < len - 1 && idx_i.elem (j + 1) == jj)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3167 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3168 j++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3169 jj = idx_i.elem (j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3170 jr = jj % lhs_nr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3171 jc = (jj - jr) / lhs_nr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3172 continue;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3173 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3174
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3175 if (j == len \|\| (i < lhs_nz && ii < jj))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3176 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3177 while (kc <= ic)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3178 stmp.xcidx (kc++) = kk;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3179 stmp.xdata (kk) = c_lhs.data (i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3180 stmp.xridx (kk++) = c_lhs.ridx (i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3181 i++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3182 while (ic < lhs_nc && i >= c_lhs.cidx(ic+1))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3183 ic++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3184 if (i < lhs_nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3185 ii = ic * lhs_nr + c_lhs.ridx(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3186 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3187 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3188 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3189 while (kc <= jc)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3190 stmp.xcidx (kc++) = kk;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3191 RT rtmp = rhs.elem (rhs_idx[j]);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3192 if (rtmp != RT ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3193 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3194 stmp.xdata (kk) = rtmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3195 stmp.xridx (kk++) = jr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3196 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3197 if (ii == jj)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3198 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3199 i++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3200 while (ic < lhs_nc && i >= c_lhs.cidx(ic+1))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3201 ic++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3202 if (i < lhs_nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3203 ii = ic * lhs_nr + c_lhs.ridx(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3204 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3205 j++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3206 if (j < len)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3207 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3208 jj = idx_i.elem (j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3209 jr = jj % lhs_nr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3210 jc = (jj - jr) / lhs_nr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3211 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3212 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3213 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3214
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3215 for (octave_idx_type iidx = kc; iidx < lhs_nc+1; iidx++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3216 stmp.xcidx(iidx) = kk;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3217
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3218 lhs = stmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3219 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3220 else if (rhs_nr == 1 && rhs_nc == 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3221 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3222 RT scalar = rhs.elem (0, 0);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3223 octave_idx_type new_nzmx = lhs_nz;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3224 idx_i.sort (true);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3225 len = idx_i.length (len);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3226
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3227 // First count the number of non-zero elements
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3228 if (scalar != RT ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3229 new_nzmx += len;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3230 for (octave_idx_type i = 0; i < len; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3231 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3232 octave_quit ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3233 octave_idx_type ii = idx_i.elem (i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3234 if (ii < lhs_len && c_lhs.elem(ii) != LT ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3235 new_nzmx--;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3236 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3237
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3238 Sparse<LT> stmp (lhs_nr, lhs_nc, new_nzmx);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3239
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3240 octave_idx_type i = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3241 octave_idx_type ii = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3242 octave_idx_type ic = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3243 if (i < lhs_nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3244 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3245 while (ic < lhs_nc && i >= c_lhs.cidx(ic+1))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3246 ic++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3247 ii = ic * lhs_nr + c_lhs.ridx(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3248 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3249
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3250 octave_idx_type j = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3251 octave_idx_type jj = idx_i.elem (j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3252 octave_idx_type jr = jj % lhs_nr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3253 octave_idx_type jc = (jj - jr) / lhs_nr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3254
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3255 octave_idx_type kk = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3256 octave_idx_type kc = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3257
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3258 while (j < len \|\| i < lhs_nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3259 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3260 if (j == len \|\| (i < lhs_nz && ii < jj))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3261 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3262 while (kc <= ic)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3263 stmp.xcidx (kc++) = kk;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3264 stmp.xdata (kk) = c_lhs.data (i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3265 stmp.xridx (kk++) = c_lhs.ridx (i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3266 i++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3267 while (ic < lhs_nc && i >= c_lhs.cidx(ic+1))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3268 ic++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3269 if (i < lhs_nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3270 ii = ic * lhs_nr + c_lhs.ridx(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3271 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3272 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3273 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3274 while (kc <= jc)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3275 stmp.xcidx (kc++) = kk;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3276 if (scalar != RT ())
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3277 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3278 stmp.xdata (kk) = scalar;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3279 stmp.xridx (kk++) = jr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3280 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3281 if (ii == jj)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3282 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3283 i++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3284 while (ic < lhs_nc && i >= c_lhs.cidx(ic+1))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3285 ic++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3286 if (i < lhs_nz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3287 ii = ic * lhs_nr + c_lhs.ridx(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3288 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3289 j++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3290 if (j < len)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3291 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3292 jj = idx_i.elem (j);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3293 jr = jj % lhs_nr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3294 jc = (jj - jr) / lhs_nr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3295 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3296 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3297 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3298
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3299 for (octave_idx_type iidx = kc; iidx < lhs_nc+1; iidx++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3300 stmp.xcidx(iidx) = kk;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3301
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3302 lhs = stmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3303 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3304 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3305 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3306 (*current_liboctave_error_handler)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3307 ("A(I) = X: X must be a scalar or a matrix with the same size as I");
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3308
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3309 retval = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3310 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3311 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3312 // idx_vector::freeze() printed an error message for us.
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3313 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3314 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3315 else
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3316 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3317 (*current_liboctave_error_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	3318 ("invalid number of indices for matrix expression");
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3319
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3320 retval = 0;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3321 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3322
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3323 lhs.clear_index ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3324
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3325 return retval;
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3326 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3327
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3328 /*
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3329 * Tests
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3330 *
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3331
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3332 %!function x = set_slice(x, dim, slice, arg)
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3333 %! switch dim
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3334 %! case 11
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3335 %! x(slice) = 2;
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3336 %! case 21
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3337 %! x(slice, :) = 2;
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3338 %! case 22
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3339 %! x(:, slice) = 2;
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3340 %! otherwise
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3341 %! error("invalid dim, '%d'", dim);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3342 %! endswitch
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3343 %! endfunction
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3344
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3345 %!function x = set_slice2(x, dim, slice)
4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3346 %! switch dim
4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3347 %! case 11
4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3348 %! x(slice) = 2 * ones (size(slice));
4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3349 %! case 21
4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3350 %! x(slice, :) = 2 * ones (length(slice), columns (x));
4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3351 %! case 22
4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3352 %! x(:, slice) = 2 * ones (rows (x), length(slice));
4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3353 %! otherwise
4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3354 %! error("invalid dim, '%d'", dim);
4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3355 %! endswitch
4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3356 %! endfunction
4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3357
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3358 %!function test_sparse_slice(size, dim, slice)
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3359 %! x = ones(size);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3360 %! s = set_slice(sparse(x), dim, slice);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3361 %! f = set_slice(x, dim, slice);
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3362 %! assert (nnz(s), nnz(f));
4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3363 %! assert(full(s), f);
4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3364 %! s = set_slice2(sparse(x), dim, slice);
4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3365 %! f = set_slice2(x, dim, slice);
4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3366 %! assert (nnz(s), nnz(f));
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3367 %! assert(full(s), f);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3368 %! endfunction
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3369
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3370 #### 1d indexing
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3371
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3372 ## size = [2 0]
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3373 %!test test_sparse_slice([2 0], 11, []);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3374 %!assert(set_slice(sparse(ones([2 0])), 11, 1), sparse([2 0]')); # sparse different from full
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3375 %!assert(set_slice(sparse(ones([2 0])), 11, 2), sparse([0 2]')); # sparse different from full
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3376 %!assert(set_slice(sparse(ones([2 0])), 11, 3), sparse([0 0 2]')); # sparse different from full
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3377 %!assert(set_slice(sparse(ones([2 0])), 11, 4), sparse([0 0 0 2]')); # sparse different from full
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3378
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3379 ## size = [0 2]
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3380 %!test test_sparse_slice([0 2], 11, []);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3381 %!assert(set_slice(sparse(ones([0 2])), 11, 1), sparse(1,2)); # sparse different from full
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3382 %!test test_sparse_slice([0 2], 11, 2);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3383 %!test test_sparse_slice([0 2], 11, 3);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3384 %!test test_sparse_slice([0 2], 11, 4);
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3385 %!test test_sparse_slice([0 2], 11, [4, 4]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3386
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3387 ## size = [2 1]
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3388 %!test test_sparse_slice([2 1], 11, []);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3389 %!test test_sparse_slice([2 1], 11, 1);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3390 %!test test_sparse_slice([2 1], 11, 2);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3391 %!test test_sparse_slice([2 1], 11, 3);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3392 %!test test_sparse_slice([2 1], 11, 4);
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3393 %!test test_sparse_slice([2 1], 11, [4, 4]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3394
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3395 ## size = [1 2]
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3396 %!test test_sparse_slice([1 2], 11, []);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3397 %!test test_sparse_slice([1 2], 11, 1);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3398 %!test test_sparse_slice([1 2], 11, 2);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3399 %!test test_sparse_slice([1 2], 11, 3);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3400 %!test test_sparse_slice([1 2], 11, 4);
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3401 %!test test_sparse_slice([1 2], 11, [4, 4]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3402
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3403 ## size = [2 2]
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3404 %!test test_sparse_slice([2 2], 11, []);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3405 %!test test_sparse_slice([2 2], 11, 1);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3406 %!test test_sparse_slice([2 2], 11, 2);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3407 %!test test_sparse_slice([2 2], 11, 3);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3408 %!test test_sparse_slice([2 2], 11, 4);
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3409 %!test test_sparse_slice([2 2], 11, [4, 4]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3410 # These 2 errors are the same as in the full case
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3411 %!error <invalid matrix index = 5> set_slice(sparse(ones([2 2])), 11, 5);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3412 %!error <invalid matrix index = 6> set_slice(sparse(ones([2 2])), 11, 6);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3413
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3414
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3415 #### 2d indexing
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3416
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3417 ## size = [2 0]
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3418 %!test test_sparse_slice([2 0], 21, []);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3419 %!test test_sparse_slice([2 0], 21, 1);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3420 %!test test_sparse_slice([2 0], 21, 2);
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3421 %!test test_sparse_slice([2 0], 21, [2,2]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3422 %!assert(set_slice(sparse(ones([2 0])), 21, 3), sparse(2,0)); # sparse different from full
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3423 %!assert(set_slice(sparse(ones([2 0])), 21, 4), sparse(2,0)); # sparse different from full
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3424 %!test test_sparse_slice([2 0], 22, []);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3425 %!test test_sparse_slice([2 0], 22, 1);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3426 %!test test_sparse_slice([2 0], 22, 2);
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3427 %!test test_sparse_slice([2 0], 22, [2,2]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3428 %!assert(set_slice(sparse(ones([2 0])), 22, 3), sparse([0 0 2;0 0 2])); # sparse different from full
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3429 %!assert(set_slice(sparse(ones([2 0])), 22, 4), sparse([0 0 0 2;0 0 0 2])); # sparse different from full
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3430
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3431 ## size = [0 2]
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3432 %!test test_sparse_slice([0 2], 21, []);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3433 %!test test_sparse_slice([0 2], 21, 1);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3434 %!test test_sparse_slice([0 2], 21, 2);
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3435 %!test test_sparse_slice([0 2], 21, [2,2]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3436 %!assert(set_slice(sparse(ones([0 2])), 21, 3), sparse([0 0;0 0;2 2])); # sparse different from full
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3437 %!assert(set_slice(sparse(ones([0 2])), 21, 4), sparse([0 0;0 0;0 0;2 2])); # sparse different from full
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3438 %!test test_sparse_slice([0 2], 22, []);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3439 %!test test_sparse_slice([0 2], 22, 1);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3440 %!test test_sparse_slice([0 2], 22, 2);
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3441 %!test test_sparse_slice([0 2], 22, [2,2]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3442 %!assert(set_slice(sparse(ones([0 2])), 22, 3), sparse(0,2)); # sparse different from full
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3443 %!assert(set_slice(sparse(ones([0 2])), 22, 4), sparse(0,2)); # sparse different from full
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3444
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3445 ## size = [2 1]
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3446 %!test test_sparse_slice([2 1], 21, []);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3447 %!test test_sparse_slice([2 1], 21, 1);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3448 %!test test_sparse_slice([2 1], 21, 2);
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3449 %!test test_sparse_slice([2 1], 21, [2,2]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3450 %!test test_sparse_slice([2 1], 21, 3);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3451 %!test test_sparse_slice([2 1], 21, 4);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3452 %!test test_sparse_slice([2 1], 22, []);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3453 %!test test_sparse_slice([2 1], 22, 1);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3454 %!test test_sparse_slice([2 1], 22, 2);
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3455 %!test test_sparse_slice([2 1], 22, [2,2]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3456 %!test test_sparse_slice([2 1], 22, 3);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3457 %!test test_sparse_slice([2 1], 22, 4);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3458
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3459 ## size = [1 2]
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3460 %!test test_sparse_slice([1 2], 21, []);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3461 %!test test_sparse_slice([1 2], 21, 1);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3462 %!test test_sparse_slice([1 2], 21, 2);
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3463 %!test test_sparse_slice([1 2], 21, [2,2]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3464 %!test test_sparse_slice([1 2], 21, 3);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3465 %!test test_sparse_slice([1 2], 21, 4);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3466 %!test test_sparse_slice([1 2], 22, []);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3467 %!test test_sparse_slice([1 2], 22, 1);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3468 %!test test_sparse_slice([1 2], 22, 2);
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3469 %!test test_sparse_slice([1 2], 22, [2,2]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3470 %!test test_sparse_slice([1 2], 22, 3);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3471 %!test test_sparse_slice([1 2], 22, 4);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3472
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3473 ## size = [2 2]
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3474 %!test test_sparse_slice([2 2], 21, []);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3475 %!test test_sparse_slice([2 2], 21, 1);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3476 %!test test_sparse_slice([2 2], 21, 2);
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3477 %!test test_sparse_slice([2 2], 21, [2,2]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3478 %!test test_sparse_slice([2 2], 21, 3);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3479 %!test test_sparse_slice([2 2], 21, 4);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3480 %!test test_sparse_slice([2 2], 22, []);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3481 %!test test_sparse_slice([2 2], 22, 1);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3482 %!test test_sparse_slice([2 2], 22, 2);
7546 4249c6fb6e09 Treat repeated indices in the sparse assignments David Bateman <dbateman@free.fr> parents: 7463 diff changeset	3483 %!test test_sparse_slice([2 2], 22, [2,2]);
7356 164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3484 %!test test_sparse_slice([2 2], 22, 3);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3485 %!test test_sparse_slice([2 2], 22, 4);
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3486
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3487 */
164e98cdee8b [project @ 2008-01-10 09:23:45 by jwe] jwe parents: 7326 diff changeset	3488
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3489 template <class T>
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3490 void
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3491 Sparse<T>::print_info (std::ostream& os, const std::string& prefix) const
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3492 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3493 os << prefix << "rep address: " << rep << "\n"
5604 2857357f9d3c [project @ 2006-01-31 18:22:59 by jwe] jwe parents: 5603 diff changeset	3494 << prefix << "rep->nzmx: " << rep->nzmx << "\n"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3495 << prefix << "rep->nrows: " << rep->nrows << "\n"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3496 << prefix << "rep->ncols: " << rep->ncols << "\n"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3497 << prefix << "rep->data: " << static_cast<void *> (rep->d) << "\n"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3498 << prefix << "rep->ridx: " << static_cast<void *> (rep->r) << "\n"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3499 << prefix << "rep->cidx: " << static_cast<void *> (rep->c) << "\n"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3500 << prefix << "rep->count: " << rep->count << "\n";
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: diff changeset	3501 }

Mercurial > hg > octave-lyh

annotate liboctave/Sparse.cc @ 10494:e52f41fd82c7