1 files changed, 54 insertions, 44 deletions
diff --git a/macros/zp2tf.sci b/macros/zp2tf.sci
index c830e3d..da3e8b1 100644
--- a/macros/zp2tf.sci
+++ b/macros/zp2tf.sci
@@ -1,46 +1,56 @@
-function [num, den] = zp2tf (z, p, k)
-//Converts zeros / poles to a transfer function.
-//Calling Sequence
-//[num, den] = zp2tf (z, p, k)
-//num = zp2tf (z, p, k)
-//Parameters 
-//z: Zeros
-//p: Poles
-//k: Leading coefficient
-//Num: Numerator of the transfer function
-//den: Denomenator of the transfer function
-//Description
-//This is an Octave function.
-//It converts zeros / poles to a transfer function.
-//Examples
-//z = [1 2 3]
-// p = [4 5 6]
-//k = 5
-//[num, den] = zp2tf (z, p, k)
-//num =
-//
-//    5  -30   55  -30
-//
-//den =
+// Copyright (C) 2018 - IIT Bombay - FOSSEE
 //
-//     1   -15    74  -120
-
-funcprot(0);
-lhs = argn(1)
-rhs = argn(2)
-if (rhs < 3 | rhs > 3)
-error("Wrong number of input arguments.")
-end
-
-select(rhs)
-	
-	case 3 then
-		if(lhs==1)
-		num = callOctave("zp2tf", z, p, k)
-		elseif(lhs==2)
-		[num, den] = callOctave("zp2tf", z, p, k)
-		else
-		error("Wrong number of output argments.")
-		end
-	end
+// 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:Sonu Sharma, RGIT Mumbai
+// Organization: FOSSEE, IIT Bombay
+// Email: toolbox@scilab.in
+
+function [num, den] = zp2tf (z, p, k)
+    //Converts zeros / poles to a transfer function.
+
+    //Calling Sequence
+    //[num, den] = zp2tf (z, p, k)
+    //num = zp2tf (z, p, k)
+
+    //Parameters
+    //z: Zeros
+    //p: Poles
+    //k: Leading coefficient (Gain)
+    //Num: Numerator coefficients of the transfer function
+    //den: Denomenator coefficients of the transfer function
+
+    //Description
+    //It converts zeros / poles representation to  transfer function representation.
+
+    //Examples
+    //z = [1 2 3]
+    //p = [4 5 6]
+    //k = 5
+    //[num, den] = zp2tf (z, p, k)
+    //Output :
+    // den  =
+    //
+    //    1.  - 15.    74.  - 120.
+    // num  =
+    //
+    //    5.  - 30.    55.  - 30.
+
+    funcprot(0);
+    lhs = argn(1)
+    rhs = argn(2)
+    if (rhs < 3 | rhs > 3)
+        error("zp2tf : Wrong number of input arguments.")
+    end
+
+    n = k*real(poly(z,"x"));
+    d = real(poly(p, "x"));
+    num = coeff(n);
+    num = flipdim(num,2);
+    den = coeff(d);
+    den = flipdim(den,2);
+
 endfunction