Mercurial > hg > octave-nkf
changeset 19491:ad2bb7315b41 gui-release
maint: Periodic merge of stable to gui-release.
author | Rik <rik@octave.org> |
---|---|
date | Mon, 03 Nov 2014 22:08:27 -0800 |
parents | cd8cf41f130d (current diff) ed1bf35dc11c (diff) |
children | d6240c099a02 |
files | |
diffstat | 2 files changed, 23 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/install.txi +++ b/doc/interpreter/install.txi @@ -729,6 +729,16 @@ @noindent Other systems may require a different solution. +@item @sc{arpack} (http://forge.scilab.org/index.php/p/arpack-ng/) + +@itemize @minus +@item Add @option{-fdefault-integer-8} to @env{FFLAGS} when running configure. + +@item Run @code{make} to build the library. + +@item Run @code{make install} to install the library. +@end itemize + @item ATLAS instead of reference @sc{blas} and @sc{lapack} Suggestions on how to compile ATLAS would be most welcome.
--- a/scripts/io/importdata.m +++ b/scripts/io/importdata.m @@ -176,7 +176,7 @@ ## If no delimiter determined yet, make a guess. if (isempty (delimiter)) ## This pattern can be fooled, but mostly does the job just fine. - delim = regexp (row, '[-+\d.eE*ij ]+([^-+\d.ij])[-+\d.ij]', + delim = regexpi (row, '[-+\d.e*ij ]+([^-+\de.ij])[-+\de*.ij ]', 'tokens', 'once'); #delim = regexp (row, '[+-\d.eE\*ij ]+([^+-\d.ij])[+-\d.ij]', # 'tokens', 'once'); @@ -498,6 +498,18 @@ %! assert (d, "\t"); %! assert (h, 0); +%!test +%! ## Distinguish double from complex when no delimiter is supplied (bug #43393) +%! fn = tmpnam (); +%! fid = fopen (fn, "w"); +%! fputs (fid, "2.0000e+02 4.0000e-04"); +%! fclose (fid); +%! [a, d, h] = importdata (fn); +%! unlink (fn); +%! assert (a, [2e2, 4e-4]); +%! assert (d, " "); +%! assert (h, 0); + %!error importdata () %!error importdata (1,2,3,4) %!error <FNAME must be a string> importdata (1)