Mercurial > hg > octave-max

changeset 9071:034800482c79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix default string->real array conversion
author Jaroslav Hajek <highegg@gmail.com>
date Wed, 01 Apr 2009 09:20:08 +0200
parents e9dc2ed2ec0f
children bd8e388043c4
files src/ChangeLog src/ov-str-mat.cc
diffstat 2 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-01  Jaroslav Hajek  <highegg@gmail.com>
+
+	* ov-str-mat.cc (default_numeric_conversion_function):
+	Create an octave_scalar if possible.
+
 2009-03-29  John W. Eaton  <jwe@octave.org>
 
 	* DLD-FUNCTIONS/fltk_backend.cc (plot_window::button_press):
--- a/src/ov-str-mat.cc
+++ b/src/ov-str-mat.cc
@@ -68,7 +68,13 @@
 
   NDArray nda = v.array_value (true);
 
-  if (! error_state) retval = new octave_matrix (nda);
+  if (! error_state)
+    {
+      if (nda.numel () == 1)
+        retval = new octave_scalar (nda(0));
+      else
+        retval = new octave_matrix (nda);
+    }
 
   return retval;
 }