Merged Shamik's work

56 files changed, 1510 insertions, 24 deletions

diff --git a/2.3-1/macros/ASTManagement/_comment_string.bin b/2.3-1/macros/ASTManagement/_comment_string.bin
new file mode 100644
index 00000000..fb894945
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_comment_string.bin
diff --git a/2.3-1/macros/ASTManagement/_comment_string.sci b/2.3-1/macros/ASTManagement/_comment_string.sci
new file mode 100644
index 00000000..a963507d
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_comment_string.sci
@@ -0,0 +1,7 @@
+function txt=%comment_string(e)
+//overloading function for "comment" type tlist string function
+//fields:
+//  text: a string
+//this is a leaf of the AST
+  txt=['Comment : '+e.text]
+endfunction
diff --git a/2.3-1/macros/ASTManagement/_cste_string.bin b/2.3-1/macros/ASTManagement/_cste_string.bin
new file mode 100644
index 00000000..ba643c47
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_cste_string.bin
diff --git a/2.3-1/macros/ASTManagement/_cste_string.sci b/2.3-1/macros/ASTManagement/_cste_string.sci
new file mode 100644
index 00000000..ba9971d2
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_cste_string.sci
@@ -0,0 +1,26 @@
+function txt=%cste_string(c)
+//overloading function for "cste" type tlist string function
+//this is a leaf of the AST
+//fields:
+//    value : a number or a string
+//NUT: added cste I also need "" for strings in order to be sure that the blanks are
+//NUT: correctly considered and not mistaken with additional blanks present in the ast text file.
+  stringcvalue = string(c.value);
+  if (stringcvalue == "%T"     | ...
+      stringcvalue == "%t"     | ...
+      stringcvalue == "%F"     | ...
+      stringcvalue == "%f"     | ...
+      stringcvalue == "%nan"     | ...
+      stringcvalue == "%inf"     | ...
+      stringcvalue == "%e"	 | ...
+      stringcvalue == "%pi")
+     txt=['Number_x: '+stringcvalue];
+  elseif (isnum(stringcvalue))
+     //NUT needed to convert format 1D-14 into 1d-14
+     txt=['Number_x: '+strsubst(stringcvalue,'D','e')];
+  elseif (stringcvalue == "%i")
+     txt=['Number_X: '+stringcvalue];
+  else
+     txt=['String: ""'+stringcvalue+'""'];
+  end
+endfunction
\ No newline at end of file
diff --git a/2.3-1/macros/ASTManagement/_equal_string.bin b/2.3-1/macros/ASTManagement/_equal_string.bin
new file mode 100644
index 00000000..7f88fee6
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_equal_string.bin
diff --git a/2.3-1/macros/ASTManagement/_equal_string.sci b/2.3-1/macros/ASTManagement/_equal_string.sci
new file mode 100644
index 00000000..9678f0e0
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_equal_string.sci
@@ -0,0 +1,16 @@
+function txt=%equal_string(e)
+//overloading function for "equal" type tlist string function
+//this is a node of the AST
+
+//fields:
+//   expression: "expression" type tlist (the right hand side)
+//   lhs       : list of "variable" type tlist and "operation" type tlist //   (the assignment)
+//   endsymbol : string (the orginal end-of-instruction symbol (, ; <CR>))
+  txt=['Equal'
+       '  Expression: '
+       '    '+string(e.expression)
+       '  Lhs       : '
+       '     '+objectlist2string(e.lhs)
+       'EndEqual'
+      ]
+endfunction
\ No newline at end of file
diff --git a/2.3-1/macros/ASTManagement/_for_string.bin b/2.3-1/macros/ASTManagement/_for_string.bin
new file mode 100644
index 00000000..c3fda16b
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_for_string.bin
diff --git a/2.3-1/macros/ASTManagement/_for_string.sci b/2.3-1/macros/ASTManagement/_for_string.sci
new file mode 100644
index 00000000..0ed9ca28
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_for_string.sci
@@ -0,0 +1,15 @@
+function txt=%for_string(F)
+//overloading function for "for" type tlist string function
+//this is a node of the AST
+//fields:
+//   expression : "expression" type tlist (the loop expression)
+//   statements : list of "equal" type tlist and list('EOL') (the
+//                           for instructions list)
+//NUT: raf cambiato ForExpression e ForStatements
+  txt=['For'
+       '  ForExpression:'
+       '    '+string(F.expression)
+       '  ForStatements:'
+       '    '+objectlist2string(F.statements)
+       'EndFor']
+endfunction
\ No newline at end of file
diff --git a/2.3-1/macros/ASTManagement/_funcall_string.bin b/2.3-1/macros/ASTManagement/_funcall_string.bin
new file mode 100644
index 00000000..8354586d
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_funcall_string.bin
diff --git a/2.3-1/macros/ASTManagement/_funcall_string.sci b/2.3-1/macros/ASTManagement/_funcall_string.sci
new file mode 100644
index 00000000..faeb81d9
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_funcall_string.sci
@@ -0,0 +1,15 @@
+function txt=%funcall_string(F)
+//overloading function for "funcall" type tlist string function
+//this is a node of the AST
+//fields:
+//    rhs  : a list
+//    name : string, the name of the function
+//    lhsnb: number, the number of function lhs
+
+txt=['Funcall  : '+F.name
+     '  #lhs   : '+string(F.lhsnb)
+     '  Rhs    : '
+     '      '+objectlist2string(F.rhs)
+     'EndFuncall'
+    ]
+endfunction
diff --git a/2.3-1/macros/ASTManagement/_ifthenel_string.bin b/2.3-1/macros/ASTManagement/_ifthenel_string.bin
new file mode 100644
index 00000000..1c6fa73d
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_ifthenel_string.bin
diff --git a/2.3-1/macros/ASTManagement/_ifthenel_string.sci b/2.3-1/macros/ASTManagement/_ifthenel_string.sci
new file mode 100644
index 00000000..6787a87c
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_ifthenel_string.sci
@@ -0,0 +1,27 @@
+function txt=%ifthenel_string(I)
+//overloading function for "ifthenel" type tlist string function
+//this is a node of the AST
+//fields:
+//    expression  : "expression" type tlist (the if expression)
+//    then        : list of "equal" type tlist and list('EOL') (the
+//                           then instructions list)
+//    elseifs     : a list of tlists
+//    else        : list of "equal" type tlist and list('EOL') (the
+//                           else instructions list)
+  txt=['If '
+       '  Expression:'
+       '     '+string(I.expression)
+       '  If Statements'
+       '    '+objectlist2string(I.then)]
+  for e=I.elseifs
+    txt=[txt;
+	 '  Else If Expression'
+	 '     '+string(e.expression)
+	 '  Else If Statements'
+       '    '+objectlist2string(e.then)]
+  end
+  txt=[txt;
+       '  Else Statements'
+       '    '+objectlist2string(I.else)
+       'EndIf']
+endfunction
diff --git a/2.3-1/macros/ASTManagement/_operatio_string.bin b/2.3-1/macros/ASTManagement/_operatio_string.bin
new file mode 100644
index 00000000..40abf6b2
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_operatio_string.bin
diff --git a/2.3-1/macros/ASTManagement/_operatio_string.sci b/2.3-1/macros/ASTManagement/_operatio_string.sci
new file mode 100644
index 00000000..8421a3f4
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_operatio_string.sci
@@ -0,0 +1,13 @@
+function txt=%operatio_string(O)
+//overloading function for "operation" type tlist string function
+//this is a node of the AST
+//fields:
+//     operands: a list
+//     operator: a string
+  txt=['Operation'
+       '   Operands:'
+       '      '+objectlist2string(O.operands)
+       '   Operator: '+O.operator
+       'EndOperation'
+      ]
+endfunction
\ No newline at end of file
diff --git a/2.3-1/macros/ASTManagement/_program_p.bin b/2.3-1/macros/ASTManagement/_program_p.bin
new file mode 100644
index 00000000..216a38b2
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_program_p.bin
diff --git a/2.3-1/macros/ASTManagement/_program_p.sci b/2.3-1/macros/ASTManagement/_program_p.sci
new file mode 100644
index 00000000..f45ed69a
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_program_p.sci
@@ -0,0 +1,4 @@
+function %program_p(p)
+  //overloading function for "program" type tlist display
+  mprintf("%s\n",string(p))
+endfunction
diff --git a/2.3-1/macros/ASTManagement/_program_string.bin b/2.3-1/macros/ASTManagement/_program_string.bin
new file mode 100644
index 00000000..3a8fc95b
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_program_string.bin
diff --git a/2.3-1/macros/ASTManagement/_program_string.sci b/2.3-1/macros/ASTManagement/_program_string.sci
new file mode 100644
index 00000000..93486992
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_program_string.sci
@@ -0,0 +1,19 @@
+function txt=%program_string(p)
+//overloading function for "program" type tlist string function
+//main (root) node of the Abstract Formal Tree
+//fields:
+//      name      : string (the function name)
+//      outputs   : list of "variable" type tlist (the output arg names)
+//      inputs    : list of "variable" type tlist (the intput arg names)
+//      statements: list of "equal" type tlist and list('EOL') (the
+//                           instructions list)
+//      nblines   : number (the number of lines in the scilab function)
+  txt=['Program'
+       'Name   : '+p.name
+       'Outputs: '+strcat(objectlist2string(p.outputs),' ')
+       'Inputs : '+strcat(objectlist2string(p.inputs),' ')
+       'Statements '
+       '    '+objectlist2string(p.statements)
+       'EndProgram'
+      ]
+endfunction
diff --git a/2.3-1/macros/ASTManagement/_variable_string.bin b/2.3-1/macros/ASTManagement/_variable_string.bin
new file mode 100644
index 00000000..f81fd6e0
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_variable_string.bin
diff --git a/2.3-1/macros/ASTManagement/_variable_string.sci b/2.3-1/macros/ASTManagement/_variable_string.sci
new file mode 100644
index 00000000..86507957
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_variable_string.sci
@@ -0,0 +1,26 @@
+function txt=%variable_string(v)
+  global anscounter; //NUT: just to fix problem with ans variables.
+//overloading function for "variable" type tlist string function
+//fields: name
+//this is a leaf of the AST
+//NUT: changed here. For me %i is a number not a variable.
+  if (v.name == "%T" | ...
+      v.name == "%t" | ...
+      v.name == "%F"| ...
+      v.name == "%f"| ...
+      v.name == "%nan"| ...
+      v.name == "%inf"| ...
+      v.name == "%e" | ...
+      v.name == "%pi")
+      txt=['Number_x: '+v.name];
+   elseif (v.name == "%i")
+      txt=['Number_X: '+v.name];
+   else
+     if (v.name == 'ans')
+        anscounter = anscounter + 1;
+        txt=['Variable: '+v.name+string(anscounter)];
+     else
+        txt=['Variable: '+v.name];
+     end
+  end
+endfunction
\ No newline at end of file
diff --git a/2.3-1/macros/ASTManagement/_while_string.bin b/2.3-1/macros/ASTManagement/_while_string.bin
new file mode 100644
index 00000000..142189c6
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_while_string.bin
diff --git a/2.3-1/macros/ASTManagement/_while_string.sci b/2.3-1/macros/ASTManagement/_while_string.sci
new file mode 100644
index 00000000..7d5e6223
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/_while_string.sci
@@ -0,0 +1,14 @@
+function txt=%while_string(W)
+//overloading function for "while" type tlist string function
+//this is a node of the AST
+//fields:
+//   expression : "expression" type tlist (the loop expression)
+//   statements : list of "equal" type tlist and list('EOL') (the
+//                           while instructions list)
+  txt=['While'
+       '  WhileExpression:'
+       '    '+string(W.expression)
+       '  WhileStatements:'
+       '    '+objectlist2string(W.statements)
+       'EndWhile']
+endfunction
diff --git a/2.3-1/macros/ASTManagement/lib b/2.3-1/macros/ASTManagement/lib
index 7f0e1d70..0ba95377 100644
--- a/2.3-1/macros/ASTManagement/lib
+++ b/2.3-1/macros/ASTManagement/lib
diff --git a/2.3-1/macros/ASTManagement/names b/2.3-1/macros/ASTManagement/names
index 7f6d053d..43522229 100644
--- a/2.3-1/macros/ASTManagement/names
+++ b/2.3-1/macros/ASTManagement/names
@@ -41,4 +41,15 @@ AST_ReadEqualRhsNames
 GenOutArgNames
 Operator2FunName
 SciFile2ASTFile
