Mercurial > octave-nkf
comparison liboctave/dim-vector.cc @ 11586:12df7854fa7c
strip trailing whitespace from source files
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 20 Jan 2011 17:24:59 -0500 |
parents | fd0a3ac60b0e |
children | 72c96de7a403 |
comparison
equal
deleted
inserted
replaced
11585:1473d0cf86d2 | 11586:12df7854fa7c |
---|---|
106 } | 106 } |
107 | 107 |
108 return n; | 108 return n; |
109 } | 109 } |
110 | 110 |
111 dim_vector | 111 dim_vector |
112 dim_vector::squeeze (void) const | 112 dim_vector::squeeze (void) const |
113 { | 113 { |
114 dim_vector new_dims = *this; | 114 dim_vector new_dims = *this; |
115 | 115 |
116 bool dims_changed = 1; | 116 bool dims_changed = 1; |
224 | 224 |
225 return match; | 225 return match; |
226 } | 226 } |
227 | 227 |
228 // Rules for horzcat/vertcat are yet looser. | 228 // Rules for horzcat/vertcat are yet looser. |
229 // two arrays A, B can be concatenated | 229 // two arrays A, B can be concatenated |
230 // horizontally (dim = 2) or vertically (dim = 1) if one of the | 230 // horizontally (dim = 2) or vertically (dim = 1) if one of the |
231 // following holds, in this order: | 231 // following holds, in this order: |
232 // | 232 // |
233 // 1. cat(dim, A, B) works | 233 // 1. cat(dim, A, B) works |
234 // | 234 // |
235 // 2. A, B are 2D and one of them is an empty vector, in which | 235 // 2. A, B are 2D and one of them is an empty vector, in which |
236 // case the result is the other one except if both of them | 236 // case the result is the other one except if both of them |
237 // are empty vectors, in which case the result is 0x0. | 237 // are empty vectors, in which case the result is 0x0. |
238 | 238 |
239 bool | 239 bool |