Mercurial > octave-nkf

comparison src/ls-mat4.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 72c96de7a403
children
comparison
equal deleted inserted replaced
14860:e027f98403c3 14861:f7afecdd87ef
342 OCTAVE_LOCAL_BUFFER (double, dtmp, nr); 342 OCTAVE_LOCAL_BUFFER (double, dtmp, nr);
343 OCTAVE_LOCAL_BUFFER (double, ctmp, nr); 343 OCTAVE_LOCAL_BUFFER (double, ctmp, nr);
344 344
345 read_mat_binary_data (is, dtmp, prec, nr, swap, flt_fmt); 345 read_mat_binary_data (is, dtmp, prec, nr, swap, flt_fmt);
346 for (octave_idx_type i = 0; i < nr - 1; i++) 346 for (octave_idx_type i = 0; i < nr - 1; i++)
347 r.xelem(i) = dtmp[i] - 1; 347 r.xelem (i) = dtmp[i] - 1;
348 nr_new = dtmp[nr - 1]; 348 nr_new = dtmp[nr - 1];
349 read_mat_binary_data (is, dtmp, prec, nr, swap, flt_fmt); 349 read_mat_binary_data (is, dtmp, prec, nr, swap, flt_fmt);
350 for (octave_idx_type i = 0; i < nr - 1; i++) 350 for (octave_idx_type i = 0; i < nr - 1; i++)
351 c.xelem(i) = dtmp[i] - 1; 351 c.xelem (i) = dtmp[i] - 1;
352 nc_new = dtmp[nr - 1]; 352 nc_new = dtmp[nr - 1];
353 read_mat_binary_data (is, dtmp, prec, nr - 1, swap, flt_fmt); 353 read_mat_binary_data (is, dtmp, prec, nr - 1, swap, flt_fmt);
354 read_mat_binary_data (is, ctmp, prec, 1, swap, flt_fmt); 354 read_mat_binary_data (is, ctmp, prec, 1, swap, flt_fmt);
355 read_mat_binary_data (is, ctmp, prec, nr - 1, swap, flt_fmt); 355 read_mat_binary_data (is, ctmp, prec, nr - 1, swap, flt_fmt);
356 356
357 for (octave_idx_type i = 0; i < nr - 1; i++) 357 for (octave_idx_type i = 0; i < nr - 1; i++)
358 data.xelem(i) = Complex (dtmp[i], ctmp[i]); 358 data.xelem (i) = Complex (dtmp[i], ctmp[i]);
359 read_mat_binary_data (is, ctmp, prec, 1, swap, flt_fmt); 359 read_mat_binary_data (is, ctmp, prec, 1, swap, flt_fmt);
360 360
361 SparseComplexMatrix smc = SparseComplexMatrix (data, r, c, 361 SparseComplexMatrix smc = SparseComplexMatrix (data, r, c,
362 nr_new, nc_new); 362 nr_new, nc_new);
363 363
371 Array<octave_idx_type> r (dim_vector (1, nr - 1)); 371 Array<octave_idx_type> r (dim_vector (1, nr - 1));
372 OCTAVE_LOCAL_BUFFER (double, dtmp, nr); 372 OCTAVE_LOCAL_BUFFER (double, dtmp, nr);
373 373
374 read_mat_binary_data (is, dtmp, prec, nr, swap, flt_fmt); 374 read_mat_binary_data (is, dtmp, prec, nr, swap, flt_fmt);
375 for (octave_idx_type i = 0; i < nr - 1; i++) 375 for (octave_idx_type i = 0; i < nr - 1; i++)
376 r.xelem(i) = dtmp[i] - 1; 376 r.xelem (i) = dtmp[i] - 1;
377 nr_new = dtmp[nr - 1]; 377 nr_new = dtmp[nr - 1];
378 read_mat_binary_data (is, dtmp, prec, nr, swap, flt_fmt); 378 read_mat_binary_data (is, dtmp, prec, nr, swap, flt_fmt);
379 for (octave_idx_type i = 0; i < nr - 1; i++) 379 for (octave_idx_type i = 0; i < nr - 1; i++)
380 c.xelem(i) = dtmp[i] - 1; 380 c.xelem (i) = dtmp[i] - 1;
381 nc_new = dtmp[nr - 1]; 381 nc_new = dtmp[nr - 1];
382 read_mat_binary_data (is, data.fortran_vec (), prec, nr - 1, swap, flt_fmt); 382 read_mat_binary_data (is, data.fortran_vec (), prec, nr - 1, swap, flt_fmt);
383 read_mat_binary_data (is, dtmp, prec, 1, swap, flt_fmt); 383 read_mat_binary_data (is, dtmp, prec, 1, swap, flt_fmt);
384 384
385 SparseMatrix sm = SparseMatrix (data, r, c, nr_new, nc_new); 385 SparseMatrix sm = SparseMatrix (data, r, c, nr_new, nc_new);
507 const char *s = tstr.data (); 507 const char *s = tstr.data ();
508 508
509 for (octave_idx_type j = 0; j < ncol; j++) 509 for (octave_idx_type j = 0; j < ncol; j++)
510 buf[j*nrow+i] = static_cast<double> (*s++ & 0x00FF); 510 buf[j*nrow+i] = static_cast<double> (*s++ & 0x00FF);
511 } 511 }
512 os.write (reinterpret_cast<char *> (buf), nrow*ncol*sizeof(double)); 512 os.write (reinterpret_cast<char *> (buf), nrow*ncol*sizeof (double));
513 } 513 }
514 else if (tc.is_range ()) 514 else if (tc.is_range ())
515 { 515 {
516 Range r = tc.range_value (); 516 Range r = tc.range_value ();
517 double base = r.base (); 517 double base = r.base ();
535 if (tc.is_complex_matrix ()) 535 if (tc.is_complex_matrix ())
536 { 536 {
537 SparseComplexMatrix m = tc.sparse_complex_matrix_value (); 537 SparseComplexMatrix m = tc.sparse_complex_matrix_value ();
538 538
539 for (octave_idx_type i = 0; i < len; i++) 539 for (octave_idx_type i = 0; i < len; i++)
540 dtmp [i] = m.ridx(i) + 1; 540 dtmp[i] = m.ridx (i) + 1;
541 os.write (reinterpret_cast<const char *> (dtmp), 8 * len); 541 os.write (reinterpret_cast<const char *> (dtmp), 8 * len);
542 ds = nr; 542 ds = nr;
543 os.write (reinterpret_cast<const char *> (&ds), 8); 543 os.write (reinterpret_cast<const char *> (&ds), 8);
544 544
545 octave_idx_type ii = 0; 545 octave_idx_type ii = 0;
546 for (octave_idx_type j = 0; j < nc; j++) 546 for (octave_idx_type j = 0; j < nc; j++)
547 for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) 547 for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++)
548 dtmp[ii++] = j + 1; 548 dtmp[ii++] = j + 1;
549 os.write (reinterpret_cast<const char *> (dtmp), 8 * len); 549 os.write (reinterpret_cast<const char *> (dtmp), 8 * len);
550 ds = nc; 550 ds = nc;
551 os.write (reinterpret_cast<const char *> (&ds), 8); 551 os.write (reinterpret_cast<const char *> (&ds), 8);
552 552
553 for (octave_idx_type i = 0; i < len; i++) 553 for (octave_idx_type i = 0; i < len; i++)
554 dtmp [i] = std::real (m.data(i)); 554 dtmp[i] = std::real (m.data (i));
555 os.write (reinterpret_cast<const char *> (dtmp), 8 * len); 555 os.write (reinterpret_cast<const char *> (dtmp), 8 * len);
556 ds = 0.; 556 ds = 0.;
557 os.write (reinterpret_cast<const char *> (&ds), 8); 557 os.write (reinterpret_cast<const char *> (&ds), 8);
558 558
559 for (octave_idx_type i = 0; i < len; i++) 559 for (octave_idx_type i = 0; i < len; i++)
560 dtmp [i] = std::imag (m.data(i)); 560 dtmp[i] = std::imag (m.data (i));
561 os.write (reinterpret_cast<const char *> (dtmp), 8 * len); 561 os.write (reinterpret_cast<const char *> (dtmp), 8 * len);
562 os.write (reinterpret_cast<const char *> (&ds), 8); 562 os.write (reinterpret_cast<const char *> (&ds), 8);
563 } 563 }
564 else 564 else
565 { 565 {
566 SparseMatrix m = tc.sparse_matrix_value (); 566 SparseMatrix m = tc.sparse_matrix_value ();
567 567
568 for (octave_idx_type i = 0; i < len; i++) 568 for (octave_idx_type i = 0; i < len; i++)
569 dtmp [i] = m.ridx(i) + 1; 569 dtmp[i] = m.ridx (i) + 1;
570 os.write (reinterpret_cast<const char *> (dtmp), 8 * len); 570 os.write (reinterpret_cast<const char *> (dtmp), 8 * len);
571 ds = nr; 571 ds = nr;
572 os.write (reinterpret_cast<const char *> (&ds), 8); 572 os.write (reinterpret_cast<const char *> (&ds), 8);
573 573
574 octave_idx_type ii = 0; 574 octave_idx_type ii = 0;
575 for (octave_idx_type j = 0; j < nc; j++) 575 for (octave_idx_type j = 0; j < nc; j++)
576 for (octave_idx_type i = m.cidx(j); i < m.cidx(j+1); i++) 576 for (octave_idx_type i = m.cidx (j); i < m.cidx (j+1); i++)
577 dtmp[ii++] = j + 1; 577 dtmp[ii++] = j + 1;
578 os.write (reinterpret_cast<const char *> (dtmp), 8 * len); 578 os.write (reinterpret_cast<const char *> (dtmp), 8 * len);
579 ds = nc; 579 ds = nc;
580 os.write (reinterpret_cast<const char *> (&ds), 8); 580 os.write (reinterpret_cast<const char *> (&ds), 8);
581 581