Mercurial > octave

comparison libinterp/corefcn/pr-output.cc @ 29569:29a1f8fd8ee6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move idx_vector classes inside octave namespace * idx-vector.h, idx-vector.cc: Move idx_vector classes inside octave namespace. Update all uses outside of octave namespace to use octave:: tag. * Sparse.h: Eliminate forward declaration of idx_vector.
author John W. Eaton <jwe@octave.org>
date Wed, 28 Apr 2021 13:46:02 -0400
parents 76269aa97398
children aef11bb4e6d1
comparison
equal deleted inserted replaced
29568:a7cbd0e54e7a 29569:29a1f8fd8ee6
2159 } 2159 }
2160 2160
2161 nm += buf.str (); 2161 nm += buf.str ();
2162 } 2162 }
2163 2163
2164 Array<idx_vector> idx (dim_vector (ndims, 1)); 2164 Array<octave::idx_vector> idx (dim_vector (ndims, 1));
2165 2165
2166 idx(0) = idx_vector (':'); 2166 idx(0) = octave::idx_vector (':');
2167 idx(1) = idx_vector (':'); 2167 idx(1) = octave::idx_vector (':');
2168 2168
2169 for (int k = 2; k < ndims; k++) 2169 for (int k = 2; k < ndims; k++)
2170 idx(k) = idx_vector (ra_idx(k)); 2170 idx(k) = octave::idx_vector (ra_idx(k));
2171 2171
2172 octave_value page 2172 octave_value page
2173 = MAT_T (Array<ELT_T> (nda.index (idx), dim_vector (nr, nc))); 2173 = MAT_T (Array<ELT_T> (nda.index (idx), dim_vector (nr, nc)));
2174 2174
2175 if (i != m - 1) 2175 if (i != m - 1)
2744 } 2744 }
2745 2745
2746 nm += buf.str (); 2746 nm += buf.str ();
2747 } 2747 }
2748 2748
2749 Array<idx_vector> idx (dim_vector (ndims, 1)); 2749 Array<octave::idx_vector> idx (dim_vector (ndims, 1));
2750 2750
2751 idx(0) = idx_vector (':'); 2751 idx(0) = octave::idx_vector (':');
2752 idx(1) = idx_vector (':'); 2752 idx(1) = octave::idx_vector (':');
2753 2753
2754 for (int k = 2; k < ndims; k++) 2754 for (int k = 2; k < ndims; k++)
2755 idx(k) = idx_vector (ra_idx(k)); 2755 idx(k) = octave::idx_vector (ra_idx(k));
2756 2756
2757 Array<std::string> page (nda.index (idx), dim_vector (nr, nc)); 2757 Array<std::string> page (nda.index (idx), dim_vector (nr, nc));
2758 2758
2759 // FIXME: need to do some more work to put these 2759 // FIXME: need to do some more work to put these
2760 // in neatly aligned columns... 2760 // in neatly aligned columns...
2986 os << nm << " =\n"; 2986 os << nm << " =\n";
2987 if (! Vcompact_format) 2987 if (! Vcompact_format)
2988 os << "\n"; 2988 os << "\n";
2989 } 2989 }
2990 2990
2991 Array<idx_vector> idx (dim_vector (ndims, 1)); 2991 Array<octave::idx_vector> idx (dim_vector (ndims, 1));
2992 2992
2993 idx(0) = idx_vector (':'); 2993 idx(0) = octave::idx_vector (':');
2994 idx(1) = idx_vector (':'); 2994 idx(1) = octave::idx_vector (':');
2995 2995
2996 for (int k = 2; k < ndims; k++) 2996 for (int k = 2; k < ndims; k++)
2997 idx(k) = idx_vector (ra_idx(k)); 2997 idx(k) = octave::idx_vector (ra_idx(k));
2998 2998
2999 Array<T> page (nda.index (idx), dim_vector (nr, nc)); 2999 Array<T> page (nda.index (idx), dim_vector (nr, nc));
3000 3000
3001 for (octave_idx_type ii = 0; ii < nr; ii++) 3001 for (octave_idx_type ii = 0; ii < nr; ii++)
3002 { 3002 {
3094 os << nm << " =\n"; 3094 os << nm << " =\n";
3095 if (! Vcompact_format) 3095 if (! Vcompact_format)
3096 os << "\n"; 3096 os << "\n";
3097 } 3097 }
3098 3098
3099 Array<idx_vector> idx (dim_vector (ndims, 1)); 3099 Array<octave::idx_vector> idx (dim_vector (ndims, 1));
3100 3100
3101 idx(0) = idx_vector (':'); 3101 idx(0) = octave::idx_vector (':');
3102 idx(1) = idx_vector (':'); 3102 idx(1) = octave::idx_vector (':');
3103 3103
3104 for (int k = 2; k < ndims; k++) 3104 for (int k = 2; k < ndims; k++)
3105 idx(k) = idx_vector (ra_idx(k)); 3105 idx(k) = octave::idx_vector (ra_idx(k));
3106 3106
3107 Array<T> page (nda.index (idx), dim_vector (nr, nc)); 3107 Array<T> page (nda.index (idx), dim_vector (nr, nc));
3108 3108
3109 if (free_format) 3109 if (free_format)
3110 { 3110 {