summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrupak2019-11-15 12:54:57 +0530
committerrupak2019-11-15 12:54:57 +0530
commit06d3027c99113c386336f723e3c601e2c129347a (patch)
tree2cc9ff1d9e3796722bb005a7ef670eda291137ea
parent0f2cba5eafdf09b6f969dbeb9ef4e5a8d833ac9c (diff)
downloadfossee-scilab-octave-toolbox-06d3027c99113c386336f723e3c601e2c129347a.tar.gz
fossee-scilab-octave-toolbox-06d3027c99113c386336f723e3c601e2c129347a.tar.bz2
fossee-scilab-octave-toolbox-06d3027c99113c386336f723e3c601e2c129347a.zip
added license info and cleaned for launch
-rw-r--r--jar/scilab_en_US_help.jarbin16530 -> 16530 bytes
-rw-r--r--macros/lib2
-rw-r--r--macros/octave_fun.binbin4411 -> 5099 bytes
-rw-r--r--macros/octave_fun.sci12
-rw-r--r--sci_gateway/cpp/sci_octave.cpp11
-rw-r--r--src/fun.cpp11
-rw-r--r--src/fun.h11
-rw-r--r--src/fun.obin4617248 -> 4617264 bytes
-rwxr-xr-xsrc/libfun.sobin2887768 -> 2887784 bytes
-rw-r--r--src/main.cpp11
-rwxr-xr-xsrc/testfunbin41008 -> 41008 bytes
-rw-r--r--tests/oct-setup.m4
-rw-r--r--tests/pulsedata_t.txt1
-rw-r--r--tests/pulsedata_x.txt1
-rw-r--r--tests/signal.sce119
-rw-r--r--tests/test-la.sce73
-rw-r--r--tests/test.sce175
-rw-r--r--thirdparty/linux/include/fun.h11
-rwxr-xr-xthirdparty/linux/lib/x64/libfun.sobin2887768 -> 2887784 bytes
19 files changed, 154 insertions, 288 deletions
diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar
index c7db7b5..c0b1669 100644
--- a/jar/scilab_en_US_help.jar
+++ b/jar/scilab_en_US_help.jar
Binary files differ
diff --git a/macros/lib b/macros/lib
index 213db23..cb6a4f3 100644
--- a/macros/lib
+++ b/macros/lib
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<scilablib name="scilab_octavelib">
- <macro name="octave_fun" file="octave_fun.bin" md5="f6d4e5358236b998f4f2a59ddd85e8e7"/>
+ <macro name="octave_fun" file="octave_fun.bin" md5="6ad8fad09432830150f1556a9cf59451"/>
</scilablib>
diff --git a/macros/octave_fun.bin b/macros/octave_fun.bin
index f063b32..ae7dd13 100644
--- a/macros/octave_fun.bin
+++ b/macros/octave_fun.bin
Binary files differ
diff --git a/macros/octave_fun.sci b/macros/octave_fun.sci
index 60bd69f..da8b3ac 100644
--- a/macros/octave_fun.sci
+++ b/macros/octave_fun.sci
@@ -1,3 +1,15 @@
+// Copyright (C) 2019 - IIT Bombay - FOSSEE
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution. The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+// Author: Rupak Rokade
+// Organization: FOSSEE, IIT Bombay
+// Email: toolbox@scilab.in
+
+
function [y] = octave_fun()
// Calls an octave function with given inputs and returns the expected output
//
diff --git a/sci_gateway/cpp/sci_octave.cpp b/sci_gateway/cpp/sci_octave.cpp
index 44d1593..2ba43b5 100644
--- a/sci_gateway/cpp/sci_octave.cpp
+++ b/sci_gateway/cpp/sci_octave.cpp
@@ -1,3 +1,14 @@
+// Copyright (C) 2019 - IIT Bombay - FOSSEE
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution. The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+// Author: Rupak Rokade
+// Organization: FOSSEE, IIT Bombay
+// Email: toolbox@scilab.in
+
#include <string>
#include "wchar.h"
#include <cstdlib>
diff --git a/src/fun.cpp b/src/fun.cpp
index 31d5dc1..7e30688 100644
--- a/src/fun.cpp
+++ b/src/fun.cpp
@@ -1,3 +1,14 @@
+// Copyright (C) 2019 - IIT Bombay - FOSSEE
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution. The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+// Author: Rupak Rokade
+// Organization: FOSSEE, IIT Bombay
+// Email: toolbox@scilab.in
+
#include <iostream>
#include <stdlib.h>
#include <octave/oct.h>
diff --git a/src/fun.h b/src/fun.h
index ac0c166..e5e1fff 100644
--- a/src/fun.h
+++ b/src/fun.h
@@ -1,3 +1,14 @@
+// Copyright (C) 2019 - IIT Bombay - FOSSEE
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution. The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+// Author: Rupak Rokade
+// Organization: FOSSEE, IIT Bombay
+// Email: toolbox@scilab.in
+
#define fun_h__
//extern "C" int fun (double* answ, double* in1, int in1_row, std::string name, std::string opt);
diff --git a/src/fun.o b/src/fun.o
index b939504..63f1c8f 100644
--- a/src/fun.o
+++ b/src/fun.o
Binary files differ
diff --git a/src/libfun.so b/src/libfun.so
index 81fa71f..ab56601 100755
--- a/src/libfun.so
+++ b/src/libfun.so
Binary files differ
diff --git a/src/main.cpp b/src/main.cpp
index 36be819..d791462 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,3 +1,14 @@
+// Copyright (C) 2019 - IIT Bombay - FOSSEE
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution. The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+// Author: Rupak Rokade
+// Organization: FOSSEE, IIT Bombay
+// Email: toolbox@scilab.in
+
#include<iostream>
#include <stdlib.h>
#include <string.h>
diff --git a/src/testfun b/src/testfun
index 631bb20..f64961d 100755
--- a/src/testfun
+++ b/src/testfun
Binary files differ
diff --git a/tests/oct-setup.m b/tests/oct-setup.m
deleted file mode 100644
index 22b1e73..0000000
--- a/tests/oct-setup.m
+++ /dev/null
@@ -1,4 +0,0 @@
-pkg install -forge control
-pkg install -forge signal
-
-
diff --git a/tests/pulsedata_t.txt b/tests/pulsedata_t.txt
deleted file mode 100644
index cc9dcc6..0000000
--- a/tests/pulsedata_t.txt
+++ /dev/null
@@ -1 +0,0 @@
-0.000000 0.025000 0.050000 0.075000 0.100000 0.125000 0.150000 0.175000 0.200000 0.225000 0.250000 0.275000 0.300000 0.325000 0.350000 0.375000 0.400000 0.425000 0.450000 0.475000 0.500000 0.525000 0.550000 0.575000 0.600000 0.625000 0.650000 0.675000 0.700000 0.725000 0.750000 0.775000 0.800000 0.825000
diff --git a/tests/pulsedata_x.txt b/tests/pulsedata_x.txt
deleted file mode 100644
index 800ef63..0000000
--- a/tests/pulsedata_x.txt
+++ /dev/null
@@ -1 +0,0 @@
-0.000000 0.010800 0.036700 -0.045200 0.017200 0.006400 -0.026200 -0.008700 0.006900 0.071600 0.055400 -0.027000 0.060700 5.014500 4.998700 5.014300 4.995900 4.997500 5.029800 0.028200 0.028300 0.013400 -0.024100 0.014300 0.032600 0.009800 0.020700 0.014500 -0.006100 0.005900 -0.015700 0.017800 -0.022900 4.978600
diff --git a/tests/signal.sce b/tests/signal.sce
deleted file mode 100644
index c1e3786..0000000
--- a/tests/signal.sce
+++ /dev/null
@@ -1,119 +0,0 @@
-disp("Testing arburg function from signal package")
-a = octave_fun("arburg","signal", [1,2,3,4,5],2)
-pause
-
-
-disp("Testing aryule function from signal package")
-a = octave_fun("aryule","signal", [1,2,3,4,5],2)
-pause
-
-
-disp("Testing filter function from signal package")
-a = [1 0.1 -0.8];
-v = 0.4;
-rand("seed", 0);
-w = sqrt(v)*rand(15000,1);
-x=octave_fun("filter","signal",1,a,w);
-pause
-
-disp("Testing xcorr function from signal package")
-r=octave_fun("xcorr","signal",x);
-pause
-
-disp("Testing levinson function from signal package")
-ar=octave_fun("levinson","signal",r,length(a)-1)
-pause
-
-disp("Testing sigmoid_train function from signal package")
-s = octave_fun("sigmoid_train",0.1,[1:3],[4])
-pause
-
-
-disp("Testing circshift function from signal package")
- M = [1 2 3 4];
- R = octave_fun("circshift",M,[0 1])
-pause
-
-
-disp("Testing kaiser function from signal package")
-win = octave_fun("kaiser",6,[0.2])
-pause
-
-
-
-disp("Testing autoreg_matrix function from signal package")
-m = octave_fun("autoreg_matrix",[1 2 3],[2])
-pause
-
-
-disp("Testing arch_rnd function from signal package")
-a = [1 2 3 4 5];
-b = [7 8 9 10];
-t = 5 ;
-rand("seed", 0)
-m = octave_fun("arch_rnd",a,b,t)
-pause
-
-
-disp("Testing postpad function from signal package")
-y = octave_fun("postpad",[1 2 3],6)
-pause
-
-
-disp("Testing wconv function from signal package")
-a = [1 2 3 4 5];
-b = [7 8 9 10];
-y = octave_fun("wconv",[1],a,b)
-pause
-
-
-disp("Testing dctmtx function from signal package")
-T = octave_fun("dctmtx",[3])
-pause
-
-
-disp("Testing medfilt1 function from signal package")
-
-fs = 100;
-t = 0:1/fs:1;
-x = sin(2*%pi*t*3)+0.25*sin(2*%pi*t*40);
-
-y = octave_fun("medfilt1","signal",x,10);
-pause
-
-
-disp("Testing arma_rnd function from signal package")
-
-a = [1 2 3 4 5];
-b = [7; 8; 9; 10; 11];
-t = 5 ;
-v = 10 ;
-n = 100 ;
-rand("seed", 0)
-m = octave_fun("arma_rnd","signal",a, b, v, t, n)
-pause
-
-
-disp("Testing ncauer function from signal package")
-[z p g] = octave_fun("ncauer","signal",3, 10, 4)
-pause
-
-
-disp("Testing ellipap function from signal package")
-[z p g] = octave_fun("ellipap","signal",4, 3, 10)
-pause
-
-
-disp("Testing besselap function from signal package")
-[z p g] = octave_fun("besselap","signal",5)
-pause
-
-
-disp("Testing zp2tf function from signal package")
-[num, den] = octave_fun("zp2tf","signal",[1 2 3], [4 5 6], 5)
-pause
-
-disp("Testing tf2zp function from signal package")
-[z p k] = octave_fun("tf2zp","signal",[1 2 3], [4 5 6]);
-pause
-
diff --git a/tests/test-la.sce b/tests/test-la.sce
deleted file mode 100644
index b6f37ad..0000000
--- a/tests/test-la.sce
+++ /dev/null
@@ -1,73 +0,0 @@
-test_pass=[]
-res=[]
-
-test1=0
-
-/////////Test case for cartprod //////////
-
-A = [-1 -3 -5];
-B = [10 11];
-C = [0 1];
-y = octave_fun("cartprod","linear-algebra",A,B,C)
-
-anss = [-1. 10. 0.;
- -3. 10. 0.;
- -5. 10. 0.;
- -1. 11. 0.;
- -3. 11. 0.;
- -5. 11. 0.;
- -1. 10. 1.;
- -3. 10. 1.;
- -5. 10. 1.;
- -1. 11. 1.;
- -3. 11. 1.;
- -5. 11. 1.];
-
-if(y==anss)
- test_pass=[test_pass,1]
-else
- test_pass=[test_pass,0]
- disp("cartprod Test failed")
-end
-
-/////////////////////////////////////////////
-/////////Test case for funm //////////
-
-a = octave_fun("magic",3);
-y = octave_fun("funm","linear-algebra",a,"sin");
-
-anss = [-0.3849805 1.0190868 0.0161816; 0.6179247 0.2167626 -0.1843995; 0.4173437 -0.5855616 0.8185058];
-
-if(round((y*10000)/1000)==round((anss*10000)/1000))
- test_pass=[test_pass,1]
-else
- test_pass=[test_pass,0]
- disp("funm Test failed")
-end
-
-/////////////////////////////////////////////
-/////////Test case for circulant_inv //////////
-
-y = octave_fun("circulant_inv","linear-algebra",[2 3 5]);
-
-anss = [3,1];
-
-if(anss==size(y))
- test_pass=[test_pass,1]
-else
- test_pass=[test_pass,0]
- disp("funm Test failed")
-end
-
-/////////////////////////////////////////////
-res=find(test_pass==0)
-
-if(res~=[])
- disp("One or more tests failed in test1")
- disp(length(test_pass),"Total functions tested:")
- //exit(1)
-else
-disp(length(test_pass),"Total functions tested:")
-disp("ALL OK")
-//exit()
-end
diff --git a/tests/test.sce b/tests/test.sce
index f81e238..e53eed3 100644
--- a/tests/test.sce
+++ b/tests/test.sce
@@ -7,24 +7,24 @@ test1=0
/////////Test case for 2) arburg //////////
a = octave_fun("arburg","signal", [1,2,3,4,5],2);
-a = round(a*10000)/10000;
+a = floor(abs(a*1000));
-if(a == [1. -1.8639 0.9571])
- test_pass=[test_pass,1]
+if(a==[1000 1863 957])
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("arburg test failed")
end
/////////Test case for 4) aryule //////////
a = octave_fun("aryule","signal", [1,2,3,4,5],2);
-a = round(a*10000)/10000;
+a = floor(abs(a*1000));
-if(a == [1. -0.814 0.1193])
- test_pass=[test_pass,1]
+if(a==[1000 814 119])
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("aryule test failed")
end
@@ -43,21 +43,20 @@ ar=octave_fun("levinson","signal",r,length(a)-1);
ar = round(ar*10000)/10000;
if(ar ~= 0)
- test_pass=[test_pass,1]
- else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,1];
+else
+ test_pass=[test_pass,0];
disp("levinson Test failed")
end
/////////Test case for **)sigmoid_train //////////
-s = octave_fun("sigmoid_train",0.1,[1:3],[4]);
-s = round(s*10000)/10000
-
-if(s == 0.2737)
- test_pass=[test_pass,1]
+s = octave_fun("sigmoid_train",0.1,[1:3],[4])
+s=floor(abs(s*1000))
+if(s==273)
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("sigmoid_train Test failed")
end
@@ -67,22 +66,21 @@ end
R = octave_fun("circshift",M,[0 1]);
if(R == [4 1 2 3])
- test_pass=[test_pass,1]
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("circshift failed")
end
/////////////////////////////////////////////
/////////Test case for **)kaiser //////////
-win = octave_fun("kaiser",6,[0.2]) ;
-win = round(win*10000)/10000;
-
-if(win == [ 0.9901; 0.9964; 0.9996; 0.9996; 0.9964; 0.9901 ])
- test_pass=[test_pass,1]
+a = octave_fun("kaiser",6,[0.2])
+a = floor(abs(a*1000))
+if(a==[990; 996; 999; 999; 996; 990])
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("kaiser Test failed")
end
@@ -95,9 +93,9 @@ end
m = octave_fun("autoreg_matrix",[1 2 3],[2]);
if(m == [1 0 0; 1 1 0; 1 2 1])
- test_pass=[test_pass,1]
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("autoreg_matrix test failed")
end
@@ -109,12 +107,12 @@ b = [7 8 9 10];
t = 5 ;
rand("seed", 0)
m = octave_fun("arch_rnd",a,b,t);
-m = round(m*1000)/1000
+m = round(m*1000)/1000;
if(m ~=0 )
- test_pass=[test_pass,1]
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("arch_rnd Test failed")
end
@@ -125,9 +123,9 @@ end
y = octave_fun("postpad",[1 2 3],6);
if(y == [1 2 3 0 0 0 ] )
- test_pass=[test_pass,1]
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("postpad Test failed")
end
@@ -145,8 +143,9 @@ else
end
/////////Test case for dctmtx //////////
T = octave_fun("dctmtx",[3]);
-T = round(T*10000)/10000;
-if(T == [0.5774 0.5774 0.5774; 0.7071 0 -0.7071; 0.4082 -0.8165 0.4082])
+T = floor(abs(T*1000))
+
+if(T == [577 577 577; 707 0 707; 408 816 408])
test_pass=[test_pass,1]
else
test_pass=[test_pass,0]
@@ -162,7 +161,7 @@ x = sin(2*%pi*t*3)+0.25*sin(2*%pi*t*40);
y = octave_fun("medfilt1","signal",x,10);
y = round(y*10000)/10000 ;
-y = y'
+y = y';
if(length(y) ~= 0)
test_pass=[test_pass,1]
@@ -179,49 +178,49 @@ b = [7; 8; 9; 10; 11];
t = 5 ;
v = 10 ;
n = 100 ;
-rand("seed", 0)
+rand("seed", 0);
m = octave_fun("arma_rnd","signal",a, b, v, t, n);
-m = round(m) ;
+m = round(m);
if(m ~= 0)
- test_pass=[test_pass,1]
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("arma_rnd Test failed")
end
/////////Test case for ncauer //////////
[z p g] = octave_fun("ncauer","signal",3, 10, 4);
-g = round(g*10000)/10000;
+g = floor(abs(g*1000));
-if(g == 0.32400)
- test_pass=[test_pass,1]
+if(g == 324)
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("ncauer Test failed")
end
-/////////Test case for ellipap //////////
+/////////Test case for ellipap //////////
[z p g] = octave_fun("ellipap","signal",4, 3, 10);
-g = round(g*10000)/10000;
+g = floor(abs(g*1000));
-if(g == 0.324)
- test_pass=[test_pass,1]
+if(g == 324)
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("ellipap Test failed")
end
-
+////////Test case for besselap ///////////////
[z p g] = octave_fun("besselap","signal",5);
g = round(g*10000)/10000;
p = round(p*10000)/10000;
if(g == 1)
- test_pass=[test_pass,1]
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("besselap Test failed")
end
@@ -232,23 +231,21 @@ num = round(num*10000)/10000;
den = round(den*10000)/10000;
if(num == [5 -30 55 -30] & den == [1. -15. 74. -120])
- test_pass=[test_pass,1]
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("zp2tf Test failed")
end
/////////Test case for tf2zp //////////
[z p k] = octave_fun("tf2zp","signal",[1 2 3], [4 5 6]);
-k = round(k*10000)/10000;
-p = round(p*10000)/10000;
-z = round(z*10000)/10000;
+k = floor(abs(k*1000));
-if(k == 0.25)
- test_pass=[test_pass,1]
+if(k == 250)
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("tf2zp Test failed")
end
@@ -259,21 +256,21 @@ n = 5 ;
g = round(g*10000)/10000;
if(g == 1)
- test_pass=[test_pass,1]
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("buttap Test failed")
end
/////////Test case for cheb1ap //////////
[z p g] = octave_fun("cheb1ap", 10, 3);
-g = round(g*10000)/10000;
+g = floor(abs(g*1000));
-if(g == 0.002)
- test_pass=[test_pass,1]
+if(g == 1)
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("cheb1ap Test failed")
end
@@ -299,56 +296,56 @@ a = round(a*10000)/10000;
if(round(a) == [1 7 18 14])
- test_pass=[test_pass,1]
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("bilinear Test failed")
end
/////////Test case for buttord //////////
[n, Wn] = octave_fun("buttord",40/500, 150/500, 3, 60);
-Wn = round(Wn*10000)/10000;
+Wn = floor(abs(Wn*1000));
-if(n == 5 & Wn == 0.08)
- test_pass=[test_pass,1]
+if(n == 5 & Wn == 80)
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("buttord Test failed")
end
/////////Test case for butter //////////
-[b a] = octave_fun("butter","signal",4,0.3,"high")
-b = round(b*10000)/10000;
-a = round(a*10000)/10000;
+[b a] = octave_fun("butter","signal",4,0.3,"high");
+b = floor(abs(b*1000));
+a = floor(abs(a*1000));
-if(b == [0.2754 -1.1017 1.6525 -1.1017 0.2754] & a == [1 -1.5704 1.2756 -0.4844 0.0762])
- test_pass=[test_pass,1]
+if(b == [275 1101 1652 1101 275] & a == [1000 1570 1275 484 76])
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("butter Test failed")
end
/////////Test case for cheb1ord //////////
-[n, Wn]=octave_fun("cheb1ord","signal",[0.25 0.3],[0.24 0.31],3,10)
-Wn = round(Wn*10000)/10000;
+[n, Wn]=octave_fun("cheb1ord","signal",[0.25 0.3],[0.24 0.31],3,10);
+Wn = floor(abs(Wn*1000));
-if(n == 3 & Wn == [0.25 0.3])
- test_pass=[test_pass,1]
+if(n == 3 & Wn == [250 300])
+ test_pass=[test_pass,1];
else
- test_pass=[test_pass,0]
+ test_pass=[test_pass,0];
disp("cheb1ord Test failed")
end
/////////Test case for cheby1 //////////
-[z, p, k]=octave_fun("cheby1","signal",2,6,0.7,"high")// Note it shld return k as well
-z = round(z*10000)/10000;
-p = round(p*10000)/10000;
-k = round(k*10000)/10000;
+[z, p, k]=octave_fun("cheby1","signal",2,6,0.7,"high");// Note it shld return k as well
+z = floor(abs(z*1000));
+p = floor(abs(real(p)*1000));
+k = floor(abs(k*1000));
-if(z == [1;1] & real(p) == [-0.6292; -0.6292] & k == 0.0556)
- test_pass=[test_pass,1]
+if(z == [1000;1000] & real(p) == [629;629] & k == 55)
+ test_pass=[test_pass,1];
else
test_pass=[test_pass,0];
disp("cheby1 Test failed")
@@ -360,7 +357,7 @@ Wp = 40/500;
Ws = 150/500;
Rp = 3;
Rs = 60;
-[n,Ws] = octave_fun("cheb2ord",Wp,Ws,Rp,Rs)
+[n,Ws] = octave_fun("cheb2ord",Wp,Ws,Rp,Rs);
Ws = round((Ws*10000)/1000);
if(n == 4 & Ws == 3)
diff --git a/thirdparty/linux/include/fun.h b/thirdparty/linux/include/fun.h
index ac0c166..e5e1fff 100644
--- a/thirdparty/linux/include/fun.h
+++ b/thirdparty/linux/include/fun.h
@@ -1,3 +1,14 @@
+// Copyright (C) 2019 - IIT Bombay - FOSSEE
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution. The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+// Author: Rupak Rokade
+// Organization: FOSSEE, IIT Bombay
+// Email: toolbox@scilab.in
+
#define fun_h__
//extern "C" int fun (double* answ, double* in1, int in1_row, std::string name, std::string opt);
diff --git a/thirdparty/linux/lib/x64/libfun.so b/thirdparty/linux/lib/x64/libfun.so
index 81fa71f..ab56601 100755
--- a/thirdparty/linux/lib/x64/libfun.so
+++ b/thirdparty/linux/lib/x64/libfun.so
Binary files differ