12 files changed, 38 insertions, 65 deletions
diff --git a/2.3-1/macros/FunctionAnnotation/FA_FSFIRLIN_SZ.sci b/2.3-1/macros/FunctionAnnotation/FA_FSFIRLIN_SZ.sci
deleted file mode 100644
index c1dc9e50..00000000
--- a/2.3-1/macros/FunctionAnnotation/FA_FSFIRLIN_SZ.sci
+++ /dev/null
@@ -1,9 +0,0 @@
-function outp=FA_FSFIRLIN_SZ(in1sz2)
-    in1sz2=string(in1sz2);
-    in1sz=eval(in1sz2);
-    if(int(in1sz/2)==in1sz/2)  then
-        outp=string(4*in1sz+1);
-    else
-        outp=string(4*in1sz+3);
-    end
-endfunction
diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci
index 3fadd1f2..d11e3cee 100644
--- a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci
+++ b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci
@@ -52,7 +52,7 @@ FunSizeAnnot = '';
 // ---------------------------------------------
 // --- Open the .sci file (read only). ---
 inclsfid = SCI2COpenFileRead(SCI2CClassFileName);
-PrintStringInfo(' '+string(inclsfid),ReportFileName,'file','y');
+
 // #RNU_RES_B
 // --- Loop over the lines of the input file. ---
 // Position file pointer to the desired NInArg/NOutArg section,
@@ -212,6 +212,5 @@ mclose(inclsfid);
 // -------------------------------------------------
 // --- End Read the annotations of the function. ---
 // -------------------------------------------------
-PrintStringInfo('  end of annotation '+string(NOutArg_mod),ReportFileName,'file','y');
 
 endfunction
diff --git a/2.3-1/macros/FunctionAnnotation/FA_INSZ_RPI.sci b/2.3-1/macros/FunctionAnnotation/FA_INSZ_RPI.sci
deleted file mode 100644
index da924ce4..00000000
--- a/2.3-1/macros/FunctionAnnotation/FA_INSZ_RPI.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-function outp=FA_INSZ_RPI(in2val)
-    in2val=string(in2val);
-    l=length(in2val);
-    outp=l;
-endfunction
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_AMELL.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_AMELL.sci
deleted file mode 100644
index 6cf27b0d..00000000
--- a/2.3-1/macros/FunctionAnnotation/FA_SZ_AMELL.sci
+++ /dev/null
@@ -1,9 +0,0 @@
-function outp=FA_SZ_AMELL(in1sz)
-	in1sz=string(in1sz);
-	insz=eval(in1sz);
-	if(insz>1) then
-		outp=string(insz);
-	else
-		outp="1";
-	end
-endfunction
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FULLRF.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_FULLRF.sci
new file mode 100644
index 00000000..bc0eb6df
--- /dev/null
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_FULLRF.sci
@@ -0,0 +1,33 @@
+function opout = FA_SZ_FULLRF(in1)
+
+// function opout = FA_SZ_U_SVA(in1,in2)
+// -----------------------------------------------------------------
+// Determines the number of rows of the output arguments 
+// according to the second input argument.
+//
+// Input data:
+// in1: specifying a matrix or a symbol.
+// in2: string specifying a number or a symbol.
+//
+// Output data:
+// opout: string containing the computed size of U matrix.
+//
+// Copyright (C) 2017 - 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: Sandeep Gupta
+// Organization: FOSSEE, IIT Bombay
+// Email: toolbox@scilab.in
+//
+// -----------------------------------------------------------------
+in1 = string(in1)
+in1 = eval(in1)
+disp(in1)
+
+opout = 3;
+opout = string(opout);
+endfunction
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_MODSN.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_MODSN.sci
deleted file mode 100644
index 4a58e644..00000000
--- a/2.3-1/macros/FunctionAnnotation/FA_SZ_MODSN.sci
+++ /dev/null
@@ -1,11 +0,0 @@
-function outt=FA_SZ_MODSN(in1sz)
-
-in1sz=string(in1sz);
-in1s=eval(in1sz)
-if(in1s>1) then
-	outt=string(in1s);
-else
-	outt=string(1);
-end
-
-endfunction
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci
index 527217a5..50b897e0 100644
--- a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci
@@ -27,7 +27,7 @@ function outsize = FA_SZ_ROW_COLUMN_CAT(inval,in1size,in2size)
 // ------------------------------
 // --- Check input arguments. ---
 // ------------------------------