+_comment_string
+_cste_string
+_equal_string
+_for_string
+_funcall_string
+_ifthenel_string
+_operatio_string
+_program_p
+_program_string
+_variable_string
+_while_string
 objectlist2string
diff --git a/2.3-1/macros/CCodeGeneration/lib b/2.3-1/macros/CCodeGeneration/lib
index 2d0fc0f4..40c39d02 100644
--- a/2.3-1/macros/CCodeGeneration/lib
+++ b/2.3-1/macros/CCodeGeneration/lib
diff --git a/2.3-1/macros/ErrorMessages/lib b/2.3-1/macros/ErrorMessages/lib
index e989c7f7..77d8512d 100644
--- a/2.3-1/macros/ErrorMessages/lib
+++ b/2.3-1/macros/ErrorMessages/lib
diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci
index a35281a8..99eaaa5f 100644
--- a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci
+++ b/2.3-1/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/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC 2OCT.sci~ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC 2OCT.sci~
new file mode 100644
index 00000000..340dd2a5
--- /dev/null
+++ b/2.3-1/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/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin
new file mode 100644
index 00000000..879c5885
--- /dev/null
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci
new file mode 100644
index 00000000..c5f39abd
--- /dev/null
+++ b/2.3-1/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/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin
new file mode 100644
index 00000000..af9d1cb8
--- /dev/null
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci
new file mode 100644
index 00000000..fc205254
--- /dev/null
+++ b/2.3-1/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/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin
new file mode 100644
index 00000000..ddabb108
--- /dev/null
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci
new file mode 100644
index 00000000..688e1da4
--- /dev/null
+++ b/2.3-1/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/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin
new file mode 100644
index 00000000..be386e03
--- /dev/null
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci
new file mode 100644
index 00000000..44544ccc
--- /dev/null
+++ b/2.3-1/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/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin
new file mode 100644
index 00000000..ee8f8991
--- /dev/null
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci
new file mode 100644
index 00000000..e44f036a
--- /dev/null
+++ b/2.3-1/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/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin
new file mode 100644
index 00000000..353edab7
--- /dev/null
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci
new file mode 100644
index 00000000..7b945310
--- /dev/null
+++ b/2.3-1/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/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci
index aaca2868..f99d156e 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
@@ -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/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib
index 9f0b8066..b965f2df 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 3386d8e1..fd9f66bf 100644
--- a/2.3-1/macros/FunctionAnnotation/names
+++ b/2.3-1/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
diff --git a/2.3-1/macros/FunctionList/lib b/2.3-1/macros/FunctionList/lib
index 006272fb..d97386e8 100644
--- a/2.3-1/macros/FunctionList/lib
+++ b/2.3-1/macros/FunctionList/lib
diff --git a/2.3-1/macros/GeneralFunctions/lib b/2.3-1/macros/GeneralFunctions/lib
index 9d153876..ffeb1940 100644
--- a/2.3-1/macros/GeneralFunctions/lib
+++ b/2.3-1/macros/GeneralFunctions/lib
diff --git a/2.3-1/macros/Hardware/AVR/lib b/2.3-1/macros/Hardware/AVR/lib
index f07c4e6b..3e6de60e 100644
--- a/2.3-1/macros/Hardware/AVR/lib
+++ b/2.3-1/macros/Hardware/AVR/lib
diff --git a/2.3-1/macros/Hardware/RasberryPi/names b/2.3-1/macros/Hardware/RasberryPi/names
index fa647761..39cb5432 100644
--- a/2.3-1/macros/Hardware/RasberryPi/names
+++ b/2.3-1/macros/Hardware/RasberryPi/names
@@ -2,6 +2,8 @@ GetRPISupportFunctions
 IsRPISupportFunction
 RPI_DelayMicro
 RPI_DelayMilli
