17 files changed, 169 insertions, 3 deletions
diff --git a/macros/FunctionAnnotation/FA_GetOutArgInfo.sci b/macros/FunctionAnnotation/FA_GetOutArgInfo.sci
index a35281a8..99eaaa5f 100644
--- a/macros/FunctionAnnotation/FA_GetOutArgInfo.sci
+++ b/macros/FunctionAnnotation/FA_GetOutArgInfo.sci
@@ -29,7 +29,6 @@ SCI2CNInArgCheck(argn(2),10,10);
 // --- Initialization. ---
 // -----------------------
 
-
 UpdatedOutArg   = OutArg;
 for cntin = 1:NInArg
    IN(cntin).TP    = InArg(cntin).Type;
@@ -72,7 +71,6 @@ for counterin = 1:NInArg
 end
 
 for counterout = 1:NOutArg
-    
    if(FunTypeAnnot == 'FA_TP_USER')
       UpdatedOutArg(counterout).Type   = FA_TP_USER(FunPrecSpecifier,DefaultPrecision);
    else
diff --git a/macros/FunctionAnnotation/FA_SZ_DEC 2OCT.sci~ b/macros/FunctionAnnotation/FA_SZ_DEC 2OCT.sci~
new file mode 100644
index 00000000..340dd2a5
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_DEC 2OCT.sci~
@@ -0,0 +1,30 @@
+function opout1 = FA_SZ_DEC2OCT(inval1)
+
+// 07-Sep-2016 -- Author : Shamik Guha
+
+
+// ------------------------------
+// --- Check input arguments. ---
+// ------------------------------
+//SCI2CNInArgCheck(argn(2),2,2);
+//insize=string(insize);
+
+inval1=string(inval1);
+disp(inval1);
+
+if (isnum(inval1)) then
+    in_num1 = eval(inval1) ;
+    out1=dec2oct(in_num1);
+    disp(out1);
+
+else
+    error(36, "Wrong input argument '+inval1+'.");
+
+end
+
+out1=eval(out1);
+
+opout1=string(floor(log10(abs(out1)+1))+1);
+out1=string(out1);
+disp(opout1);
+endfunction 
diff --git a/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin b/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin
new file mode 100644
index 00000000..879c5885
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin
diff --git a/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci b/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci
new file mode 100644
index 00000000..c5f39abd
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci
@@ -0,0 +1,30 @@
+function opout = FA_SZ_DEC2BASE(in1val,in2val)
+
+// 07-Sep-2016 -- Author : Shamik Guha
+
+
+in1val=string(in1val);
+in2val=string(in2val);
+if (isnum(in1val)) then
+    in1_num = eval(in1val) ;
+    in2_num = eval(in2val) ;
+    out=dec2base(in1_num,in2_num);
+    //disp(out);
+
+else
+    error(36, "Wrong input argument '+in1val+'.");
+
+end
+if (in2_num>10) then
+	out=sci2exp(out);
+	opout=string(length(out)-2);
+	//disp(opout);
+	out=string(out);
+else
+	out=eval(out);
+	//disp(out);
+	opout=string(floor(log10(abs(out)+1))+1);
+	//disp(opout);
+	out=string(out);
+end
+endfunction 
diff --git a/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin b/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin
new file mode 100644
index 00000000..af9d1cb8
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin
diff --git a/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci b/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci
new file mode 100644
index 00000000..fc205254
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci
@@ -0,0 +1,20 @@
+function opout = FA_SZ_DEC2BIN(inval)
+
+// 07-Sep-2016 -- Author : Shamik Guha
+
+inval=string(inval);
+if (isnum(inval)) then
+    in_num = eval(inval) ;
+    out=dec2bin(in_num);
+    //disp(out);
+
+else
+    error(36, "Wrong input argument '+inval+'.");
+
+end
+
+out=eval(out);
+
+opout=string(floor(log10(abs(out)+1))+1);
+out=string(out);
+endfunction 
diff --git a/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin b/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin
new file mode 100644
index 00000000..ddabb108
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin
diff --git a/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci b/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci
new file mode 100644
index 00000000..688e1da4
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci
@@ -0,0 +1,21 @@
+function opout = FA_SZ_DEC2HEX(inval)
+
+// 07-Sep-2016 -- Author : Shamik Guha
+
+inval=string(inval);
+if (isnum(inval)) then
+    in_num = eval(inval) ;
+    out=dec2hex(in_num);
+    //disp(out);
+
+else
+    error(36, "Wrong input argument '+inval+'.");
+
+end
+
+out=sci2exp(out);
+
+opout=string(length(out)-2);
+//disp(opout);
+out=string(out);
+endfunction 
diff --git a/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin b/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin
new file mode 100644
index 00000000..be386e03
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin
diff --git a/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci b/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci
new file mode 100644
index 00000000..44544ccc
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci
@@ -0,0 +1,20 @@
+function opout = FA_SZ_DEC2OCT(inval)
+
+// 07-Sep-2016 -- Author : Shamik Guha
+
+inval=string(inval);
+if (isnum(inval)) then
+    in_num = eval(inval) ;
+    out=dec2oct(in_num);
+    //disp(out);
+
+else
+    error(36, "Wrong input argument '+inval+'.");
+
+end
+
+out=eval(out);
+
+opout=string(floor(log10(abs(out)+1))+1);
+out=string(out);
+endfunction 
diff --git a/macros/FunctionAnnotation/FA_SZ_FACTOR.bin b/macros/FunctionAnnotation/FA_SZ_FACTOR.bin
new file mode 100644
index 00000000..ee8f8991
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_FACTOR.bin
diff --git a/macros/FunctionAnnotation/FA_SZ_FACTOR.sci b/macros/FunctionAnnotation/FA_SZ_FACTOR.sci
new file mode 100644
index 00000000..e44f036a
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_FACTOR.sci
@@ -0,0 +1,20 @@
+function opout = FA_SZ_FACTOR(inval)
+
+// 17-Dec-2016 -- Author : Shamik Guha
+
+inval=string(inval);
+if (isnum(inval)) then
+    in_num = eval(inval) ;
+    out=factor(in_num);
+    //disp(out);
+
+else
+    error(36, "Wrong input argument '+inval+'.");
+
+end
+
+
+out=(length(out));
+opout=string(out);
+
+endfunction 
diff --git a/macros/FunctionAnnotation/FA_SZ_PRIMES.bin b/macros/FunctionAnnotation/FA_SZ_PRIMES.bin
new file mode 100644
index 00000000..353edab7
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_PRIMES.bin
diff --git a/macros/FunctionAnnotation/FA_SZ_PRIMES.sci b/macros/FunctionAnnotation/FA_SZ_PRIMES.sci
new file mode 100644
index 00000000..7b945310
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_PRIMES.sci
@@ -0,0 +1,21 @@
+function opout = FA_SZ_PRIMES(inval)
+
+// 17-Dec-2016 -- Author : Shamik Guha
+
+inval=string(inval);
+if (isnum(inval)) then
+    in_num = eval(inval) ;
+    out=primes(in_num);
+    //disp(out);
+
+else
+    error(36, "Wrong input argument '+inval+'.");
+
+end
+
+
+out=(length(out));
+opout=string(out);
+//disp(opout);
+
+endfunction 
diff --git a/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci b/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci
index aaca2868..f99d156e 100644
--- a/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci
+++ b/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci
@@ -40,7 +40,7 @@ if(inval == '1') then
     outsize(2) = string(in2num_r);
 elseif(inval == '2') then
     in1num_c = eval(in1size);
