Mercurial > octave-nkf

changeset 20608:32a0bf9906c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
linspace: remove use of error_state. * libinterp/corefcn/data.cc: current use of error_state is only useful for a nicer error message about N not being an integer. However, octave::idx_type_value() does not error for that, and even in that case, it must be cast to integer silently for Matlab compatibility.
author Carnë Draug <carandraug@octave.org>
date Thu, 08 Oct 2015 19:56:51 +0100
parents 734d446560a8
children 780431fc4137
files libinterp/corefcn/data.cc
diffstat 1 files changed, 24 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/data.cc	Wed Oct 07 21:01:25 2015 +0200
+++ b/libinterp/corefcn/data.cc	Thu Oct 08 19:56:51 2015 +0100
@@ -5233,39 +5233,35 @@
       else if (! arg_3.is_scalar_type ())
         error ("linspace: N must be a scalar");
       else
+        // Even if third arg is not an integer, it must be cast to int
         npoints = arg_3.idx_type_value ();
     }
 
-  if (! error_state)
+  octave_value arg_1 = args(0);
+  octave_value arg_2 = args(1);
+
+  dim_vector sz1 = arg_1.dims ();
+  bool isvector1 = sz1.length () == 2 && (sz1(0) == 1 || sz1(1) == 1);
+  dim_vector sz2 = arg_2.dims ();
+  bool isvector2 = sz2.length () == 2 && (sz2(0) == 1 || sz2(1) == 1);
+
+  if (! isvector1 || ! isvector2)
+    error ("linspace: A, B must be scalars or vectors");
+  else if (arg_1.is_single_type () || arg_2.is_single_type ())
     {
-      octave_value arg_1 = args(0);
-      octave_value arg_2 = args(1);
-
-      dim_vector sz1 = arg_1.dims ();
-      bool isvector1 = sz1.length () == 2 && (sz1(0) == 1 || sz1(1) == 1);
-      dim_vector sz2 = arg_2.dims ();
-      bool isvector2 = sz2.length () == 2 && (sz2(0) == 1 || sz2(1) == 1);
-
-      if (! isvector1 || ! isvector2)
-        error ("linspace: A, B must be scalars or vectors");
-      else if (arg_1.is_single_type () || arg_2.is_single_type ())
-        {
-          if (arg_1.is_complex_type () || arg_2.is_complex_type ())
-            retval = do_linspace<FloatComplexMatrix> (arg_1, arg_2, npoints);
-          else
-            retval = do_linspace<FloatMatrix> (arg_1, arg_2, npoints);
-
-        }
+      if (arg_1.is_complex_type () || arg_2.is_complex_type ())
+        retval = do_linspace<FloatComplexMatrix> (arg_1, arg_2, npoints);
       else
-        {
-          if (arg_1.is_complex_type () || arg_2.is_complex_type ())
-            retval = do_linspace<ComplexMatrix> (arg_1, arg_2, npoints);
-          else
-            retval = do_linspace<Matrix> (arg_1, arg_2, npoints);
-        }
+        retval = do_linspace<FloatMatrix> (arg_1, arg_2, npoints);
+
     }
   else
-    error ("linspace: N must be an integer");
+    {
+      if (arg_1.is_complex_type () || arg_2.is_complex_type ())
+        retval = do_linspace<ComplexMatrix> (arg_1, arg_2, npoints);
+      else
+        retval = do_linspace<Matrix> (arg_1, arg_2, npoints);
+    }
 
   return retval;
 }
@@ -5299,6 +5295,8 @@
 %!assert (linspace (10, 20, -1), zeros (1, 0))
 %!assert (numel (linspace (0, 1, 2+eps)), 2)
 %!assert (numel (linspace (0, 1, 2-eps)), 1)
+%!assert (linspace (10, 20, 2.1), [10 20])
+%!assert (linspace (10, 20, 2.9), [10 20])
 
 %!error linspace ()
 %!error linspace (1, 2, 3, 4)