Mercurial > hg > octave-lyh

comparison liboctave/CMatrix.cc @ 9658:3429c956de6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extend linspace & fix up liboctave rewrite
author Jaroslav Hajek <highegg@gmail.com>
date Sat, 19 Sep 2009 22:17:12 +0200
parents e087d7c77ff9
children afcf852256d2
comparison
equal deleted inserted replaced
9657:3c1c3a38ec7b 9658:3429c956de6f
4083 retval.clear (m, n); 4083 retval.clear (m, n);
4084 for (octave_idx_type i = 0; i < m; i++) 4084 for (octave_idx_type i = 0; i < m; i++)
4085 retval(i, 0) = x1(i); 4085 retval(i, 0) = x1(i);
4086 4086
4087 // The last column is not needed while using delta. 4087 // The last column is not needed while using delta.
4088 Complex *delta = &retval(0, 1); 4088 Complex *delta = &retval(0, n-1);
4089 for (octave_idx_type i = 0; i < m; i++) 4089 for (octave_idx_type i = 0; i < m; i++)
4090 delta[i] = (x2(i) - x1(i)) / (n - 1.0); 4090 delta[i] = (x2(i) - x1(i)) / (n - 1.0);
4091 4091
4092 for (octave_idx_type j = 1; j < n-1; j++) 4092 for (octave_idx_type j = 1; j < n-1; j++)
4093 for (octave_idx_type i = 0; i < m; i++) 4093 for (octave_idx_type i = 0; i < m; i++)
4094 retval(i, j) = retval(i, j-1) + delta[i]; 4094 retval(i, j) = x1(i) + static_cast<double> (j)*delta[i];
4095 4095
4096 for (octave_idx_type i = 0; i < m; i++) 4096 for (octave_idx_type i = 0; i < m; i++)
4097 retval(i, n-1) = x2(i); 4097 retval(i, n-1) = x2(i);
4098 4098
4099 return retval; 4099 return retval;