-SCI2CNInArgCheck(argn(2),3,3);
+SCI2CNInArgCheck(argn(1),3,3);
 
 
 in1size = string(in1size);
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_U_SVA.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_U_SVA.sci
index 3b8b25c5..695bef02 100644
--- a/2.3-1/macros/FunctionAnnotation/FA_SZ_U_SVA.sci
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_U_SVA.sci
@@ -26,8 +26,8 @@ function opout = FA_SZ_U_SVA(in1,in2)
 // -----------------------------------------------------------------
 
 //in1 = string(in1);
-// disp(in1)
-// disp(in2)
+disp(in1)
+disp(in2)
 //in1 = eval(in1);
 //in2 = string(in2);
 //in2 = eval(in2);
diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_ASCII.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_ASCII.sci
deleted file mode 100644
index e05dd7ae..00000000
--- a/2.3-1/macros/FunctionAnnotation/FA_TP_ASCII.sci
+++ /dev/null
@@ -1,10 +0,0 @@
-function outtp=FA_TP_ASCII(in1tp)
-
-in1tp=string(in1tp);
-if(in1tp=='g') then
-	outtp='u8';
-else 
-	outtp='g';
-end
-
-endfunction
diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_MODSN.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_MODSN.sci
deleted file mode 100644
index f766b4e7..00000000
--- a/2.3-1/macros/FunctionAnnotation/FA_TP_MODSN.sci
+++ /dev/null
@@ -1,10 +0,0 @@
-function outtp=FA_TP_MODSN(in1tp)
-
-in1tp=string(in1tp);
-if(in1tp=='d') then
-	outtp='d';
-else
-	outtp='z';
-end
-
-endfunction
diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib
index de2834db..4f9081d6 100644
--- a/2.3-1/macros/FunctionAnnotation/lib
+++ b/2.3-1/macros/FunctionAnnotation/lib
diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names
index 423c825a..3538b25c 100644
--- a/2.3-1/macros/FunctionAnnotation/names
+++ b/2.3-1/macros/FunctionAnnotation/names
@@ -1,11 +1,9 @@
 FA_ADD
 FA_DIV
-FA_FSFIRLIN_SZ
 FA_GetDefaultPrecision
 FA_GetFunAnn
 FA_GetOutArgInfo
 FA_GetResizeApproach
-FA_INSZ_RPI
 FA_INT
 FA_MAX
 FA_MIN
@@ -16,7 +14,6 @@ FA_SCHUR_TP
 FA_SUB
 FA_SZ_1
 FA_SZ_2
-FA_SZ_AMELL
 FA_SZ_COLUMN_DIAG
 FA_SZ_COL_DIAG_IN_EX
 FA_SZ_DEC2BASE
@@ -26,10 +23,10 @@ FA_SZ_DEC2OCT
 FA_SZ_DIFF
 FA_SZ_FACTOR
 FA_SZ_FROM_VAL
+FA_SZ_FULLRF
 FA_SZ_LINSPACE_ROW
 FA_SZ_LQE
 FA_SZ_LQR
-FA_SZ_MODSN
 FA_SZ_OBSCNT
 FA_SZ_OPAPEX
 FA_SZ_OPBACKSLASH
@@ -62,7 +59,6 @@ FA_SZ_ROW_DIAG_INS_EXT
 FA_SZ_SEL1
 FA_SZ_SEL2
 FA_SZ_U_SVA
-FA_TP_ASCII
 FA_TP_C
 FA_TP_COMPLEX
 FA_TP_CVIMAGE
@@ -72,7 +68,6 @@ FA_TP_INT16
 FA_TP_INT8
 FA_TP_MAX
 FA_TP_MIN_REAL
-FA_TP_MODSN
 FA_TP_REAL
 FA_TP_S
 FA_TP_UINT16