Mercurial > octave

comparison src/data.cc @ 10785:c2041adcf234

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove unnecessary sparse indexing overloads
author Jaroslav Hajek <highegg@gmail.com>
date Tue, 13 Jul 2010 12:08:08 +0200
parents b397b8edd8c5
children 177f1ad7c7c1
comparison
equal deleted inserted replaced
10784:ca2df6737d6b 10785:c2041adcf234
6297 { 6297 {
6298 octave_idx_type k = retval.columns (); 6298 octave_idx_type k = retval.columns ();
6299 while (order > 0 && k > 0) 6299 while (order > 0 && k > 0)
6300 { 6300 {
6301 idx_vector col1 (':'), col2 (':'), sl1 (1, k), sl2 (0, k-1); 6301 idx_vector col1 (':'), col2 (':'), sl1 (1, k), sl2 (0, k-1);
6302 retval = retval.index (col1, sl1, 0) - retval.index (col2, sl2, 0); 6302 retval = SparseT (retval.index (col1, sl1)) - SparseT (retval.index (col2, sl2));
6303 assert (retval.columns () == k-1); 6303 assert (retval.columns () == k-1);
6304 order--; 6304 order--;
6305 k--; 6305 k--;
6306 } 6306 }
6307 } 6307 }
6309 { 6309 {
6310 octave_idx_type k = retval.rows (); 6310 octave_idx_type k = retval.rows ();
6311 while (order > 0 && k > 0) 6311 while (order > 0 && k > 0)
6312 { 6312 {
6313 idx_vector col1 (':'), col2 (':'), sl1 (1, k), sl2 (0, k-1); 6313 idx_vector col1 (':'), col2 (':'), sl1 (1, k), sl2 (0, k-1);
6314 retval = retval.index (sl1, col1, 0) - retval.index (sl2, col2, 0); 6314 retval = SparseT (retval.index (sl1, col1)) - SparseT (retval.index (sl2, col2));
6315 assert (retval.rows () == k-1); 6315 assert (retval.rows () == k-1);
6316 order--; 6316 order--;
6317 k--; 6317 k--;
6318 } 6318 }
6319 } 6319 }