* Bug 12862 fixed: intsplin(x,y) ignored imag(y)

[scilab.git] / scilab / modules / differential_equations / macros / intsplin.sci

diff --git a/scilab/modules/differential_equations/macros/intsplin.sci b/scilab/modules/differential_equations/macros/intsplin.sci
index 92756a3..8f8179d 100644 (file)
--- a/scilab/modules/differential_equations/macros/intsplin.sci
+++ b/scilab/modules/differential_equations/macros/intsplin.sci
@@ -1,5 +1,6 @@
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 // Copyright (C) INRIA
+// Copyright (C) 2017 - Samuel GOUGEON
 //
 // Copyright (C) 2012 - 2016 - Scilab Enterprises
 //
@@ -10,7 +11,7 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-function v = intsplin(x,s)
+function v = intsplin(x, s)
     //splin  numerical integration.
     //v = intsplin(x,s) computes the integral of y with respect to x using
     //splin interpolation and integration.
@@ -19,19 +20,32 @@ function v = intsplin(x,s)
     //v = intsplin(s) computes the integral of y assuming unit
     //spacing between the data points.
 
-    [lhs,rhs]=argn(0)
-    if rhs<2 then
-        s=x;
-        s=s(:);
-        d=splin((1:size(s,"*"))',s);
-        v=sum((d(1:$-1)-d(2:$))/12 + (s(1:$-1)+s(2:$))/2);
+    x = x(:);
+    if argn(2) < 2 then
+        s = x;
+        x = (1:size(s,"*"))';
     else
+        s = s(:);
         if size(x,"*")<>size(s,"*") then
-            error(msprintf(gettext("%s: Wrong size for input arguments: Same size expected.\n"),"intsplin"));
+            msg = _("%s: Wrong size for input arguments: Same size expected.\n")
+            error(msprintf(msg, "intsplin"));
         end
     end
-    x=x(:);s=s(:);
-    d=splin(x,s);
-    h=x(2:$)-x(1:$-1);
-    v=sum((h.*(d(1:$-1)-d(2:$))/12 + (s(1:$-1)+s(2:$))/2).*h);
+    if ~isreal(x) then
+        if isreal(x,%eps)
+            x = real(x);
+        else
+            msg = _("%s: Argument #%d: Real number(s) expected.\n");
+            error(msprintf(msg, "intsplin",1))
+        end
+    end
+    h = x(2:$) - x(1:$-1);
+    y = real(s);
+    d = splin(x, y);
+    v = sum((h.*(d(1:$-1)-d(2:$))/12 + (y(1:$-1)+y(2:$))/2).*h);
+    if ~isreal(s) then
+        y = imag(s);
+        d = splin(x, y);
+        v = v + %i*sum((h.*(d(1:$-1)-d(2:$))/12 + (y(1:$-1)+y(2:$))/2).*h);
+    end
 endfunction