Mercurial > octave-dspies
comparison liboctave/operators/Sparse-op-defs.h @ 18678:6113e0c6920b
maint: Clean up extra spaces before/after parentheses.
author | Rik <rik@octave.org> |
---|---|
date | Fri, 25 Apr 2014 13:25:25 -0700 |
parents | ebb3ef964372 |
children | 9ac2357f19bc |
comparison
equal
deleted
inserted
replaced
18677:f684f7075aee | 18678:6113e0c6920b |
---|---|
454 \ | 454 \ |
455 octave_idx_type jb = m2.cidx (i); \ | 455 octave_idx_type jb = m2.cidx (i); \ |
456 octave_idx_type jb_max = m2.cidx (i+1); \ | 456 octave_idx_type jb_max = m2.cidx (i+1); \ |
457 bool jb_lt_max = jb < jb_max; \ | 457 bool jb_lt_max = jb < jb_max; \ |
458 \ | 458 \ |
459 while (ja_lt_max || jb_lt_max ) \ | 459 while (ja_lt_max || jb_lt_max) \ |
460 { \ | 460 { \ |
461 octave_quit (); \ | 461 octave_quit (); \ |
462 if ((! jb_lt_max) || \ | 462 if ((! jb_lt_max) || \ |
463 (ja_lt_max && (m1.ridx (ja) < m2.ridx (jb)))) \ | 463 (ja_lt_max && (m1.ridx (ja) < m2.ridx (jb)))) \ |
464 { \ | 464 { \ |
466 r.data (jx) = m1.data (ja) OP 0.; \ | 466 r.data (jx) = m1.data (ja) OP 0.; \ |
467 jx++; \ | 467 jx++; \ |
468 ja++; \ | 468 ja++; \ |
469 ja_lt_max= ja < ja_max; \ | 469 ja_lt_max= ja < ja_max; \ |
470 } \ | 470 } \ |
471 else if (( !ja_lt_max ) || \ | 471 else if ((! ja_lt_max) || \ |
472 (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)) ) ) \ | 472 (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)))) \ |
473 { \ | 473 { \ |
474 r.ridx (jx) = m2.ridx (jb); \ | 474 r.ridx (jx) = m2.ridx (jb); \ |
475 r.data (jx) = 0. OP m2.data (jb); \ | 475 r.data (jx) = 0. OP m2.data (jb); \ |
476 jx++; \ | 476 jx++; \ |
477 jb++; \ | 477 jb++; \ |
562 \ | 562 \ |
563 octave_idx_type jb = m2.cidx (i); \ | 563 octave_idx_type jb = m2.cidx (i); \ |
564 octave_idx_type jb_max = m2.cidx (i+1); \ | 564 octave_idx_type jb_max = m2.cidx (i+1); \ |
565 bool jb_lt_max = jb < jb_max; \ | 565 bool jb_lt_max = jb < jb_max; \ |
566 \ | 566 \ |
567 while (ja_lt_max || jb_lt_max ) \ | 567 while (ja_lt_max || jb_lt_max) \ |
568 { \ | 568 { \ |
569 octave_quit (); \ | 569 octave_quit (); \ |
570 if ((! jb_lt_max) || \ | 570 if ((! jb_lt_max) || \ |
571 (ja_lt_max && (m1.ridx (ja) < m2.ridx (jb)))) \ | 571 (ja_lt_max && (m1.ridx (ja) < m2.ridx (jb)))) \ |
572 { \ | 572 { \ |
573 ja++; ja_lt_max= ja < ja_max; \ | 573 ja++; ja_lt_max= ja < ja_max; \ |
574 } \ | 574 } \ |
575 else if (( !ja_lt_max ) || \ | 575 else if ((! ja_lt_max) || \ |
576 (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)) ) ) \ | 576 (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)))) \ |
577 { \ | 577 { \ |
578 jb++; jb_lt_max= jb < jb_max; \ | 578 jb++; jb_lt_max= jb < jb_max; \ |
579 } \ | 579 } \ |
580 else \ | 580 else \ |
581 { \ | 581 { \ |
678 \ | 678 \ |
679 octave_idx_type jb = m2.cidx (i); \ | 679 octave_idx_type jb = m2.cidx (i); \ |
680 octave_idx_type jb_max = m2.cidx (i+1); \ | 680 octave_idx_type jb_max = m2.cidx (i+1); \ |
681 bool jb_lt_max = jb < jb_max; \ | 681 bool jb_lt_max = jb < jb_max; \ |
682 \ | 682 \ |
683 while (ja_lt_max || jb_lt_max ) \ | 683 while (ja_lt_max || jb_lt_max) \ |
684 { \ | 684 { \ |
685 octave_quit (); \ | 685 octave_quit (); \ |
686 if ((! jb_lt_max) || \ | 686 if ((! jb_lt_max) || \ |
687 (ja_lt_max && (m1.ridx (ja) < m2.ridx (jb)))) \ | 687 (ja_lt_max && (m1.ridx (ja) < m2.ridx (jb)))) \ |
688 { \ | 688 { \ |
689 /* keep those kludges coming */ \ | 689 /* keep those kludges coming */ \ |
690 r.elem (m1.ridx (ja),i) = m1.data (ja) OP Complex (); \ | 690 r.elem (m1.ridx (ja),i) = m1.data (ja) OP Complex (); \ |
691 ja++; \ | 691 ja++; \ |
692 ja_lt_max= ja < ja_max; \ | 692 ja_lt_max= ja < ja_max; \ |
693 } \ | 693 } \ |
694 else if (( !ja_lt_max ) || \ | 694 else if ((! ja_lt_max) || \ |
695 (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)) ) ) \ | 695 (jb_lt_max && (m2.ridx (jb) < m1.ridx (ja)))) \ |
696 { \ | 696 { \ |
697 /* keep those kludges coming */ \ | 697 /* keep those kludges coming */ \ |
698 r.elem (m2.ridx (jb),i) = Complex () OP m2.data (jb); \ | 698 r.elem (m2.ridx (jb),i) = Complex () OP m2.data (jb); \ |
699 jb++; \ | 699 jb++; \ |
700 jb_lt_max= jb < jb_max; \ | 700 jb_lt_max= jb < jb_max; \ |
1834 true, ==, false); \ | 1834 true, ==, false); \ |
1835 } | 1835 } |
1836 | 1836 |
1837 #define SPARSE_ANY_OP(DIM) SPARSE_ANY_ALL_OP (DIM, false, false, !=, true) | 1837 #define SPARSE_ANY_OP(DIM) SPARSE_ANY_ALL_OP (DIM, false, false, !=, true) |
1838 | 1838 |
1839 #define SPARSE_SPARSE_MUL( RET_TYPE, RET_EL_TYPE, EL_TYPE ) \ | 1839 #define SPARSE_SPARSE_MUL(RET_TYPE, RET_EL_TYPE, EL_TYPE) \ |
1840 octave_idx_type nr = m.rows (); \ | 1840 octave_idx_type nr = m.rows (); \ |
1841 octave_idx_type nc = m.cols (); \ | 1841 octave_idx_type nc = m.cols (); \ |
1842 \ | 1842 \ |
1843 octave_idx_type a_nr = a.rows (); \ | 1843 octave_idx_type a_nr = a.rows (); \ |
1844 octave_idx_type a_nc = a.cols (); \ | 1844 octave_idx_type a_nc = a.cols (); \ |
2003 retval.maybe_compress (true);\ | 2003 retval.maybe_compress (true);\ |
2004 return retval; \ | 2004 return retval; \ |
2005 } \ | 2005 } \ |
2006 } | 2006 } |
2007 | 2007 |
2008 #define SPARSE_FULL_MUL( RET_TYPE, EL_TYPE, ZERO ) \ | 2008 #define SPARSE_FULL_MUL(RET_TYPE, EL_TYPE, ZERO) \ |
2009 octave_idx_type nr = m.rows (); \ | 2009 octave_idx_type nr = m.rows (); \ |
2010 octave_idx_type nc = m.cols (); \ | 2010 octave_idx_type nc = m.cols (); \ |
2011 \ | 2011 \ |
2012 octave_idx_type a_nr = a.rows (); \ | 2012 octave_idx_type a_nr = a.rows (); \ |
2013 octave_idx_type a_nc = a.cols (); \ | 2013 octave_idx_type a_nc = a.cols (); \ |
2038 } \ | 2038 } \ |
2039 } \ | 2039 } \ |
2040 return retval; \ | 2040 return retval; \ |
2041 } | 2041 } |
2042 | 2042 |
2043 #define SPARSE_FULL_TRANS_MUL( RET_TYPE, EL_TYPE, ZERO, CONJ_OP ) \ | 2043 #define SPARSE_FULL_TRANS_MUL(RET_TYPE, EL_TYPE, ZERO, CONJ_OP) \ |
2044 octave_idx_type nr = m.rows (); \ | 2044 octave_idx_type nr = m.rows (); \ |
2045 octave_idx_type nc = m.cols (); \ | 2045 octave_idx_type nc = m.cols (); \ |
2046 \ | 2046 \ |
2047 octave_idx_type a_nr = a.rows (); \ | 2047 octave_idx_type a_nr = a.rows (); \ |
2048 octave_idx_type a_nc = a.cols (); \ | 2048 octave_idx_type a_nc = a.cols (); \ |
2074 } \ | 2074 } \ |
2075 } \ | 2075 } \ |
2076 return retval; \ | 2076 return retval; \ |
2077 } | 2077 } |
2078 | 2078 |
2079 #define FULL_SPARSE_MUL( RET_TYPE, EL_TYPE, ZERO ) \ | 2079 #define FULL_SPARSE_MUL(RET_TYPE, EL_TYPE, ZERO) \ |
2080 octave_idx_type nr = m.rows (); \ | 2080 octave_idx_type nr = m.rows (); \ |
2081 octave_idx_type nc = m.cols (); \ | 2081 octave_idx_type nc = m.cols (); \ |
2082 \ | 2082 \ |
2083 octave_idx_type a_nr = a.rows (); \ | 2083 octave_idx_type a_nr = a.rows (); \ |
2084 octave_idx_type a_nc = a.cols (); \ | 2084 octave_idx_type a_nc = a.cols (); \ |
2110 } \ | 2110 } \ |
2111 } \ | 2111 } \ |
2112 return retval; \ | 2112 return retval; \ |
2113 } | 2113 } |
2114 | 2114 |
2115 #define FULL_SPARSE_MUL_TRANS( RET_TYPE, EL_TYPE, ZERO, CONJ_OP ) \ | 2115 #define FULL_SPARSE_MUL_TRANS(RET_TYPE, EL_TYPE, ZERO, CONJ_OP) \ |
2116 octave_idx_type nr = m.rows (); \ | 2116 octave_idx_type nr = m.rows (); \ |
2117 octave_idx_type nc = m.cols (); \ | 2117 octave_idx_type nc = m.cols (); \ |
2118 \ | 2118 \ |
2119 octave_idx_type a_nr = a.rows (); \ | 2119 octave_idx_type a_nr = a.rows (); \ |
2120 octave_idx_type a_nc = a.cols (); \ | 2120 octave_idx_type a_nc = a.cols (); \ |