From ffed8ae73e782a7d7d7d37b0e40537b1cc5796f0 Mon Sep 17 00:00:00 2001
From: Sunil Shetye
Date: Fri, 27 Jul 2018 10:34:20 +0530
Subject: Remove dependency on FOSSEE_Scilab_Octave_Interface_Toolbox

---
 demos/demo.sce       |  1 -
 macros/peig.sci      |  3 ---
 macros/pmusic.sci    |  3 ---
 macros/prepad.sci    |  2 +-
 macros/rooteig.sci   |  2 +-
 macros/rootmusic.sci |  4 ----
 test1.sce            |  8 +-------
 test2.sce            |  7 ++-----
 test3.sce            | 10 ++--------
 9 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/demos/demo.sce b/demos/demo.sce
index e27e154..1e1d81f 100644
--- a/demos/demo.sce
+++ b/demos/demo.sce
@@ -1,6 +1,5 @@
 //Example taken from https://in.mathworks.com/help/signal/examples/dft-estimation-with-the-goertzel-algorithm.html
 //DFT Estimation with the Goertzel Algorithm
-cd /home/fossee/Desktop/FOSSEE_Scilab_Octave_Interface_Toolbox
 
 warning('off');
 clc;
diff --git a/macros/peig.sci b/macros/peig.sci
index b4157d7..ab8bf00 100644
--- a/macros/peig.sci
+++ b/macros/peig.sci
@@ -84,9 +84,6 @@ function [S,f,v,e] = peig(varargin)
 
     funcprot(0);
 
-    //exec('/home/shashi/Desktop/FOSSEE-Signal-Processing-Toolbox-master/macros/subspaceMethodsInputParser.sci',-1);
-   // exec('/home/shashi/Desktop/FOSSEE-Signal-Processing-Toolbox-master/macros/musicBase.sci',-1);
-
     [data, msg, err_num] = subspaceMethodsInputPars(varargin);
 
     if length(msg)==0 then
diff --git a/macros/pmusic.sci b/macros/pmusic.sci
index 7cc788a..986138a 100644
--- a/macros/pmusic.sci
+++ b/macros/pmusic.sci
@@ -85,9 +85,6 @@ function varargout = pmusic(varargin)
 
     funcprot(0);
 
-    //exec /home/shashi/Desktop/FOSSEE-Signal-Processing-Toolbox-master/macros/subspaceMethodsInputParser.sci
-    //exec('/home/shashi/Desktop/FOSSEE-Signal-Processing-Toolbox-master/macros/musicBase.sci',-1);
-
     [numOutArgs,numInArgs] = argn(0);
 
     // check number of output arguments
diff --git a/macros/prepad.sci b/macros/prepad.sci
index ccbbddd..52d9746 100644
--- a/macros/prepad.sci
+++ b/macros/prepad.sci
@@ -50,7 +50,7 @@ function y = prepad (x, l, c, dim)
   sz = size (x);
   if (argn(2) < 4)
     // Find the first non-singleton dimension.
-    (dim == find (sz > 1, 1)) | (dim == 1);
+    dim = find (sz > 1, 1)
   else
     if (~(isscalar (dim) & dim == fix (dim) & dim >= 1))
       error ("prepad: DIM must be an integer and a valid dimension");
diff --git a/macros/rooteig.sci b/macros/rooteig.sci
index 1b3196e..4acd2e4 100644
--- a/macros/rooteig.sci
+++ b/macros/rooteig.sci
@@ -48,7 +48,7 @@ function [w,pow] = rooteig(x,p,varargin)
     //
 //    n=0:99;
 //     s=exp(1*%i*%pi/2*n)+2*exp(1*%i*%pi/4*n)+exp(1*%i*%pi/3*n)+rand(1,100,"normal");
-//  exec('/home/shashi/Downloads/FOSSEE-Signal-Processing-Toolbox-master/macros/corrmtx.sci',-1);//EXECUTE CORRMTX FUNCTION PRIOR EXECUTING THIS FUNCTION
+//EXECUTE CORRMTX FUNCTION PRIOR EXECUTING THIS FUNCTION
 // X = corrmtx(s,12,'mod');
 // [W,P] = rooteig(X,3);
 //
diff --git a/macros/rootmusic.sci b/macros/rootmusic.sci
index 0efe89f..77c582f 100644
--- a/macros/rootmusic.sci
+++ b/macros/rootmusic.sci
@@ -73,10 +73,6 @@ function [w,pow] = rootmusic(x,p,varargin)
 
     funcprot(0);
 
-    //exec('/home/shashi/Desktop/FOSSEE-Signal-Processing-Toolbox-master/macros/musicBase.sci',-1);
-    //exec('/home/shashi/Desktop/FOSSEE-Signal-Processing-Toolbox-master/macros/nnls.sci',-1);
-
-
     // **** checking the number of input and output arguments ****
 
     [numOutArgs, numInArgs] = argn(0);
diff --git a/test1.sce b/test1.sce
index a15ae82..a897d3c 100644
--- a/test1.sce
+++ b/test1.sce
@@ -1,11 +1,5 @@
-//exec FOSSEE_Scilab_Octave_Interface_Toolbox/loader.sce
-
 exec loader.sce
 exec builder.sce
-exec unloader.sce
-exec loader.sce
-//cd macros
-//getd .
 
 test_pass=[]
 res=[]
@@ -725,7 +719,7 @@ res=find(test_pass==0)
 
 if(res~=[])
     disp("One or more tests failed")
-    //exit(1)
+    exit(1)
 else
     disp("All test cases passed")
     exit
diff --git a/test2.sce b/test2.sce
index 0e27f67..e9c3d4c 100644
--- a/test2.sce
+++ b/test2.sce
@@ -1,8 +1,5 @@
-//exec ("/home/kartikhegde/Downloads/FOSSEE_Scilab_Octave_Interface_Toolbox/loader.sce")
-exec("loader.sce")
-exec("builder.sce")
-exec("unloader.sce")
-exec("loader.sce")
+exec loader.sce
+exec builder.sce
 
 test_pass=[]
 res=[]
diff --git a/test3.sce b/test3.sce
index c3195d5..5b349e2 100644
--- a/test3.sce
+++ b/test3.sce
@@ -1,11 +1,5 @@
-//exec FOSSEE_Scilab_Octave_Interface_Toolbox/loader.sce
-//exec("/home/shashi/Desktop/FOSSEE_Scilab_Octave_Interface_Toolbox/loader.sce")
-//getd macros/
-exec("loader.sce")
-exec("builder.sce")
-
-
-
+exec loader.sce
+exec builder.sce
 
 test_pass=[]
 res=[]
-- 
cgit