Mercurial > octave-nkf

comparison liboctave/array/CSparse.cc @ 18712:6113e0c6920b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Clean up extra spaces before/after parentheses.
author Rik <rik@octave.org>
date Fri, 25 Apr 2014 13:25:25 -0700
parents 5bd1ca29c5f0
children 9ac2357f19bc
comparison
equal deleted inserted replaced
18711:f684f7075aee 18712:6113e0c6920b
7706 7706
7707 octave_idx_type jb = b.cidx (i); 7707 octave_idx_type jb = b.cidx (i);
7708 octave_idx_type jb_max = b.cidx (i+1); 7708 octave_idx_type jb_max = b.cidx (i+1);
7709 bool jb_lt_max = jb < jb_max; 7709 bool jb_lt_max = jb < jb_max;
7710 7710
7711 while (ja_lt_max || jb_lt_max ) 7711 while (ja_lt_max || jb_lt_max)
7712 { 7712 {
7713 octave_quit (); 7713 octave_quit ();
7714 if ((! jb_lt_max) || 7714 if ((! jb_lt_max) ||
7715 (ja_lt_max && (a.ridx (ja) < b.ridx (jb)))) 7715 (ja_lt_max && (a.ridx (ja) < b.ridx (jb))))
7716 { 7716 {
7722 jx++; 7722 jx++;
7723 } 7723 }
7724 ja++; 7724 ja++;
7725 ja_lt_max= ja < ja_max; 7725 ja_lt_max= ja < ja_max;
7726 } 7726 }
7727 else if (( !ja_lt_max ) || 7727 else if ((! ja_lt_max) ||
7728 (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) 7728 (jb_lt_max && (b.ridx (jb) < a.ridx (ja))))
7729 { 7729 {
7730 Complex tmp = xmin (0., b.data (jb)); 7730 Complex tmp = xmin (0., b.data (jb));
7731 if (tmp != 0.) 7731 if (tmp != 0.)
7732 { 7732 {
7733 r.ridx (jx) = b.ridx (jb); 7733 r.ridx (jx) = b.ridx (jb);
7824 7824
7825 octave_idx_type jb = b.cidx (i); 7825 octave_idx_type jb = b.cidx (i);
7826 octave_idx_type jb_max = b.cidx (i+1); 7826 octave_idx_type jb_max = b.cidx (i+1);
7827 bool jb_lt_max = jb < jb_max; 7827 bool jb_lt_max = jb < jb_max;
7828 7828
7829 while (ja_lt_max || jb_lt_max ) 7829 while (ja_lt_max || jb_lt_max)
7830 { 7830 {
7831 octave_quit (); 7831 octave_quit ();
7832 if ((! jb_lt_max) || 7832 if ((! jb_lt_max) ||
7833 (ja_lt_max && (a.ridx (ja) < b.ridx (jb)))) 7833 (ja_lt_max && (a.ridx (ja) < b.ridx (jb))))
7834 { 7834 {
7840 jx++; 7840 jx++;
7841 } 7841 }
7842 ja++; 7842 ja++;
7843 ja_lt_max= ja < ja_max; 7843 ja_lt_max= ja < ja_max;
7844 } 7844 }
7845 else if (( !ja_lt_max ) || 7845 else if ((! ja_lt_max) ||
7846 (jb_lt_max && (b.ridx (jb) < a.ridx (ja)) ) ) 7846 (jb_lt_max && (b.ridx (jb) < a.ridx (ja))))
7847 { 7847 {
7848 Complex tmp = xmax (0., b.data (jb)); 7848 Complex tmp = xmax (0., b.data (jb));
7849 if (tmp != 0.) 7849 if (tmp != 0.)
7850 { 7850 {
7851 r.ridx (jx) = b.ridx (jb); 7851 r.ridx (jx) = b.ridx (jb);