Mercurial > hg > octave-nkf
diff liboctave/idx-vector.cc @ 1650:23aa282707e8
[project @ 1995-12-20 06:53:12 by jwe]
author | jwe |
---|---|
date | Wed, 20 Dec 1995 06:55:46 +0000 |
parents | f110a90eb183 |
children | e7e53b58b179 |
line wrap: on
line diff
--- a/liboctave/idx-vector.cc +++ b/liboctave/idx-vector.cc @@ -89,7 +89,7 @@ colon_equiv = 0; colon = 0; - int len = v.length (); + len = v.length (); orig_nr = len; orig_nc = 1; @@ -302,10 +302,10 @@ assert (num_ones + num_zeros == len); int *new_data = new int [num_ones]; - int count = 0; + int k = 0; for (int i = 0; i < len; i++) if (data[i] == 0) - new_data[count++] = i; + new_data[k++] = i; delete [] data; len = num_ones; @@ -340,40 +340,40 @@ } static inline int -intcmp (int *i, int *j) +intcmp (int *ii, int *jj) { - return (*i - *j); + return (*ii - *jj); } static inline void -sort_data (int *d, int len) +sort_data (int *d, int l) { - qsort ((void *) d, len, sizeof (int), + qsort ((void *) d, l, sizeof (int), (int (*)(const void*, const void*)) intcmp); } static inline int -make_uniq (int *d, int len) +make_uniq (int *d, int l) { int k = 0; - for (int i = 1; i < len; i++) + for (int ii = 1; k < l; ii++) { - if (d[i] != d[k]) + if (d[ii] != d[k]) { k++; - d[k] = d[i]; + d[k] = d[ii]; } } return k+1; } static inline int * -copy_data (const int *d, int len) +copy_data (const int *d, int l) { - int *new_data = new int [len]; + int *new_data = new int [l]; - for (int i = 0; i < len; i++) - new_data[i] = d[i]; + for (int ii = 0; ii < l; ii++) + new_data[ii] = d[ii]; return new_data; } @@ -425,8 +425,8 @@ ostream& IDX_VEC_REP::print (ostream& os) const { - for (int i = 0; i < len; i++) - os << data[i] << "\n"; + for (int ii = 0; ii < len; ii++) + os << data[ii] << "\n"; return os; } @@ -452,8 +452,8 @@ { maybe_convert_one_zero_to_idx (z_len, prefer_zero_one); - int max_val = max (); - int min_val = min (); + max_val = max (); + min_val = min (); if (min_val < 0) {