# HG changeset patch # User Arun Giridhar # Date 1679698193 14400 # Node ID 40b77efa1c7b2703dc6fe07c7bd925f3cbd30d92 # Parent 69c15474d82962f19f476a21cee958d6ef82f181# Parent a8473e7db0f4618342f99bb11f02f19aecd45ff9 maint: Merge away extra head diff -r 69c15474d829 -r 40b77efa1c7b liboctave/array/CMatrix.cc --- a/liboctave/array/CMatrix.cc Fri Mar 24 18:44:40 2023 -0400 +++ b/liboctave/array/CMatrix.cc Fri Mar 24 18:49:53 2023 -0400 @@ -3645,19 +3645,7 @@ retval.clear (m, n); for (octave_idx_type i = 0; i < m; i++) - retval.xelem (i, 0) = x1(i); - - // The last column is unused so temporarily store delta there - Complex *delta = &retval.xelem (0, n-1); - for (octave_idx_type i = 0; i < m; i++) - delta[i] = (x1(i) == x2(i)) ? 0 : (x2(i) - x1(i)) / (n - 1.0); - - for (octave_idx_type j = 1; j < n-1; j++) - for (octave_idx_type i = 0; i < m; i++) - retval.xelem (i, j) = x1(i) + static_cast (j)*delta[i]; - - for (octave_idx_type i = 0; i < m; i++) - retval.xelem (i, n-1) = x2(i); + retval.insert (linspace (x1(i), x2(i), n), i, 0); return retval; } diff -r 69c15474d829 -r 40b77efa1c7b liboctave/array/dMatrix.cc --- a/liboctave/array/dMatrix.cc Fri Mar 24 18:44:40 2023 -0400 +++ b/liboctave/array/dMatrix.cc Fri Mar 24 18:49:53 2023 -0400 @@ -3029,19 +3029,7 @@ retval.clear (m, n); for (octave_idx_type i = 0; i < m; i++) - retval.xelem (i, 0) = x1(i); - - // The last column is unused so temporarily store delta there - double *delta = &retval.xelem (0, n-1); - for (octave_idx_type i = 0; i < m; i++) - delta[i] = (x1(i) == x2(i)) ? 0 : (x2(i) - x1(i)) / (n - 1); - - for (octave_idx_type j = 1; j < n-1; j++) - for (octave_idx_type i = 0; i < m; i++) - retval.xelem (i, j) = x1(i) + j*delta[i]; - - for (octave_idx_type i = 0; i < m; i++) - retval.xelem (i, n-1) = x2(i); + retval.insert (linspace (x1(i), x2(i), n), i, 0); return retval; } diff -r 69c15474d829 -r 40b77efa1c7b liboctave/array/fCMatrix.cc --- a/liboctave/array/fCMatrix.cc Fri Mar 24 18:44:40 2023 -0400 +++ b/liboctave/array/fCMatrix.cc Fri Mar 24 18:49:53 2023 -0400 @@ -3676,19 +3676,7 @@ retval.clear (m, n); for (octave_idx_type i = 0; i < m; i++) - retval.xelem (i, 0) = x1(i); - - // The last column is unused so temporarily store delta there - FloatComplex *delta = &retval.xelem (0, n-1); - for (octave_idx_type i = 0; i < m; i++) - delta[i] = (x1(i) == x2(i)) ? 0 : (x2(i) - x1(i)) / (n - 1.0f); - - for (octave_idx_type j = 1; j < n-1; j++) - for (octave_idx_type i = 0; i < m; i++) - retval.xelem (i, j) = x1(i) + static_cast (j)*delta[i]; - - for (octave_idx_type i = 0; i < m; i++) - retval.xelem (i, n-1) = x2(i); + retval.insert (linspace (x1(i), x2(i), n), i, 0); return retval; } diff -r 69c15474d829 -r 40b77efa1c7b liboctave/array/fMatrix.cc --- a/liboctave/array/fMatrix.cc Fri Mar 24 18:44:40 2023 -0400 +++ b/liboctave/array/fMatrix.cc Fri Mar 24 18:49:53 2023 -0400 @@ -3035,19 +3035,7 @@ retval.clear (m, n); for (octave_idx_type i = 0; i < m; i++) - retval.xelem (i, 0) = x1(i); - - // The last column is unused so temporarily store delta there - float *delta = &retval.xelem (0, n-1); - for (octave_idx_type i = 0; i < m; i++) - delta[i] = (x1(i) == x2(i)) ? 0 : (x2(i) - x1(i)) / (n - 1); - - for (octave_idx_type j = 1; j < n-1; j++) - for (octave_idx_type i = 0; i < m; i++) - retval.xelem (i, j) = x1(i) + j*delta[i]; - - for (octave_idx_type i = 0; i < m; i++) - retval.xelem (i, n-1) = x2(i); + retval.insert (linspace (x1(i), x2(i), n), i, 0); return retval; }