Mercurial > octave-nkf

changeset 10356:1d7930b77ab9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
implement compiled str2double
author Jaroslav Hajek <highegg@gmail.com>
date Wed, 24 Feb 2010 21:42:22 +0100
parents f9347eac65dc
children 7658cd4bdcf2
files scripts/ChangeLog scripts/strings/module.mk scripts/strings/str2double.m src/ChangeLog src/DLD-FUNCTIONS/module-files src/DLD-FUNCTIONS/str2double.cc
diffstat 6 files changed, 221 insertions(+), 294 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Thu Feb 25 08:21:35 2010 +0100
+++ b/scripts/ChangeLog	Wed Feb 24 21:42:22 2010 +0100
@@ -1,3 +1,7 @@
+2010-02-25  Jaroslav Hajek  <highegg@gmail.com>
+
+	* strings/str2double.m: Remove.
+
 2010-02-24  John W. Eaton  <jwe@octave.org>
 
 	* plot/private/__contour__.m (get_lvl_eps): New function.
--- a/scripts/strings/module.mk	Thu Feb 25 08:21:35 2010 +0100
+++ b/scripts/strings/module.mk	Wed Feb 24 21:42:22 2010 +0100
@@ -17,7 +17,6 @@
   strings/regexptranslate.m \
   strings/rindex.m \
   strings/strsplit.m \
-  strings/str2double.m \
   strings/str2num.m \
   strings/strcat.m \
   strings/cstrcat.m \
