Mercurial > hg > octave-nkf

comparison src/oct-map.cc @ 14861:f7afecdd87ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use Octave coding conventions for cuddling parentheses in src/ directory * bitfcns.cc, comment-list.cc, data.cc, defun.cc, error.cc, gl-render.cc, graphics.cc, graphics.in.h, load-path.cc, load-path.h, load-save.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, ls-oct-ascii.cc, mappers.cc, mex.cc, oct-map.cc, oct-obj.cc, ov-base-int.cc, ov-base-mat.h, ov-base-sparse.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-cell.cc, ov-class.cc, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, ov-usr-fcn.cc, ov.cc, pr-output.cc, procstream.h, sighandlers.cc, sparse-xdiv.cc, sparse-xpow.cc, sparse.cc, symtab.cc, syscalls.cc, sysdep.cc, txt-eng-ft.cc, variables.cc, zfstream.cc, zfstream.h: Use Octave coding conventions for cuddling parentheses.
author Rik <octave@nomad.inbox5.com>
date Sat, 14 Jul 2012 06:22:56 -0700
parents 460a3c6d8bf1
children
comparison
equal deleted inserted replaced
14860:e027f98403c3 14861:f7afecdd87ef
150 { 150 {
151 octave_idx_type n = nfields (); 151 octave_idx_type n = nfields ();
152 string_vector retval(n); 152 string_vector retval(n);
153 153
154 for (iterator p = begin (); p != end (); p++) 154 for (iterator p = begin (); p != end (); p++)
155 retval.xelem(p->second) = p->first; 155 retval.xelem (p->second) = p->first;
156 156
157 return retval; 157 return retval;
158 } 158 }
159 159
160 octave_value 160 octave_value
195 octave_scalar_map retval (xkeys); 195 octave_scalar_map retval (xkeys);
196 retval.xkeys.orderfields (perm); 196 retval.xkeys.orderfields (perm);
197 197
198 octave_idx_type nf = nfields (); 198 octave_idx_type nf = nfields ();
199 for (octave_idx_type i = 0; i < nf; i++) 199 for (octave_idx_type i = 0; i < nf; i++)
200 retval.xvals[i] = xvals[perm.xelem(i)]; 200 retval.xvals[i] = xvals[perm.xelem (i)];
201 201
202 return retval; 202 return retval;
203 } 203 }
204 204
205 octave_scalar_map 205 octave_scalar_map
213 octave_scalar_map retval (other.xkeys); 213 octave_scalar_map retval (other.xkeys);
214 if (other.xkeys.equal_up_to_order (xkeys, perm)) 214 if (other.xkeys.equal_up_to_order (xkeys, perm))
215 { 215 {
216 octave_idx_type nf = nfields (); 216 octave_idx_type nf = nfields ();
217 for (octave_idx_type i = 0; i < nf; i++) 217 for (octave_idx_type i = 0; i < nf; i++)
218 retval.xvals[i] = xvals[perm.xelem(i)]; 218 retval.xvals[i] = xvals[perm.xelem (i)];
219 } 219 }
220 else 220 else
221 error ("orderfields: structs must have same fields up to order"); 221 error ("orderfields: structs must have same fields up to order");
222 222
223 return retval; 223 return retval;
245 octave_idx_type nf = m.nfields (); 245 octave_idx_type nf = m.nfields ();
246 xvals.reserve (nf); 246 xvals.reserve (nf);
247 for (octave_idx_type i = 0; i < nf; i++) 247 for (octave_idx_type i = 0; i < nf; i++)
248 { 248 {
249 xvals.push_back (Cell (dimensions)); 249 xvals.push_back (Cell (dimensions));
250 xvals[i].xelem(0) = m.xvals[i]; 250 xvals[i].xelem (0) = m.xvals[i];
251 } 251 }
252 } 252 }
253 253
254 octave_map::octave_map (const Octave_map& m) 254 octave_map::octave_map (const Octave_map& m)
255 : xkeys (m.keys ()), xvals (m.nfields ()), dimensions (m.dims ()) 255 : xkeys (m.keys ()), xvals (m.nfields ()), dimensions (m.dims ())
306 octave_map retval (xkeys); 306 octave_map retval (xkeys);
307 retval.xkeys.orderfields (perm); 307 retval.xkeys.orderfields (perm);
308 308
309 octave_idx_type nf = nfields (); 309 octave_idx_type nf = nfields ();
310 for (octave_idx_type i = 0; i < nf; i++) 310 for (octave_idx_type i = 0; i < nf; i++)
311 retval.xvals[i] = xvals[perm.xelem(i)]; 311 retval.xvals[i] = xvals[perm.xelem (i)];
312 312
313 return retval; 313 return retval;
314 } 314 }
315 315
316 octave_map 316 octave_map
324 octave_map retval (other.xkeys); 324 octave_map retval (other.xkeys);
325 if (other.xkeys.equal_up_to_order (xkeys, perm)) 325 if (other.xkeys.equal_up_to_order (xkeys, perm))
326 { 326 {
327 octave_idx_type nf = nfields (); 327 octave_idx_type nf = nfields ();
328 for (octave_idx_type i = 0; i < nf; i++) 328 for (octave_idx_type i = 0; i < nf; i++)
329 retval.xvals[i] = xvals[perm.xelem(i)]; 329 retval.xvals[i] = xvals[perm.xelem (i)];
330 } 330 }
331 else 331 else
332 error ("orderfields: structs must have same fields up to order"); 332 error ("orderfields: structs must have same fields up to order");
333 333
334 return retval; 334 return retval;
589 for (octave_idx_type j = 0; j < nf; j++) 589 for (octave_idx_type j = 0; j < nf; j++)
590 { 590 {
591 retval.xvals.push_back (Cell (rd)); 591 retval.xvals.push_back (Cell (rd));
592 assert (retval.xvals[j].numel () == n); 592 assert (retval.xvals[j].numel () == n);
593 for (octave_idx_type i = 0; i < n; i++) 593 for (octave_idx_type i = 0; i < n; i++)
594 retval.xvals[j].xelem(i) = map_list[i].xvals[j]; 594 retval.xvals[j].xelem (i) = map_list[i].xvals[j];
595 } 595 }
596 } 596 }
597 597
598 void 598 void
599 octave_map::do_cat (int dim, octave_idx_type n, const octave_map *map_list, 599 octave_map::do_cat (int dim, octave_idx_type n, const octave_map *map_list,
1276 { 1276 {
1277 error ("field name mismatch in structure concatenation"); 1277 error ("field name mismatch in structure concatenation");
1278 break; 1278 break;
1279 } 1279 }
1280 1280
1281 contents(pa).insert (rb.contents(pb), ra_idx); 1281 contents(pa).insert (rb.contents (pb), ra_idx);
1282 } 1282 }
1283 } 1283 }
1284 else 1284 else
1285 { 1285 {
1286 dim_vector dv = dims (); 1286 dim_vector dv = dims ();