+RPI_DelayMicro
+RPI_DelayMilli
 RPI_DigitalIn
 RPI_DigitalOut
 RPI_DigitalSetup
diff --git a/2.3-1/macros/SymbolTable/lib b/2.3-1/macros/SymbolTable/lib
index cd1105bb..97e61a32 100644
--- a/2.3-1/macros/SymbolTable/lib
+++ b/2.3-1/macros/SymbolTable/lib
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 5c8ff33e..0bd402ac 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -278,6 +278,46 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

+

+// ---------------------

+// --- Class Float. ---

+// ---------------------

+ClassName = 'Float';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    ''s''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+// --- Function List Class. ---

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'s0',ClassFileName,'file','y');

+PrintStringInfo('u80'+ArgSeparator+'s0',ClassFileName,'file','y');

+PrintStringInfo('i80'+ArgSeparator+'s0',ClassFileName,'file','y');

+PrintStringInfo('u160'+ArgSeparator+'s0',ClassFileName,'file','y');

+PrintStringInfo('i160'+ArgSeparator+'s0',ClassFileName,'file','y');

+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');

+

+PrintStringInfo('d2'+ArgSeparator+'s2',ClassFileName,'file','y');

+PrintStringInfo('u82'+ArgSeparator+'s2',ClassFileName,'file','y');

+PrintStringInfo('i82'+ArgSeparator+'s2',ClassFileName,'file','y');

+PrintStringInfo('u162'+ArgSeparator+'s2',ClassFileName,'file','y');

+PrintStringInfo('i162'+ArgSeparator+'s2',ClassFileName,'file','y');

+//PrintStringInfo('c2'+ArgSeparator+'d2',ClassFileName,'file','y');

+//PrintStringInfo('z2'+ArgSeparator+'d2',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'float';

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

 // ---------------------

 // --- Class Int8. ---

 // ---------------------

@@ -4319,28 +4359,28 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
 // -----------------------

 // --- Class StrSubSt. ---

 // -----------------------

-ClassName = 'StrSubSt';

+//ClassName = 'StrSubSt';

 

 // --- Class Annotation. ---

-PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

-ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

-PrintStringInfo('NIN=          3',ClassFileName,'file','y');

-PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

-PrintStringInfo('OUT(1).TP=    ''g''',ClassFileName,'file','y');

-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

-PrintStringInfo('OUT(1).SZ(2)= FA_SZ_RTMAX(FA_MUL(IN(1).SZ(2),IN(3).SZ(2)))',ClassFileName,'file','y');

+//PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+//ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+//PrintStringInfo('NIN=          3',ClassFileName,'file','y');

+//PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+//PrintStringInfo('OUT(1).TP=    ''g''',ClassFileName,'file','y');

+//PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

+//PrintStringInfo('OUT(1).SZ(2)= FA_SZ_RTMAX(FA_MUL(IN(1).SZ(2),IN(3).SZ(2)))',ClassFileName,'file','y');

 

 // --- Function List Class. ---

 //NUT: no mixed data types

-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+//ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 

-PrintStringInfo('g2g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');

+//PrintStringInfo('g2g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

-FunctionName = 'strsubst'; // to code

-PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+//FunctionName = 'strsubst'; // to code

+//PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

 

 

@@ -4801,7 +4841,7 @@ ClassName = 'AVRPWM0Setup';
 PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

 ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

 PrintStringInfo('NIN=         2',ClassFileName,'file','y');

-PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

 PrintStringInfo('OUT(1).TP=    ''u8''',ClassFileName,'file','y');

 PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

 PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');

@@ -4913,7 +4953,6 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 

 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

-//PrintStringInfo('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');

 PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

@@ -4932,14 +4971,13 @@ ClassName = 'AVRPWM1SetDuty';
 PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

 ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

 PrintStringInfo('NIN=         3',ClassFileName,'file','y');

-PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

 PrintStringInfo('OUT(1).TP=    ''u8''',ClassFileName,'file','y');

 PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

 PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');

 

 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

-//PrintStringInfo('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');

 PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

@@ -6637,6 +6675,865 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

+//------------------------------------

+//---- Class CONVSTR --------------------

+//------------------------------------

+ClassName = 'CONVSTR';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+//Arguements specified: initial value, start time, time vector, ode function

+PrintStringInfo('NIN=         2',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+//PrintStringInfo('NIN=         2',ClassFileName,'file','y');

+//PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+//PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+//PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+//PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');

+

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+//PrintStringInfo('g2'+ArgSeparator+'g2',ClassFileName,'file','y');

+PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'convstr'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+//------------------------------------

+//---- Class STRSUBST --------------------

+//------------------------------------

+ClassName = 'STRSUBST';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+//Arguements specified: initial value, start time, time vector, ode function

+PrintStringInfo('NIN=         3',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+PrintStringInfo('NIN=         4',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('g2g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');

+PrintStringInfo('g2g2g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'strsubst'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+//------------------------------------

+//---- Class STRCMP --------------------

+//------------------------------------

+ClassName = 'STRCMP';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+//Arguements specified: initial value, start time, time vector, ode function

+PrintStringInfo('NIN=         2',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+PrintStringInfo('NIN=         3',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');

+

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+//PrintStringInfo('g2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('g2g2'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('g2g2g2'+ArgSeparator+'d0',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'strcmp'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+

+//------------------------------------

+//---- Class STRREV --------------------

+//------------------------------------

+ClassName = 'STRREV';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+//Arguements specified: initial value, start time, time vector, ode function

+PrintStringInfo('NIN=         1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('g2'+ArgSeparator+'g2',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'strrev'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+

+//------------------------------------

+//---- Class STRRCHR --------------------

+//------------------------------------

+ClassName = 'STRRCHR';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+//Arguements specified: initial value, start time, time vector, ode function

+PrintStringInfo('NIN=         2',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'strrchr'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+

+//------------------------------------

+//---- Class DEC2BIN --------------------

+//------------------------------------

+ClassName = 'DEC2BIN';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+//Arguements specified: initial value, start time, time vector, ode function

+PrintStringInfo('NIN=         1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= FA_MUL(FA_SZ_DEC2BIN(IN(1).VAL),IN(1).SZ(2))',ClassFileName,'file','y');

+

+PrintStringInfo('NIN=         2',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= FA_MUL(IN(2).VAL,IN(1).SZ(2))',ClassFileName,'file','y');

+

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('i80'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('i160'+ArgSeparator+'i162',ClassFileName,'file','y');

+PrintStringInfo('u80'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('u160'+ArgSeparator+'u162',ClassFileName,'file','y');

+

+PrintStringInfo('d0d0'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('i80d0'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('i160d0'+ArgSeparator+'i162',ClassFileName,'file','y');

+PrintStringInfo('u80d0'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('u160d0'+ArgSeparator+'u162',ClassFileName,'file','y');

+

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y');

+PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');

+

+PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('i82d0'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('i162d0'+ArgSeparator+'i162',ClassFileName,'file','y');

+PrintStringInfo('u82d0'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('u162d0'+ArgSeparator+'u162',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'dec2bin'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+

+//------------------------------------

+//---- Class DEC2BASE --------------------

+//------------------------------------

+ClassName = 'DEC2BASE';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+//Arguements specified: initial value, start time, time vector, ode function

+PrintStringInfo('NIN=         2',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    ''g''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= FA_MUL(FA_SZ_DEC2BASE(IN(1).VAL,IN(2).VAL),IN(1).SZ(2))',ClassFileName,'file','y');

+

+PrintStringInfo('NIN=         3',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    ''g''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= FA_MUL(IN(2).VAL,IN(1).SZ(2))',ClassFileName,'file','y');

+

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0d0'+ArgSeparator+'g2',ClassFileName,'file','y');

+PrintStringInfo('d2d0'+ArgSeparator+'g2',ClassFileName,'file','y');

+PrintStringInfo('s0d0'+ArgSeparator+'g2',ClassFileName,'file','y');

+PrintStringInfo('s2d0'+ArgSeparator+'g2',ClassFileName,'file','y');

+

+PrintStringInfo('d0d0d0'+ArgSeparator+'g2',ClassFileName,'file','y');

+PrintStringInfo('d2d0d0'+ArgSeparator+'g2',ClassFileName,'file','y');

+PrintStringInfo('s0d0d0'+ArgSeparator+'g2',ClassFileName,'file','y');

+PrintStringInfo('s2d0d0'+ArgSeparator+'g2',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'dec2base'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+//------------------------------------

+//---- Class DEC2OCT --------------------

+//------------------------------------

+ClassName = 'DEC2OCT';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+//Arguements specified: initial value, start time, time vector, ode function

+PrintStringInfo('NIN=         1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= FA_MUL(FA_SZ_DEC2OCT(IN(1).VAL),IN(1).SZ(1))',ClassFileName,'file','y');

+

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('i80'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('i160'+ArgSeparator+'i162',ClassFileName,'file','y');

+PrintStringInfo('u80'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('u160'+ArgSeparator+'u162',ClassFileName,'file','y');

+

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y');

+PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'dec2oct'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+

+//------------------------------------

+//---- Class DEC2HEX --------------------

+//------------------------------------

+ClassName = 'DEC2HEX';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+//Arguements specified: initial value, start time, time vector, ode function

+PrintStringInfo('NIN=         1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    ''g''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= FA_MUL(FA_SZ_DEC2HEX(IN(1).VAL),IN(1).SZ(1))',ClassFileName,'file','y');

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0'+ArgSeparator+'g2',ClassFileName,'file','y');

+PrintStringInfo('i80'+ArgSeparator+'g2',ClassFileName,'file','y');

+PrintStringInfo('i160'+ArgSeparator+'g2',ClassFileName,'file','y');

+PrintStringInfo('u80'+ArgSeparator+'g2',ClassFileName,'file','y');

+PrintStringInfo('u160'+ArgSeparator+'g2',ClassFileName,'file','y');

+

+PrintStringInfo('d2'+ArgSeparator+'g2',ClassFileName,'file','y');

+PrintStringInfo('i82'+ArgSeparator+'g2',ClassFileName,'file','y');

+PrintStringInfo('i162'+ArgSeparator+'g2',ClassFileName,'file','y');

+PrintStringInfo('u82'+ArgSeparator+'g2',ClassFileName,'file','y');

+PrintStringInfo('u162'+ArgSeparator+'g2',ClassFileName,'file','y');

+

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'dec2hex'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+//------------------------------------

+//---- Class BIN2DEC --------------------

+//------------------------------------

+ClassName = 'BIN2DEC';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+//Arguements specified: initial value, start time, time vector, ode function

+PrintStringInfo('NIN=         1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    ''d''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('i80'+ArgSeparator+'i80',ClassFileName,'file','y');

+PrintStringInfo('i160'+ArgSeparator+'i160',ClassFileName,'file','y');

+PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');

+PrintStringInfo('u160'+ArgSeparator+'u160',ClassFileName,'file','y');

+

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y');

+PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'bin2dec'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+//------------------------------------

+//---- Class OCT2DEC --------------------

+//------------------------------------

+ClassName = 'OCT2DEC';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+//Arguements specified: initial value, start time, time vector, ode function

+PrintStringInfo('NIN=         1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    ''d''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('i80'+ArgSeparator+'i80',ClassFileName,'file','y');

+PrintStringInfo('i160'+ArgSeparator+'i160',ClassFileName,'file','y');

+PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');

+PrintStringInfo('u160'+ArgSeparator+'u160',ClassFileName,'file','y');

+

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y');

+PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'oct2dec'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+//------------------------------------

+//---- Class HEX2DEC --------------------

+//------------------------------------

+ClassName = 'HEX2DEC';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+//Arguements specified: initial value, start time, time vector, ode function

+PrintStringInfo('NIN=         1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    ''d''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');

+

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('g2'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'hex2dec'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+//------------------------------------

+//---- Class BASE2DEC --------------------

+//------------------------------------

+ClassName = 'BASE2DEC';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+//Arguements specified: initial value, start time, time vector, ode function

+PrintStringInfo('NIN=         2',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    ''d''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');

+

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('g2d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+//PrintStringInfo('g2'+ArgSeparator+'d2',ClassFileName,'file','y');

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'base2dec'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+// ------------------

+// --- Class Cosd. ---

+// ------------------

+ClassName = 'Cosd';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+// --- Function List Class. ---

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');

+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'cosd'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+// ------------------

+// --- Class Cotd. ---

+// ------------------

+ClassName = 'Cotd';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+// --- Function List Class. ---

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');

+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'cotd'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+// ------------------

+// --- Class Coth. ---

+// ------------------

+ClassName = 'Coth';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+// --- Function List Class. ---

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');

+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');

+PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');

+PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');

+PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'coth'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+// ------------------

+// --- Class Csc. ---

+// ------------------

+ClassName = 'Csc';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+// --- Function List Class. ---

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');

+PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');

+PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');

+PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');

+PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'csc'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+

+// ------------------

+// --- Class Cscd. ---

+// ------------------

+ClassName = 'Cscd';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+// --- Function List Class. ---

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');

+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+

+PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');

+PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');

+PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');

+PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'cscd'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+

+// ------------------

+// --- Class Csch. ---

+// ------------------

+ClassName = 'Csch';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+// --- Function List Class. ---

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');

+

+PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');

+PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');

+PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');

+PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'csch'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+// --- Class Sec. ---

+// ------------------

+ClassName = 'Sec';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+// --- Function List Class. ---

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');

+

+PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');

+PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');

+PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');

+PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'sec'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+// ------------------

+// --- Class Secd. ---

+// ------------------

+ClassName = 'Secd';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+// --- Function List Class. ---

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');

+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'secd'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+

+// --- Class Sech. ---

+// ------------------

+ClassName = 'Sech';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+// --- Function List Class. ---

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');

+

+PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');

+PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');

+PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');

+PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'sech'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+

+//------------------------------------

+//---- Class FACTORIAL --------------------

+//------------------------------------

+ClassName = 'FACTORIAL';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+//Arguements specified: initial value, start time, time vector, ode function

+PrintStringInfo('NIN=         1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'factorial'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+// --- Class Interp1. ---

+// ------------------

+ClassName = 'Interp1';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          4',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    ''d''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');

+

+// --- Function List Class. ---

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d2d2d0g2'+ArgSeparator+'d0',ClassFileName,'file','y');

+//PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+//PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+//PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');

+

+//PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');

+//PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');

+//PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');

+//PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'interp1'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+

+//------------------------------------

+//---- Class PRIMES --------------------

+//------------------------------------

+ClassName = 'PRIMES';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+//Arguements specified: initial value, start time, time vector, ode function

+PrintStringInfo('NIN=         1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= FA_SZ_PRIMES(IN(1).VAL)',ClassFileName,'file','y');

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('s0'+ArgSeparator+'s2',ClassFileName,'file','y');

+

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'primes'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+//------------------------------------

+//---- Class FACTOR --------------------

+//------------------------------------

+ClassName = 'FACTOR';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+//Arguements specified: initial value, start time, time vector, ode function

+PrintStringInfo('NIN=         1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= FA_MUL(FA_SZ_FACTOR(IN(1).VAL),IN(1).SZ(1))',ClassFileName,'file','y');

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('s0'+ArgSeparator+'s2',ClassFileName,'file','y');

+

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'factor'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+

 // ////////////////////////////////////////////

 // /////PARTE INTRODOTTA DA ALBERTO MOREA

 // /////////////////////////////////////////////

diff --git a/2.3-1/macros/ToolInitialization/doublecomplex.sci b/2.3-1/macros/ToolInitialization/doublecomplex.sci
index 8b36bf65..5fd3784a 100644
--- a/2.3-1/macros/ToolInitialization/doublecomplex.sci
+++ b/2.3-1/macros/ToolInitialization/doublecomplex.sci
@@ -21,6 +21,9 @@ function y = doublecomplex(x)
 // ------------------------------

 SCI2CNInArgCheck(argn(2),1,1);

 

-y = x+0*%i;

+if(x==0)

+y = 0*%i;

+else

+y=x+0*%i;

 

-endfunction
\ No newline at end of file
+endfunction

diff --git a/2.3-1/macros/ToolInitialization/lib b/2.3-1/macros/ToolInitialization/lib
index 06164e65..0ac31225 100644
--- a/2.3-1/macros/ToolInitialization/lib
+++ b/2.3-1/macros/ToolInitialization/lib
diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index 67f5cea2..27998e5e 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -167,6 +167,33 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/linearAlgebra/includes/schur.h"
       "src/c/linearAlgebra/includes/balanc.h"
       "src/c/linearAlgebra/includes/rcond.h"];
+	"src/c/string/includes/strsubst.h"
+	//"src/c/string/includes/strcmp.h"
+	"src/c/string/includes/strrev.h"
+	"src/c/string/includes/strrchr.h"
+	"src/c/elementaryFunctions/includes/dec2bin.h"
+	"src/c/elementaryFunctions/includes/dec2hex.h"
+	"src/c/elementaryFunctions/includes/dec2oct.h"
+	"src/c/elementaryFunctions/includes/oct2dec.h"
+	"src/c/elementaryFunctions/includes/hex2dec.h"
+	"src/c/elementaryFunctions/includes/bin2dec.h"
+	"src/c/elementaryFunctions/includes/dec2base.h"
+	"src/c/elementaryFunctions/includes/base2dec.h"
+	"src/c/elementaryFunctions/includes/cosd.h"
+	"src/c/elementaryFunctions/includes/cotd.h"
+	"src/c/elementaryFunctions/includes/coth.h"
+	"src/c/elementaryFunctions/includes/csc.h"
+	"src/c/elementaryFunctions/includes/cscd.h"
+	"src/c/elementaryFunctions/includes/csch.h"
+	"src/c/elementaryFunctions/includes/sec.h"
+	"src/c/elementaryFunctions/includes/secd.h"
+	"src/c/elementaryFunctions/includes/sech.h"
+	"src/c/elementaryFunctions/includes/float.h"
+	"src/c/elementaryFunctions/includes/factorial.h"
+	"src/c/elementaryFunctions/includes/interp1.h"	
+	"src/c/elementaryFunctions/includes/primes.h"
+	"src/c/elementaryFunctions/includes/factor.h"
+];
 
   //Header files required for "Arduino" output
   Arduino_headers = [
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci
index 135f88b7..04a707b5 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/macros/findDeps/getAllInterfaces.sci
@@ -155,6 +155,13 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/differential_calculus/interfaces/int_diffc.h"
       "src/c/Files/interfaces/int_files.h"
       "src/c/string/interfaces/int_convstr.h"
+	"src/c/string/interfaces/int_strsubst.h"
+	//"src/c/string/interfaces/int_strcmp.h"
+	"src/c/string/interfaces/int_strrev.h"
+	"src/c/string/interfaces/int_strrchr.h"
+	"src/c/elementaryFunctions/interfaces/int_dec2base.h"
+	"src/c/elementaryFunctions/interfaces/int_base2dec.h"
+	"src/c/elementaryFunctions/interfaces/int_dec2bin.h"
       "src/c/CACSD/interfaces/int_syslin.h"
       "src/c/CACSD/interfaces/int_lqr.h"
       "src/c/CACSD/interfaces/int_lqe.h"
@@ -162,6 +169,26 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/linearAlgebra/interfaces/int_schur.h"
       "src/c/linearAlgebra/interfaces/int_balanc.h"
       "src/c/linearAlgebra/interfaces/int_rcond.h"];
+	"src/c/elementaryFunctions/interfaces/int_dec2hex.h"
+	"src/c/elementaryFunctions/interfaces/int_dec2oct.h"
+	"src/c/elementaryFunctions/interfaces/int_oct2dec.h"
+	"src/c/elementaryFunctions/interfaces/int_hex2dec.h"
+	"src/c/elementaryFunctions/interfaces/int_bin2dec.h"
+	"src/c/elementaryFunctions/interfaces/int_cosd.h"
+	"src/c/elementaryFunctions/interfaces/int_cotd.h"
+	"src/c/elementaryFunctions/interfaces/int_coth.h"
+	"src/c/elementaryFunctions/interfaces/int_csc.h"
+	"src/c/elementaryFunctions/interfaces/int_cscd.h"
+	"src/c/elementaryFunctions/interfaces/int_csch.h"
+	"src/c/elementaryFunctions/interfaces/int_sec.h"
+	"src/c/elementaryFunctions/interfaces/int_secd.h"
+	"src/c/elementaryFunctions/interfaces/int_sech.h"
+	"src/c/elementaryFunctions/interfaces/int_float.h"
+	"src/c/elementaryFunctions/interfaces/int_factorial.h"
+	"src/c/elementaryFunctions/interfaces/int_interp1.h"
+	"src/c/elementaryFunctions/interfaces/int_primes.h"
+	"src/c/elementaryFunctions/interfaces/int_factor.h"
+];
 
   //Interface files required for "Arduino" output
   Arduino_interfaces = [
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index 9a5a5c26..a64ebb0c 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -630,6 +630,21 @@ function allSources = getAllSources(SharedInfo)
       "src/c/elementaryFunctions/uint8/u16uint8a.c"
       "src/c/elementaryFunctions/uint8/i16uint8s.c"
       "src/c/elementaryFunctions/uint8/i16uint8a.c"
+
+	"src/c/elementaryFunctions/float/dfloats.c"
+      "src/c/elementaryFunctions/float/dfloata.c"
+	"src/c/elementaryFunctions/float/sfloats.c"
+      "src/c/elementaryFunctions/float/sfloata.c"
+      "src/c/elementaryFunctions/float/u8floats.c"
+      "src/c/elementaryFunctions/float/u8floata.c"
+      "src/c/elementaryFunctions/float/i8floats.c"
+      "src/c/elementaryFunctions/float/i8floata.c"
+      "src/c/elementaryFunctions/float/u16floats.c"
+      "src/c/elementaryFunctions/float/u16floata.c"
+      "src/c/elementaryFunctions/float/i16floats.c"
+      "src/c/elementaryFunctions/float/i16floata.c"
+
+
       "src/c/elementaryFunctions/int8/dint8s.c"
       "src/c/elementaryFunctions/int8/dint8a.c"
       "src/c/elementaryFunctions/int8/sint8s.c"
@@ -1038,6 +1053,163 @@ function allSources = getAllSources(SharedInfo)
       "src/c/Files/mput/u16mputa.c"
       "src/c/Files/mput/i16mputa.c"
       "src/c/string/convstr/gconvstrs.c"
+	"src/c/string/strsubst/gstrsubsta.c"
+	//"src/c/string/strcmp/gstrcmps.c"
+	"src/c/string/strrev/gstrreva.c"
+	"src/c/string/strrchr/gstrrchra.c"
+"src/c/elementaryFunctions/radix_conversions/dec2bin/ddec2bins.c"
+"src/c/elementaryFunctions/radix_conversions/dec2bin/i8dec2bins.c"
+"src/c/elementaryFunctions/radix_conversions/dec2bin/i16dec2bins.c"
+"src/c/elementaryFunctions/radix_conversions/dec2bin/u8dec2bins.c"
+
+"src/c/elementaryFunctions/radix_conversions/dec2bin/u16dec2bins.c"
+"src/c/elementaryFunctions/radix_conversions/dec2bin/ddec2bina.c"
+"src/c/elementaryFunctions/radix_conversions/dec2bin/i8dec2bina.c"
+"src/c/elementaryFunctions/radix_conversions/dec2bin/i16dec2bina.c"
+"src/c/elementaryFunctions/radix_conversions/dec2bin/u8dec2bina.c"
+"src/c/elementaryFunctions/radix_conversions/dec2bin/u16dec2bina.c"
+
+"src/c/elementaryFunctions/radix_conversions/dec2base/ddec2bases.c"
+"src/c/elementaryFunctions/radix_conversions/dec2base/sdec2bases.c"
+"src/c/elementaryFunctions/radix_conversions/dec2base/ddec2basea.c"
+"src/c/elementaryFunctions/radix_conversions/dec2base/sdec2basea.c"
+
+"src/c/elementaryFunctions/radix_conversions/base2dec/gbase2decs.c"
+"src/c/elementaryFunctions/radix_conversions/base2dec/dbase2decs.c"
+
+"src/c/elementaryFunctions/radix_conversions/dec2hex/ddec2hexs.c"
+"src/c/elementaryFunctions/radix_conversions/dec2hex/i8dec2hexs.c"
+"src/c/elementaryFunctions/radix_conversions/dec2hex/i16dec2hexs.c"
+"src/c/elementaryFunctions/radix_conversions/dec2hex/u8dec2hexs.c"
+"src/c/elementaryFunctions/radix_conversions/dec2hex/u16dec2hexs.c"
+"src/c/elementaryFunctions/radix_conversions/dec2hex/ddec2hexa.c"
+"src/c/elementaryFunctions/radix_conversions/dec2hex/i8dec2hexa.c"
+"src/c/elementaryFunctions/radix_conversions/dec2hex/i16dec2hexa.c"
+"src/c/elementaryFunctions/radix_conversions/dec2hex/u8dec2hexa.c"
+"src/c/elementaryFunctions/radix_conversions/dec2hex/u16dec2hexa.c"
+
+"src/c/elementaryFunctions/radix_conversions/dec2oct/ddec2octs.c"
+"src/c/elementaryFunctions/radix_conversions/dec2oct/i8dec2octs.c"
+"src/c/elementaryFunctions/radix_conversions/dec2oct/i16dec2octs.c"
+"src/c/elementaryFunctions/radix_conversions/dec2oct/u8dec2octs.c"
+"src/c/elementaryFunctions/radix_conversions/dec2oct/u16dec2octs.c"
+"src/c/elementaryFunctions/radix_conversions/dec2oct/ddec2octa.c"
+"src/c/elementaryFunctions/radix_conversions/dec2oct/i8dec2octa.c"
+"src/c/elementaryFunctions/radix_conversions/dec2oct/i16dec2octa.c"
+"src/c/elementaryFunctions/radix_conversions/dec2oct/u8dec2octa.c"
+"src/c/elementaryFunctions/radix_conversions/dec2oct/u16dec2octa.c"
+
+"src/c/elementaryFunctions/radix_conversions/oct2dec/doct2decs.c"
+"src/c/elementaryFunctions/radix_conversions/oct2dec/i8oct2decs.c"
+"src/c/elementaryFunctions/radix_conversions/oct2dec/i16oct2decs.c"
+"src/c/elementaryFunctions/radix_conversions/oct2dec/u8oct2decs.c"
+"src/c/elementaryFunctions/radix_conversions/oct2dec/u16oct2decs.c"
+"src/c/elementaryFunctions/radix_conversions/oct2dec/doct2deca.c"
+"src/c/elementaryFunctions/radix_conversions/oct2dec/i8oct2deca.c"
+"src/c/elementaryFunctions/radix_conversions/oct2dec/i16oct2deca.c"
+"src/c/elementaryFunctions/radix_conversions/oct2dec/u8oct2deca.c"
+"src/c/elementaryFunctions/radix_conversions/oct2dec/u16oct2deca.c"
+
+"src/c/elementaryFunctions/radix_conversions/hex2dec/ghex2decs.c"
+"src/c/elementaryFunctions/radix_conversions/hex2dec/dhex2decs.c"
+
+"src/c/elementaryFunctions/radix_conversions/bin2dec/dbin2decs.c"
+"src/c/elementaryFunctions/radix_conversions/bin2dec/i8bin2decs.c"
+//"src/c/elementaryFunctions/radix_conversions/bin2dec/i16bin2decs.c"
+"src/c/elementaryFunctions/radix_conversions/bin2dec/u8bin2decs.c"
+"src/c/elementaryFunctions/radix_conversions/bin2dec/i16bin2decs.c"
+"src/c/elementaryFunctions/radix_conversions/bin2dec/dbin2deca.c"
+"src/c/elementaryFunctions/radix_conversions/bin2dec/i8bin2deca.c"
+//"src/c/elementaryFunctions/radix_conversions/bin2dec/i16bin2deca.c"
+"src/c/elementaryFunctions/radix_conversions/bin2dec/u8bin2deca.c"
+"src/c/elementaryFunctions/radix_conversions/bin2dec/i16bin2deca.c"
+
+"src/c/elementaryFunctions/Trigonometry/cosd/dcosda.c"
+"src/c/elementaryFunctions/Trigonometry/cosd/dcosds.c"
+"src/c/elementaryFunctions/Trigonometry/cosd/scosda.c"
+"src/c/elementaryFunctions/Trigonometry/cosd/scosds.c"
+
+"src/c/elementaryFunctions/Trigonometry/cotd/dcotda.c"
+"src/c/elementaryFunctions/Trigonometry/cotd/dcotds.c"
+"src/c/elementaryFunctions/Trigonometry/cotd/scotda.c"
+"src/c/elementaryFunctions/Trigonometry/cotd/scotds.c"
+
+"src/c/elementaryFunctions/Trigonometry/coth/dcotha.c"
+"src/c/elementaryFunctions/Trigonometry/coth/dcoths.c"
+"src/c/elementaryFunctions/Trigonometry/coth/scotha.c"
+"src/c/elementaryFunctions/Trigonometry/coth/scoths.c"
+"src/c/elementaryFunctions/Trigonometry/coth/zcoths.c"
+"src/c/elementaryFunctions/Trigonometry/coth/zcotha.c"
+"src/c/elementaryFunctions/Trigonometry/coth/ccoths.c"
+"src/c/elementaryFunctions/Trigonometry/coth/ccotha.c"
+
+"src/c/elementaryFunctions/Trigonometry/csc/dcsca.c"
+"src/c/elementaryFunctions/Trigonometry/csc/dcscs.c"
+"src/c/elementaryFunctions/Trigonometry/csc/scsca.c"
+"src/c/elementaryFunctions/Trigonometry/csc/scscs.c"
+"src/c/elementaryFunctions/Trigonometry/csc/zcscs.c"
+"src/c/elementaryFunctions/Trigonometry/csc/zcsca.c"
+"src/c/elementaryFunctions/Trigonometry/csc/ccscs.c"
+"src/c/elementaryFunctions/Trigonometry/csc/ccsca.c"
+
+"src/c/elementaryFunctions/Trigonometry/cscd/dcscds.c"
+"src/c/elementaryFunctions/Trigonometry/cscd/dcscda.c"
+"src/c/elementaryFunctions/Trigonometry/cscd/scscds.c"
+"src/c/elementaryFunctions/Trigonometry/cscd/scscda.c"
+"src/c/elementaryFunctions/Trigonometry/cscd/zcscds.c"
+"src/c/elementaryFunctions/Trigonometry/cscd/zcscda.c"
+"src/c/elementaryFunctions/Trigonometry/cscd/ccscds.c"
+"src/c/elementaryFunctions/Trigonometry/cscd/ccscda.c"
+
+"src/c/elementaryFunctions/Trigonometry/csch/dcscha.c"
+"src/c/elementaryFunctions/Trigonometry/csch/dcschs.c"
+"src/c/elementaryFunctions/Trigonometry/csch/scscha.c"
+"src/c/elementaryFunctions/Trigonometry/csch/scschs.c"
+"src/c/elementaryFunctions/Trigonometry/csch/zcschs.c"
+"src/c/elementaryFunctions/Trigonometry/csch/zcscha.c"
+"src/c/elementaryFunctions/Trigonometry/csch/ccschs.c"
+"src/c/elementaryFunctions/Trigonometry/csch/ccscha.c"
+
+"src/c/elementaryFunctions/Trigonometry/sec/dsecs.c"
+"src/c/elementaryFunctions/Trigonometry/sec/dseca.c"
+"src/c/elementaryFunctions/Trigonometry/sec/sseca.c"
+"src/c/elementaryFunctions/Trigonometry/sec/ssecs.c"
+//"src/c/elementaryFunctions/Trigonometry/sec/zseca.c"
+"src/c/elementaryFunctions/Trigonometry/sec/zsecs.c"
+"src/c/elementaryFunctions/Trigonometry/sec/cseca.c"
+"src/c/elementaryFunctions/Trigonometry/sec/csecs.c"
+
+"src/c/elementaryFunctions/Trigonometry/secd/dsecda.c"
+"src/c/elementaryFunctions/Trigonometry/secd/dsecds.c"
+"src/c/elementaryFunctions/Trigonometry/secd/ssecda.c"
+"src/c/elementaryFunctions/Trigonometry/secd/ssecds.c"
+
+"src/c/elementaryFunctions/Trigonometry/sech/dsechs.c"
+"src/c/elementaryFunctions/Trigonometry/sech/dsecha.c"
+"src/c/elementaryFunctions/Trigonometry/sech/ssecha.c"
+"src/c/elementaryFunctions/Trigonometry/sech/ssechs.c"
+"src/c/elementaryFunctions/Trigonometry/sech/zsecha.c"
+"src/c/elementaryFunctions/Trigonometry/sech/zsechs.c"
+"src/c/elementaryFunctions/Trigonometry/sech/csecha.c"
+"src/c/elementaryFunctions/Trigonometry/sech/csechs.c"
+
+
+"src/c/elementaryFunctions/discrete_mathematics/factorial/dfactorials.c"
+"src/c/elementaryFunctions/discrete_mathematics/factorial/dfactoriala.c"
+"src/c/elementaryFunctions/discrete_mathematics/factorial/sfactorials.c"
+"src/c/elementaryFunctions/discrete_mathematics/factorial/sfactoriala.c"
+
+"src/c/elementaryFunctions/interpolation/dinterp1s.c"
+
+"src/c/elementaryFunctions/discrete_mathematics/primes/dprimess.c"
+
+"src/c/elementaryFunctions/discrete_mathematics/primes/sprimess.c"
+
+
+"src/c/elementaryFunctions/discrete_mathematics/factor/dfactors.c"
+
+"src/c/elementaryFunctions/discrete_mathematics/factor/sfactors.c"
+
       "src/c/CACSD/syslin/dsyslina.c"
       "src/c/CACSD/lqr/dlqra.c"
       "src/c/CACSD/lqe/dlqea.c"
@@ -1046,7 +1218,6 @@ function allSources = getAllSources(SharedInfo)
       "src/c/linearAlgebra/schur/dgschura.c"
       "src/c/linearAlgebra/balanc/dbalanca.c"
       "src/c/linearAlgebra/rcond/drconda.c"];
-
   //Files to be inserted only if output format selected is 'Arduino'.
   Arduino_files = ["src/c/scilab-arduino/cmd_digital_out/u8cmd_digital_outs.c"
       "src/c/scilab-arduino/cmd_digital_in/u8cmd_digital_ins.c"
diff --git a/2.3-1/macros/findDeps/lib b/2.3-1/macros/findDeps/lib
index b3a9fe5d..a2c5d3a5 100644
--- a/2.3-1/macros/findDeps/lib
+++ b/2.3-1/macros/findDeps/lib
diff --git a/2.3-1/macros/lib b/2.3-1/macros/lib
index 3c454969..fc6050e4 100644
--- a/2.3-1/macros/lib
+++ b/2.3-1/macros/lib