--- a/scripts/strings/str2double.m	Thu Feb 25 08:21:35 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,293 +0,0 @@
-## Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 by Alois Schloegl
-##
-## This file is part of Octave.
-##
-## Octave is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3 of the License, or (at
-## your option) any later version.
-##
-## Octave is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Octave; see the file COPYING.  If not, see
-## <http://www.gnu.org/licenses/>.
-
-## -*- texinfo -*-
-## @deftypefn {Function File} {[@var{num}, @var{status}, @var{strarray}] =} str2double (@var{str}, @var{cdelim}, @var{rdelim}, @var{ddelim})
-## Convert strings into numeric values.
-##
-## @code{str2double} can replace @code{str2num}, but avoids the use of
-## @code{eval} on unknown data.
-##
-## @var{str} can be the form @samp{[+-]d[.]dd[[eE][+-]ddd]} in which
-## @samp{d} can be any of digit from 0 to 9, and @samp{[]} indicate
-## optional elements.
-##
-## @var{num} is the corresponding numeric value.  If the conversion
-## fails, status is -1 and @var{num} is NaN.
-##
-## @var{status} is 0 if the conversion was successful and -1 otherwise.
-##
-## @var{strarray} is a cell array of strings.
-##
-## Elements which are not defined or not valid return NaN and the
-## @var{status} becomes -1.
-##
-## If @var{str} is a character array or a cell array of strings, then
-## @var{num} and @var{status} return matrices of appropriate size. 
-##
-## @var{str} can also contain multiple elements separated by row and
-## column delimiters (@var{cdelim} and @var{rdelim}).
-## 
-## The parameters @var{cdelim}, @var{rdelim}, and @var{ddelim} are
-## optional column, row, and decimal delimiters.
-##
-## The default row-delimiters are newline, carriage return and semicolon
-## (ASCII 10, 13 and 59).  The default column-delimiters are tab, space
-## and comma (ASCII 9, 32, and 44).  The default decimal delimiter is
-## @samp{.} (ASCII 46).
-##
-## @var{cdelim}, @var{rdelim}, and @var{ddelim} must contain only nul,
-## newline, carriage return, semicolon, colon, slash, tab, space, comma,
-## or @samp{()[]@{@}} (ASCII 0, 9, 10, 11, 12, 13, 14, 32, 33, 34, 40,
-## 41, 44, 47, 58, 59, 91, 93, 123, 124, 125).
-##
-## Examples:
-##
-## @example
-## @group
-## str2double ("-.1e-5")
-## @result{} -1.0000e-006
-##
-## str2double (".314e1, 44.44e-1, .7; -1e+1")
-## @result{}
-##    3.1400    4.4440    0.7000
-##  -10.0000       NaN       NaN
-##
-## line = "200, 300, NaN, -inf, yes, no, 999, maybe, NaN";
-## [x, status] = str2double (line)
-## @result{} x =
-##     200   300   NaN  -Inf   NaN   NaN   999   NaN   NaN
-## @result{} status =
-##       0     0     0     0    -1    -1     0    -1     0
-## @end group
-## @end example
-## @seealso{str2num}
-## @end deftypefn
-
-## Author: Alois Schloegl <a.schloegl@ieee.org>
-## Adapted-by: jwe
-
-function [num, status, strarray] = str2double (s, cdelim, rdelim, ddelim)
-
-  ## digits, sign, exponent,NaN,Inf
-  ## valid_char = '0123456789eE+-.nNaAiIfF';
-
-  ## Valid delimiters.
-  valid_delim = char (sort ([0, 9:14, 32:34, abs("()[]{},;:\"|/")]));
-
-  if (nargin < 1 || nargin > 4)
-    print_usage ();
-  endif
-
-  if (nargin < 2)
-    ## Column delimiter.
-    cdelim = char ([9, 32, abs(",")]);
-  else
-    ## Make unique cdelim.
-    cdelim = char (sort (cdelim(:)));
-    tmp = [1; 1+find(diff(abs(cdelim))>0)];
-    cdelim = cdelim(tmp)';
-  endif
-
-  if (nargin < 3)
-    ## Row delimiter.
-    rdelim = char ([0, 10, 13, abs(";")]);
-  else
-    ## Make unique rdelim.
-    rdelim = char (sort (rdelim(:)));
-    tmp = [1; 1+find(diff(abs(rdelim))>0)];
-    rdelim = rdelim(tmp)';
-  endif
-
-  if (nargin < 4)
-    ddelim = ".";
-  elseif (length (ddelim) != 1)
-    error ("decimal delimiter must be exactly one character");
-  endif
-
-  ## Check if RDELIM and CDELIM are distinct.
-
-  delim = sort (abs ([cdelim, rdelim, ddelim]));
-  tmp   = [1, 1+find(diff(delim)>0)];
-  delim = delim(tmp);
-  ## [length(delim),length(cdelim),length(rdelim)]
-  if (length (delim) < (length(cdelim) + length(rdelim))+1)
-    ## length (ddelim) must be one.
-    error ("row, column and decimal delimiter are not distinct");
-  endif
-
-  ## Check if delimiters are valid.
-  tmp  = sort (abs ([cdelim, rdelim]));
-  flag = zeros (size (tmp));
-  curr_row = 1;
-  curr_col = 1;
-  while (curr_row <= length (tmp) && curr_col <= length (valid_delim)),
-    if (tmp(curr_row) == valid_delim(curr_col))
-      flag(curr_row) = 1;
-      curr_row++;
-    elseif (tmp(curr_row) < valid_delim(curr_col))
-      curr_row++;
-    elseif (tmp(curr_row) > valid_delim(curr_col))
-      curr_col++;
-    endif
-  endwhile
-  if (! all (flag))
-    error ("invalid delimiters!");
-  endif
-
-  ## Various input parameters.
-
-  if (isnumeric (s))
-    if (all (s < 256) && all (s >= 0))
-      s = char (s);
-    else
-      error ("str2double: input variable must be a string");
-    endif
-  endif
-
-  if (isempty (s))
-    num = [];
-    status = 0;
-    return;
-  elseif (iscell (s))
-    strarray = s;
-  elseif (ischar (s) && all (size (s) > 1))
-    ## Char array transformed into a string.
-    for k = 1:size (s, 1)
-      tmp = find (! isspace (s(k,:)));
-      strarray{k,1} = s(k,min(tmp):max(tmp));
-    endfor
-  elseif (ischar (s)),
-    num = [];
-    status = 0;
-    strarray = {};
-    ## Add stop sign; makes sure last digit is not skipped.
-    s(end+1) = rdelim(1);
-    RD = zeros (size (s));
-    for k = 1:length (rdelim),
-      RD = RD | (s == rdelim(k));
-    endfor
-    CD = RD;
-    for k = 1:length (cdelim),
-      CD = CD | (s == cdelim(k));
-    endfor
-
-    curr_row = 1;
-    curr_col = 0;
-    curr_elt = 0;
-
-    sl = length (s);
-    ix = 1;
-    ## while (ix < sl) & any(abs(s(ix))==[rdelim,cdelim]),
-    while (ix < sl && CD(ix))
-      ix++;
-    endwhile
-    ta = ix;
-    te = [];
-    while (ix <= sl)
-      if (ix == sl)
-        te = sl;
-      endif
-      ## if any(abs(s(ix))==[cdelim(1),rdelim(1)]),
-      if (CD(ix))
-        te = ix - 1;
-      endif
-      if (! isempty (te))
-        curr_col++;
-        curr_elt++;
-        strarray{curr_row,curr_col} = s(ta:te);
-        ## strarray{curr_row,curr_col} = [ta,te];
-
-        flag = 0;
-        ## while any(abs(s(ix))==[cdelim(1),rdelim(1)]) & (ix < sl),
-        while (CD(ix) && ix < sl)
-          flag = flag | RD(ix);
-          ix++;
-        endwhile
-
-        if (flag)
-          curr_col = 0;
-          curr_row++;
-        endif
-        ta = ix;
-        te = [];
-      endif
-      ix++;
-    endwhile
-  else
-    error ("str2double: invalid input argument");
-  endif
-
-  [nr, nc]= size (strarray);
-  status = zeros (nr, nc);
-  num = repmat (NaN, nr, nc);
-
-  for curr_row = 1:nr
-    for curr_col = 1:nc
-      t = strarray{curr_row,curr_col};
-      if (length (t) == 0)
-	## Return error code.
-	status(curr_row,curr_col) = -1;
-	num(curr_row,curr_col) = NaN;
-      else
-	## Get mantisse.
-	g = 0;
-	v = 1;
-	if (t(1) == "-")
-	  v = -1;
-	  l = min (2, length(t));
-	elseif (t(1) == "+")
-	  l = min (2, length (t));
-	else
-	  l = 1;
-	endif
-
-	if (strcmpi (t(l:end), "inf"))
-	  num(curr_row,curr_col) = v*Inf;
-	elseif (strcmpi (t(l:end), "NaN"));
-	  num(curr_row,curr_col) = NaN;
-	else
-	  if (ddelim == ".")
-	    t(t == ddelim) = ".";
-	  endif
-	  [v, tmp2, c] = sscanf(char(t), "%f %s", "C");
-	  ## [v,c,em,ni] = sscanf(char(t),"%f %s");
-	  ## c = c * (ni>length(t));
-	  if (c == 1),
-	    num(curr_row,curr_col) = v;
-	  else
-	    num(curr_row,curr_col) = NaN;
-	    status(curr_row,curr_col) = -1;
-	  endif
-	endif
-      endif
-    endfor
-  endfor
-
-endfunction
-
-%!error <Invalid call to str2double> str2double();
-%!error <Invalid call to str2double> str2double("1e10", " ", "\n", ".", "x");
-%!assert (str2double ("-.1e-5"), -1.0000e-006);
-%!assert (str2double (".314e1, 44.44e-1, .7; -1e+1"),
-%!  [3.1400, 4.4440, 0.7000; -10.0000, NaN, NaN]);
-%!test
-%!  line = "200, 300, NaN, -inf, yes, no, 999, maybe, NaN";
-%!  [x, status] = str2double (line);
-%!  assert (x, [200, 300, NaN, -Inf, NaN, NaN, 999, NaN, NaN]);
-%!  assert (status, [0, 0, 0, 0, -1, -1, 0, -1, 0]);
--- a/src/ChangeLog	Thu Feb 25 08:21:35 2010 +0100
+++ b/src/ChangeLog	Wed Feb 24 21:42:22 2010 +0100
@@ -1,3 +1,7 @@
+2010-02-25  Jaroslav Hajek  <highegg@gmail.com>
+
+	* DLD-FUNCTIONS/str2double.cc: New source.
+
 2010-02-19  John W. Eaton  <jwe@octave.org>
 
 	* DLD-FUNCTIONS/qr.cc: Increase tolerance for test.
