Mercurial > octave
diff libinterp/corefcn/data.cc @ 31608:23664317f0d3
maint: merge stable to default
author | Rik <rik@octave.org> |
---|---|
date | Thu, 01 Dec 2022 20:05:44 -0800 |
parents | dfa5d9c3ae72 aac27ad79be6 |
children | 1e270beb6982 |
line wrap: on
line diff
--- a/libinterp/corefcn/data.cc Thu Dec 01 14:28:07 2022 -0800 +++ b/libinterp/corefcn/data.cc Thu Dec 01 20:05:44 2022 -0800 @@ -96,7 +96,7 @@ print_usage (); int dim = (nargin == 1 ? -1 - : args(1).xint_value ("all: DIM must be an integer")-1); + : args(1).xint_value ("all: DIM must be an integer")-1); if (dim < -1) error ("all: invalid dimension argument = %d", dim + 1); @@ -161,7 +161,7 @@ print_usage (); int dim = (nargin == 1 ? -1 - : args(1).xint_value ("any: DIM must be an integer")-1); + : args(1).xint_value ("any: DIM must be an integer")-1); if (dim < -1) error ("any: invalid dimension argument = %d", dim + 1); @@ -2048,8 +2048,8 @@ ## Test concatenation with all zero matrices %!test %! warning ("off", "Octave:num-to-str", "local"); -%! assert (horzcat ("", 65*ones (1,10)), "AAAAAAAAAA"); -%! assert (horzcat (65*ones (1,10), ""), "AAAAAAAAAA"); +%! assert (horzcat ("", 65* ones (1,10)), "AAAAAAAAAA"); +%! assert (horzcat (65* ones (1,10), ""), "AAAAAAAAAA"); %!assert (class (horzcat (int64 (1), int64 (1))), "int64") %!assert (class (horzcat (int64 (1), int32 (1))), "int64") @@ -3566,7 +3566,7 @@ for (octave_idx_type i = im_val.cidx (j); i < im_val.cidx (j + 1); i++) result.data (im_val.ridx (i) + off) - += Complex (0, im_val.data (i)); + += Complex (0, im_val.data (i)); } } retval = octave_value (new octave_sparse_complex_matrix (result)); @@ -3589,7 +3589,7 @@ for (octave_idx_type i = re_val.cidx (j); i < re_val.cidx (j + 1); i++) result.data (re_val.ridx (i) + off) - += re_val.data (i); + += re_val.data (i); } } retval = octave_value (new octave_sparse_complex_matrix (result)); @@ -6272,7 +6272,7 @@ %!assert (norm (x,0), single (5)) %!assert (norm (x,1), single (20)) %!assert (norm (x,2), single (10)) -%!assert (norm (x,3), single (8.24257059961711), -4*eps ("single")) +%!assert (norm (x,3), single (8.24257059961711), -4* eps ("single")) %!assert (norm (x,Inf), single (7)) %!assert (norm (x,-Inf), single (1)) %!assert (norm (x,"inf"), single (7)) @@ -6280,7 +6280,7 @@ %!assert (norm (x,"fro"), single (10), -eps ("single")) %!assert (norm (x), single (10)) %!assert (norm (single ([1e38, 1])), single (1e38)) -%!assert (norm (single ([3+4i, 3-4i, sqrt(31)])), single (9), -4*eps ("single")) +%!assert (norm (single ([3+4i, 3-4i, sqrt(31)])), single (9), -4* eps ("single")) %!shared m %! m = single (magic (4)); %!assert (norm (m,1), single (34)) @@ -8431,17 +8431,17 @@ MAKE_INT_BRANCH(int8) else MAKE_INT_BRANCH(int16) - else MAKE_INT_BRANCH(int32) - else MAKE_INT_BRANCH(int64) - else MAKE_INT_BRANCH(uint8) - else MAKE_INT_BRANCH(uint16) - else MAKE_INT_BRANCH(uint32) - else MAKE_INT_BRANCH(uint64) + else MAKE_INT_BRANCH(int32) + else MAKE_INT_BRANCH(int64) + else MAKE_INT_BRANCH(uint8) + else MAKE_INT_BRANCH(uint16) + else MAKE_INT_BRANCH(uint32) + else MAKE_INT_BRANCH(uint64) #undef MAKE_INT_BRANCH - else - panic_impossible (); + else + panic_impossible (); } else if (args(0).is_single_type ()) {