-    in2num_c = eval(in2size)
+    in2num_c = eval(in2size);
     outsize(1) = string(in1num_c);
     outsize(2) = string(in1num_c + in2num_c);
 else
diff --git a/macros/FunctionAnnotation/lib b/macros/FunctionAnnotation/lib
index 9f0b8066..b965f2df 100644
--- a/macros/FunctionAnnotation/lib
+++ b/macros/FunctionAnnotation/lib
diff --git a/macros/FunctionAnnotation/names b/macros/FunctionAnnotation/names
index 3386d8e1..fd9f66bf 100644
--- a/macros/FunctionAnnotation/names
+++ b/macros/FunctionAnnotation/names
@@ -16,7 +16,12 @@ FA_SZ_1
 FA_SZ_2
 FA_SZ_COLUMN_DIAG
 FA_SZ_COL_DIAG_IN_EX
+FA_SZ_DEC2BASE
+FA_SZ_DEC2BIN
+FA_SZ_DEC2HEX
+FA_SZ_DEC2OCT
 FA_SZ_DIFF
+FA_SZ_FACTOR
 FA_SZ_FROM_VAL
 FA_SZ_LINSPACE_ROW
 FA_SZ_LQE
@@ -48,6 +53,7 @@ FA_SZ_OPSLASH
 FA_SZ_OPSTAR
 FA_SZ_PERMUTE_COL
 FA_SZ_PERMUTE_ROW
+FA_SZ_PRIMES
 FA_SZ_ROW_COLUMN
 FA_SZ_ROW_COLUMN_CAT
 FA_SZ_ROW_DIAG