--- a/src/DLD-FUNCTIONS/module-files	Thu Feb 25 08:21:35 2010 +0100
+++ b/src/DLD-FUNCTIONS/module-files	Wed Feb 24 21:42:22 2010 +0100
@@ -66,6 +66,7 @@
 spparms.cc
 sqrtm.cc
 strfind.cc
+str2double.cc
 sub2ind.cc
 svd.cc
 syl.cc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/DLD-FUNCTIONS/str2double.cc	Wed Feb 24 21:42:22 2010 +0100
@@ -0,0 +1,212 @@
+/*
+
+Copyright (C) 2010 Jaroslav Hajek
+Copyright (C) 2010 VZLU Prague
+
+This file is part of Octave.
+
+Octave is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 3 of the License, or (at your
+option) any later version.
+
+Octave is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Octave; see the file COPYING.  If not, see
+<http://www.gnu.org/licenses/>.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string>
+#include <cctype>
+#include <sstream>
+#include <algorithm>
+
+#include "lo-ieee.h"
+
+#include "Cell.h"
+#include "ov.h"
+#include "defun-dld.h"
+#include "gripes.h"
+#include "utils.h"
+
+static inline bool 
+is_imag_unit (int c)
+{ return c == 'i' || c == 'j' || c == 'I' || c == 'J'; }
+
+static std::istringstream&
+extract_num (std::istringstream& is, double& num, bool& imag, bool& have_sign)
+{
+  if (is.eof ())
+    return is;
+  have_sign = imag = false;
+
+  char c = is.peek ();
+  bool negative = false;
+
+  // Accept leading sign.
+  if (c == '+' || c == '-')
+    {
+      negative = c == '-';
+      is.get ();
+      c = is.peek ();
+      have_sign = true;
+    }
+
+  if (is_imag_unit (c))
+    {
+      is.get ();
+      // It's i*num or just i.
+      imag = true;
+      if (is.peek () == '*')
+        {
+          // Multiplier follows, we extract it as a number.
+          is.get ();
+          is >> num;
+        }
+      else
+        num = 1.0;
+    }
+  else
+    {
+      is >> num;
+      if (is.good ())
+        {
+          c = is.peek ();
+          if (c == '*')
+            {
+              is.get ();
+              c = is.get ();
+              if (is_imag_unit (c))
+                imag = true;
+              else
+                is.setstate (std::ios::failbit); // indicate that read has failed.
+            }
+          else if (is_imag_unit (c))
+            imag = true;
+        }
+    }
+
+  if (negative)
+    num = -num;
+
+  return is;
+}
+
+static Complex
+str2double1 (std::string str)
+{
+  Complex val (0.0, 0.0);
+  std::string::iterator se = str.end ();
+  // Remove commas (thousand separators) and spaces.
+  se = std::remove (str.begin (), se, ',');
+  se = std::remove (str.begin (), se, ' ');
+  str.erase (se, str.end ());
+
+  std::istringstream is (str);
+  double num;
+  bool i1, i2, s1, s2;
+
+  if (! extract_num (is, num, i1, s1))
+    val = octave_NaN;
+  else
+    {
+      if (i1)
+        val.imag () = num;
+      else
+        val.real () = num;
+
+      if (! is.eof ())
+        {
+          if (! extract_num (is, num, i2, s2) || i1 == i2 || ! s2)
+            val = octave_NaN;
+          else
+            {
+              if (i2)
+                val.imag () = num;
+              else
+                val.real () = num;
+            }
+        }
+    }
+
+  return val;
+}
+
+DEFUN_DLD (str2double, args, ,
+  "-*- texinfo -*-\n\
+@deftypefn {Built-in Function} {} str2double (@var{s})\n\
+Converts a string to real or complex number.\n\
+A complex number should be in one of the formats:\n\
+\n\
+@itemize\n\
+@item  a + bi\n\
+@item  a + b*i\n\
+@item  a + i*b\n\
+@item  bi + a\n\
+@item  b*i + a\n\
+@item  i*b + a\n\
+@end itemize\n\
+\n\
+It is also possible to use @code{j} instead of @code{i}, or write just\n\
+@code{i} instead of @code{1*i}.\n\
+@code{a} and @code{b} should be real numbers\n\
+in a standard format.\n\
+@var{s} can also be a character matrix, in which case the conversion is repeated\n\
+for each row, or a cell array of strings, in which case each element is converted\n\
+and an array of the same dimensions is returned.\n\
+@end deftypefn")
+{
+  octave_value retval;
+
+  if (args.length () == 1)
+    {
+      if (args(0).is_string ())
+        {
+          if (args(0).rows () == 1 && args(0).ndims () == 2)
+            {
+              retval = str2double1 (args(0).string_value ());
+            }
+          else
+            {
+              const string_vector sv = args(0).all_strings ();
+              if (! error_state)
+                retval = sv.map<Complex> (str2double1);
+            }
+        }
+      else if (args(0).is_cellstr ())
+        {
+          Array<std::string> sa = args(0).cellstr_value ();
+          retval = sa.map<Complex> (str2double1);
+        }
+      else
+        gripe_wrong_type_arg ("str2double", args(0));
+    }
+  else
+    print_usage ();
+
+  return retval;
+}
+
+/*
+
+%!assert (str2double ("1"), 1)
+%!assert (str2double ("-.1e-5"), -1e-6)
+%!assert (str2double ("1,222.5"), 1222.5)
+%!assert (str2double ("i"), i)
+%!assert (str2double ("2 + j"), 2+j)
+%!assert (str2double ("i*2 + 3"), 3+2i)
+%!assert (str2double (".5*i + 3.5"), 3.5+0.5i)
+%!assert (str2double ("1e-3 + i*.25"), 1e-3 + i*.25)
+%!assert (str2double (["2 + j";"1.25e-3";"-05"]), [2+i; 1.25e-3; -05])
+%!assert (str2double ({"2 + j","1.25e-3","-05"}), [2+i, 1.25e-3, -05])
+
+*/