diff options
363 files changed, 2031 insertions, 133 deletions
diff --git a/2.3-1/includes/sci2clib.h b/2.3-1/includes/sci2clib.h index eae03ebb..7eb0d635 100644 --- a/2.3-1/includes/sci2clib.h +++ b/2.3-1/includes/sci2clib.h @@ -65,8 +65,22 @@ extern "C" { #include "rand.h" #include "int_rand.h" +/* INTERPOLATION FUNCTIONS*/ + +/*interfacing interp1*/ +#include "interp1.h" +#include "int_interp1.h" + /* ELEMENTARY FUNCTIONS */ +#include "nextpow2.h" +#include "int_nextpow2.h" +/*interfacing gcd*/ +#include "gcd.h" +#include "int_gcd.h" +/* interfacing isreal*/ +#include "isreal.h" +#include "int_isreal.h" /* interfacing atand */ #include "atand.h" #include "int_atand.h" @@ -412,6 +426,18 @@ extern "C" { #include "norm.h" /* SIGNAL PROCESSING */ + + +#include "modk.h" +#include "int_modk.h" +/* interfacing idct */ +#include "idct.h" +#include "int_idct.h" + +/* interfacing dct */ +#include "dct.h" +#include "int_dct.h" + /* interfacing convol */ #include "conv.h" #include "conv2d.h" diff --git a/2.3-1/loader.sce b/2.3-1/loader.sce index 061021cb..92d68830 100644 --- a/2.3-1/loader.sce +++ b/2.3-1/loader.sce @@ -1,20 +1,10 @@ // This file is released under the 3-clause BSD license. See COPYING-BSD. // Generated by builder.sce: Please, do not edit this file -oldmode = mode(); mode(-1); -oldlines = lines()(2); lines(0); try - exec(get_absolute_file_path("loader.sce")+"etc/"+"scilab2c.start"); + getversion("scilab"); catch - [errmsg, tmp, nline, func] = lasterror() - msg = "%s: error on line #%d: ""%s""\n" - msg = msprintf(msg, func, nline, errmsg) - lines(oldlines) - mode(oldmode); - clear oldlines oldmode tmp nline func - error(msg); -end -lines(oldlines); -mode(oldmode); -clear oldlines oldmode; + error("Scilab 5.0 or more is required."); +end; +exec(get_absolute_file_path("loader.sce")+"etc/"+"scilab2c.start"); diff --git a/2.3-1/macros/ASTManagement/%comment_string.bin b/2.3-1/macros/ASTManagement/%comment_string.bin Binary files differnew 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/%cste_string.bin b/2.3-1/macros/ASTManagement/%cste_string.bin Binary files differnew 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/%equal_string.bin b/2.3-1/macros/ASTManagement/%equal_string.bin Binary files differnew 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/%for_string.bin b/2.3-1/macros/ASTManagement/%for_string.bin Binary files differnew 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/%funcall_string.bin b/2.3-1/macros/ASTManagement/%funcall_string.bin Binary files differnew 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/%ifthenel_string.bin b/2.3-1/macros/ASTManagement/%ifthenel_string.bin Binary files differnew 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/%ifthenelse_string.bin b/2.3-1/macros/ASTManagement/%ifthenelse_string.bin Binary files differnew file mode 100644 index 00000000..456ffadc --- /dev/null +++ b/2.3-1/macros/ASTManagement/%ifthenelse_string.bin diff --git a/2.3-1/macros/ASTManagement/%operatio_string.bin b/2.3-1/macros/ASTManagement/%operatio_string.bin Binary files differnew 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/%operation_string.bin b/2.3-1/macros/ASTManagement/%operation_string.bin Binary files differnew file mode 100644 index 00000000..dfbeec96 --- /dev/null +++ b/2.3-1/macros/ASTManagement/%operation_string.bin diff --git a/2.3-1/macros/ASTManagement/%program_p.bin b/2.3-1/macros/ASTManagement/%program_p.bin Binary files differnew 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_string.bin b/2.3-1/macros/ASTManagement/%program_string.bin Binary files differnew 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/%variable_string.bin b/2.3-1/macros/ASTManagement/%variable_string.bin Binary files differnew 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/%while_string.bin b/2.3-1/macros/ASTManagement/%while_string.bin Binary files differnew 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/AST2Ccode.bin b/2.3-1/macros/ASTManagement/AST2Ccode.bin Binary files differnew file mode 100644 index 00000000..9daefb83 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST2Ccode.bin diff --git a/2.3-1/macros/ASTManagement/AST2Ccode.sci b/2.3-1/macros/ASTManagement/AST2Ccode.sci index 8076d7e2..73183f79 100644 --- a/2.3-1/macros/ASTManagement/AST2Ccode.sci +++ b/2.3-1/macros/ASTManagement/AST2Ccode.sci @@ -151,17 +151,21 @@ while ~meof(fidAST) AST_PushASTStack(treeline); case 'Lhs :' then SharedInfo.Equal.Lhs = 1; // 1 means that we are inside the Lhs block of the Equal + //if SharedInfo.Equal.NOutArg > 0 [EqualInArgName,EqualInArgScope,EqualNInArg] = AST_ReadEqualRhsNames(FileInfo,SharedInfo); - + SharedInfo.Equal.NInArg = EqualNInArg; + //end + // lengthNumber = length('Number_'); // if (part(EqualInArgScope,1:lengthNumber) == 'Number_') // SharedInfo.SkipNextEqual = 1 // end - SharedInfo.Equal.NInArg = EqualNInArg; + for tmpcnt = 1:SharedInfo.Equal.NInArg SharedInfo.Equal.InArg(tmpcnt).Name = EqualInArgName(tmpcnt); SharedInfo.Equal.InArg(tmpcnt).Scope = EqualInArgScope(tmpcnt); end + //end AST_PushASTStack(treeline); // ---------------- diff --git a/2.3-1/macros/ASTManagement/AST_CheckCommonInOutArgs.bin b/2.3-1/macros/ASTManagement/AST_CheckCommonInOutArgs.bin Binary files differnew file mode 100644 index 00000000..5c190ba3 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_CheckCommonInOutArgs.bin diff --git a/2.3-1/macros/ASTManagement/AST_CheckLastFunc.bin b/2.3-1/macros/ASTManagement/AST_CheckLastFunc.bin Binary files differnew file mode 100644 index 00000000..9cac2273 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_CheckLastFunc.bin diff --git a/2.3-1/macros/ASTManagement/AST_CheckLineLength.bin b/2.3-1/macros/ASTManagement/AST_CheckLineLength.bin Binary files differnew file mode 100644 index 00000000..db486797 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_CheckLineLength.bin diff --git a/2.3-1/macros/ASTManagement/AST_CheckPrecSpecifier.bin b/2.3-1/macros/ASTManagement/AST_CheckPrecSpecifier.bin Binary files differnew file mode 100644 index 00000000..8e50397f --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_CheckPrecSpecifier.bin diff --git a/2.3-1/macros/ASTManagement/AST_DisplayStack.bin b/2.3-1/macros/ASTManagement/AST_DisplayStack.bin Binary files differnew file mode 100644 index 00000000..90cbcc74 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_DisplayStack.bin diff --git a/2.3-1/macros/ASTManagement/AST_ExtractNameAndScope.bin b/2.3-1/macros/ASTManagement/AST_ExtractNameAndScope.bin Binary files differnew file mode 100644 index 00000000..1944d88b --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_ExtractNameAndScope.bin diff --git a/2.3-1/macros/ASTManagement/AST_GetASTFile.bin b/2.3-1/macros/ASTManagement/AST_GetASTFile.bin Binary files differnew file mode 100644 index 00000000..261430e5 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_GetASTFile.bin diff --git a/2.3-1/macros/ASTManagement/AST_GetFuncallPrm.bin b/2.3-1/macros/ASTManagement/AST_GetFuncallPrm.bin Binary files differnew file mode 100644 index 00000000..37dbe771 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_GetFuncallPrm.bin diff --git a/2.3-1/macros/ASTManagement/AST_GetPrecAndLhsArg.bin b/2.3-1/macros/ASTManagement/AST_GetPrecAndLhsArg.bin Binary files differnew file mode 100644 index 00000000..71e44cb1 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_GetPrecAndLhsArg.bin diff --git a/2.3-1/macros/ASTManagement/AST_HandleEOL.bin b/2.3-1/macros/ASTManagement/AST_HandleEOL.bin Binary files differnew file mode 100644 index 00000000..3b6b3bd1 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_HandleEOL.bin diff --git a/2.3-1/macros/ASTManagement/AST_HandleEndFor.bin b/2.3-1/macros/ASTManagement/AST_HandleEndFor.bin Binary files differnew file mode 100644 index 00000000..a6031b43 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_HandleEndFor.bin diff --git a/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.bin b/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.bin Binary files differnew file mode 100644 index 00000000..6aab0b75 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.bin diff --git a/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci b/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci index 5ff7181f..4de5d893 100644 --- a/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci +++ b/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci @@ -73,6 +73,14 @@ global STACKDEDUG // #RNU_RES_E [ASTFunName,InArg,NInArg,OutArg,NOutArg] = AST_GetFuncallPrm(FileInfo,SharedInfo,ASTFunType); NOutArg_mod = NOutArg + if ASTFunName == 'OpLogAnd' + AST_PushASTStack('&&'); + return ; + end + if ASTFunName == 'OpLogOr' + AST_PushASTStack('||'); + return; + end if(mtlb_strcmp(part(ASTFunName,1:2),'CV') == %T) SharedInfo.OpenCVUsed = %T; end @@ -119,6 +127,9 @@ NOutArg_mod = NOutArg // --- Read the function annotations. --- // -------------------------------------- // #RNU_RES_E + if ASTFunName == '%k' + ASTFunName='modk'; + end if (ASTFunName == 'OpEqual') FunTypeAnnot = ''; @@ -132,6 +143,7 @@ NOutArg_mod = NOutArg // --- Search for Equal Lhs and precision specifier to be applied to the current function. --- // ------------------------------------------------------------------------------------------- // #RNU_RES_E + PrintStringInfo(' no of out arguments' + string(NOutArg),ReportFileName,'file','y'); [LhsArg,NLhsArg,FunPrecSpecifier,SharedInfo] = AST_GetPrecAndLhsArg(OutArg,NOutArg,ASTFunName,FunTypeAnnot,FunSizeAnnot,ASTFunType,FileInfo,SharedInfo); //NUT: questa funzione contiene troppi parametri e mi sembra disordinata. @@ -329,8 +341,13 @@ NOutArg_mod = NOutArg OutArg(1).Name = string(OutArg(1).Value); elseif ((ASTFunName == 'double') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) OutArg(1).Name = string(OutArg(1).Value); + //elseif ASTFunName == 'disp' else [OutArg,SharedInfo] = GenOutArgNames(ASTFunName,InArg,NInArg,OutArg,NOutArg,LhsArg,NLhsArg,FileInfo,SharedInfo); + if ( ASTFunName == 'OpLogGt' | ASTFunName == 'OpLogLt' | ASTFunName == 'OpLogLe' | ASTFunName == 'OpLogGe' | ASTFunName == 'OpLogNe' | ASTFunName == 'OpLogEq') + PrintStringInfo(' returning back due logical function',ReportFileName,'file','y'); + return; + end end if ((ASTFunName == 'uint8') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) @@ -374,6 +391,8 @@ NOutArg_mod = NOutArg // Scope already set above. elseif (ASTFunName == 'double' & NInArg == 1 & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) // Scope already set above. + //elseif ASTFunName == 'disp' + //do nothing else OutArg = ST_AnalyzeScope(OutArg,NOutArg,FileInfo,SharedInfo); end @@ -392,6 +411,8 @@ NOutArg_mod = NOutArg //#RNUREM_ME A number is not inserted in the symbol table. elseif ((ASTFunName == 'double') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) //#RNUREM_ME A number is not inserted in the symbol table. + //elseif ASTFunName == 'disp' + //do nothing else ST_InsOutArg(OutArg,NOutArg,FileInfo,SharedInfo,'all'); end @@ -424,8 +445,9 @@ NOutArg_mod = NOutArg // -------------------------------------------- //#RNU_RES_E //disp(OutArg,InArg,ASTFunName) + CFunName = C_GenerateFunName(ASTFunName,InArg,NInArg,OutArg,NOutArg_mod); - + //#RNU_RES_B PrintStringInfo(' C Function Name: '+CFunName,ReportFileName,'file','y'); if(IsArduinoFunction(ASTFunName)) @@ -496,6 +518,8 @@ NOutArg_mod = NOutArg SharedInfo.SkipNextFun > 0 | ... ((sum(mtlb_strcmp(ASTFunName,SharedInfo.Annotations.DataPrec)) > 0) & (SharedInfo.SkipNextPrec == 1))) // Do nothing + //elseif ASTFunName == 'disp' + // Do nothing else AST_CheckCommonInOutArgs(InArg,NInArg,OutArg,NOutArg,ReportFileName); end diff --git a/2.3-1/macros/ASTManagement/AST_HandleEndProgram.bin b/2.3-1/macros/ASTManagement/AST_HandleEndProgram.bin Binary files differnew file mode 100644 index 00000000..5e02fdcd --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_HandleEndProgram.bin diff --git a/2.3-1/macros/ASTManagement/AST_HandleEndWhile.bin b/2.3-1/macros/ASTManagement/AST_HandleEndWhile.bin Binary files differnew file mode 100644 index 00000000..bafccbc2 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_HandleEndWhile.bin diff --git a/2.3-1/macros/ASTManagement/AST_HandleFor.bin b/2.3-1/macros/ASTManagement/AST_HandleFor.bin Binary files differnew file mode 100644 index 00000000..27d44a12 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_HandleFor.bin diff --git a/2.3-1/macros/ASTManagement/AST_HandleForStatem.bin b/2.3-1/macros/ASTManagement/AST_HandleForStatem.bin Binary files differnew file mode 100644 index 00000000..4839b049 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_HandleForStatem.bin diff --git a/2.3-1/macros/ASTManagement/AST_HandleHeader.bin b/2.3-1/macros/ASTManagement/AST_HandleHeader.bin Binary files differnew file mode 100644 index 00000000..87ef763a --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_HandleHeader.bin diff --git a/2.3-1/macros/ASTManagement/AST_HandleIfElse.bin b/2.3-1/macros/ASTManagement/AST_HandleIfElse.bin Binary files differnew file mode 100644 index 00000000..d30e47b4 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_HandleIfElse.bin diff --git a/2.3-1/macros/ASTManagement/AST_HandleIfElse.sci b/2.3-1/macros/ASTManagement/AST_HandleIfElse.sci index 5373adf6..2b549ed6 100644 --- a/2.3-1/macros/ASTManagement/AST_HandleIfElse.sci +++ b/2.3-1/macros/ASTManagement/AST_HandleIfElse.sci @@ -74,11 +74,13 @@ global STACKDEDUG // --------------------------------------------------- //#RNU_RES_E if (ASTIfExpType~='else') - [IfCondArg,NIfCondArg] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType); + [IfCondArg,NIfCondArg,Op,NOp] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType); else // "else" type doesn't contain any condition to test. IfCondArg = ''; NIfCondArg = 0; + Op = ''; + NOp = 0; end //#RNU_RES_B @@ -87,6 +89,6 @@ end // ----------------------------- // --- Generate the C code for if/elseif Expression. --- //#RNU_RES_E -SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,SharedInfo); +SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,Op,NOp,ASTIfExpType,FileInfo,SharedInfo); endfunction diff --git a/2.3-1/macros/ASTManagement/AST_HandleWhileExpr.bin b/2.3-1/macros/ASTManagement/AST_HandleWhileExpr.bin Binary files differnew file mode 100644 index 00000000..5f3da2de --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_HandleWhileExpr.bin diff --git a/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.bin b/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.bin Binary files differnew file mode 100644 index 00000000..4f7704ea --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.bin diff --git a/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.sci b/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.sci index 79fb516d..d8c2f73c 100644 --- a/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.sci +++ b/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.sci @@ -36,6 +36,8 @@ global SCI2CSTACK global StackPosition; global STACKDEDUG +IfCondArg = []; +NIfCondArg = 0; // ------------------------------ // --- Check input arguments. --- @@ -70,36 +72,40 @@ PrintStringInfo(' Redirecting C code to: '+FileInfo.Funct(nxtscifunnumber).CPa // --- Generate C code. --- // ------------------------ //#RNU_RES_E -if(SharedInfo.WhileExpr.CondVar == '') - //#RNU_RES_B - // It means that we are handling something like while(a) or while(1) - // The while condition variable is generated by the HandleEndGenFun. - //#RNU_RES_E - - // --- Pop the name of the condition variable or number. --- - Pop1 = AST_PopASTStack(); - - [ArgName,ArgScope] = AST_ExtractNameAndScope(Pop1); - if (length(ArgName) == 0) - PrintStringInfo(' ',ReportFileName,'both','y'); - PrintStringInfo('SCI2CERROR: Expected while(variable) or while(number).','','stdout','y'); - PrintStringInfo('SCI2CERROR: Expected a variable or number in the AST while expression.','','stdout','y'); - PrintStringInfo('SCI2CERROR: Report this error to http://forge.scilab.org/index.php/p/scilab2c/issues/.','','stdout','y'); - PrintStringInfo(' ',ReportFileName,'both','y'); - error(9999, 'Expected a conditional variable in the while expression'); +flagendpop = 0; +IfExprField = AST_PopASTStack(); + +NOp=0; +Op=[]; +while (flagendpop == 0) + if (IfExprField~='<EOL>') + if (IfExprField=='WhileExpression:') + flagendpop = 1; + // Pop Again the If tag from the AST. + IfExprField = AST_PopASTStack(); + elseif (IfExprField=='Operands:') + flagendpop = 0; + g = AST_PopASTStack(); + else + if (IfExprField=='&&' | IfExprField=='||') + NOp = NOp + 1; + Op(NOp) = IfExprField; + //PrintStringInfo('operators are '+Op(NOp),ReportFileName,'file','y'); + else + NIfCondArg = NIfCondArg + 1; + IfCondArg(NIfCondArg) = IfExprField; + end + //[IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField); + //[IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField); + end end + IfExprField = AST_PopASTStack(); + PrintStringInfo('operators are '+IfExprField,ReportFileName,'file','y'); +end - SharedInfo.WhileExpr.CondVar = ArgName; - //#RNU_RES_B - // --- Repush strings into the AST stack. --- - //#RNU_RES_E - - AST_PushASTStack(Pop1); +IfCondArg = SCI2Cflipud(IfCondArg); -elseif (SharedInfo.WhileExpr.DimCondVar > 0) - error(9999, 'Cannot manage while with matrix conditions'); -end -SharedInfo = C_WhileExpression(FileInfo,SharedInfo); +SharedInfo = C_WhileExpression(IfCondArg,NIfCondArg,Op,NOp,FileInfo,SharedInfo); // -------------------------- // --- Update SharedInfo. --- diff --git a/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.bin b/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.bin Binary files differnew file mode 100644 index 00000000..459c62e8 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.bin diff --git a/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.bin b/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.bin Binary files differnew file mode 100644 index 00000000..1cbeb5c0 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.bin diff --git a/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.sci b/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.sci index 647a70d7..3c322dd5 100644 --- a/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.sci +++ b/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.sci @@ -87,6 +87,10 @@ NOutArg = eval(stripblanks(part(buffstring,10:length(buffstring)))); buffstring = AST_PopASTStack(); FunctionName = stripblanks(part(buffstring,12:length(buffstring))); +//if (FunctionName == 'disp') + // NOutArg = 0; +//end + // ------------------------------------- // --- Generate the InArg structure. --- // ------------------------------------- diff --git a/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.bin b/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.bin Binary files differnew file mode 100644 index 00000000..19ea5fe9 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.bin diff --git a/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.sci b/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.sci index a7da0128..3ed1b5b6 100644 --- a/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.sci +++ b/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.sci @@ -1,4 +1,4 @@ -function [IfCondArg,NIfCondArg] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType) +function [IfCondArg,NIfCondArg,Op,NOp] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType) // function [IfCondArg,NIfCondArg] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType) // ----------------------------------------------------------------- //#RNU_RES_B @@ -63,13 +63,26 @@ global STACKDEDUG // ------------------------------------ // --- Read if condition variables. --- // ------------------------------------ +//OutArgOld=[]; +//OutArgNew=[]; + +//for i = 1:3 + // OutArgOld(i)=AST_PopASTStack(); + //PrintStringInfo(' '+OutArgOld(i),ReportFileName,'file','y'); +//end +//x = AST_PopASTStack(); + +//OutArgNew = SCI2Cflipud(OutArgOld); + flagendpop = 0; IfExprField = AST_PopASTStack(); +PrintStringInfo(' '+IfExprField+' '+ASTIfExpType,ReportFileName,'file','y'); if (ASTIfExpType=='if') if (IfExprField=='Expression:') flagendpop = 1; // Pop Again the If tag from the AST. IfExprField = AST_PopASTStack(); + PrintStringInfo(' '+IfExprField,ReportFileName,'file','y'); end elseif (ASTIfExpType=='elseif') if (IfExprField=='Else If Expression') @@ -78,7 +91,8 @@ elseif (ASTIfExpType=='elseif') else error(9999, 'Unknown ASTIfExpType ""'+ASTIfExpType+'"".'); end - +NOp=0; +Op=[]; while (flagendpop == 0) if (IfExprField~='<EOL>') if (ASTIfExpType=='if') @@ -86,23 +100,41 @@ while (flagendpop == 0) flagendpop = 1; // Pop Again the If tag from the AST. IfExprField = AST_PopASTStack(); + elseif (IfExprField=='Operands:') + flagendpop = 0; + g = AST_PopASTStack(); else + if (IfExprField=='&&' | IfExprField=='||') + NOp = NOp + 1; + Op(NOp) = IfExprField; + //PrintStringInfo('operators are '+Op(NOp),ReportFileName,'file','y'); + else NIfCondArg = NIfCondArg + 1; - [IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField); + IfCondArg(NIfCondArg) = IfExprField; + end + //[IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField); end elseif (ASTIfExpType=='elseif') if (IfExprField=='Else If Expression') flagendpop = 1; else - NIfCondArg = NIfCondArg + 1; - IfCondArg(NIfCondArg) = IfExprField; - [IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField); + if (IfExprField=='&&') + NOp = NOp + 1; + Op(NOp) = IfExprField; + else + NIfCondArg = NIfCondArg + 1; + IfCondArg(NIfCondArg) = IfExprField; + end + //[IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField); end end end IfExprField = AST_PopASTStack(); + PrintStringInfo('operators are '+IfExprField,ReportFileName,'file','y'); end +IfCondArg = SCI2Cflipud(IfCondArg); + //#RNU_RES_B // ------------------------------------------- // --- Print some info in the report file. --- diff --git a/2.3-1/macros/ASTManagement/AST_ParseOperStruct.bin b/2.3-1/macros/ASTManagement/AST_ParseOperStruct.bin Binary files differnew file mode 100644 index 00000000..e189cbc9 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_ParseOperStruct.bin diff --git a/2.3-1/macros/ASTManagement/AST_ParseOperStruct.sci b/2.3-1/macros/ASTManagement/AST_ParseOperStruct.sci index a77317bd..903f0958 100644 --- a/2.3-1/macros/ASTManagement/AST_ParseOperStruct.sci +++ b/2.3-1/macros/ASTManagement/AST_ParseOperStruct.sci @@ -61,6 +61,17 @@ LabelFunctName = 'Operator: '; FunctionName = stripblanks(part(buffstring,length(LabelFunctName)+1:length(buffstring))); // Generate the proper function name. FunctionName = Operator2FunName(FunctionName); +PrintStringInfo(' '+FunctionName,ReportFileName,'file','y'); + +if (FunctionName == 'OpLogAnd' | FunctionName=='OpLogOr') + NInArg = 0; + NOutArg = 0; + InArg=[]; + //RhsField = AST_PopASTStack(); + //PrintStringInfo('hello'+RhsField,ReportFileName,'file','y'); + //RhsField = AST_PopASTStack(); + return ; +end // ------------------------------ // --- Read input parameters. --- diff --git a/2.3-1/macros/ASTManagement/AST_PopASTStack.bin b/2.3-1/macros/ASTManagement/AST_PopASTStack.bin Binary files differnew file mode 100644 index 00000000..f9b85d34 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_PopASTStack.bin diff --git a/2.3-1/macros/ASTManagement/AST_PushASTStack.bin b/2.3-1/macros/ASTManagement/AST_PushASTStack.bin Binary files differnew file mode 100644 index 00000000..8fcd563c --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_PushASTStack.bin diff --git a/2.3-1/macros/ASTManagement/AST_ReadASTHeader.bin b/2.3-1/macros/ASTManagement/AST_ReadASTHeader.bin Binary files differnew file mode 100644 index 00000000..614231c4 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_ReadASTHeader.bin diff --git a/2.3-1/macros/ASTManagement/AST_ReadEqualRhsNames.bin b/2.3-1/macros/ASTManagement/AST_ReadEqualRhsNames.bin Binary files differnew file mode 100644 index 00000000..a131c498 --- /dev/null +++ b/2.3-1/macros/ASTManagement/AST_ReadEqualRhsNames.bin diff --git a/2.3-1/macros/ASTManagement/GenOutArgNames.bin b/2.3-1/macros/ASTManagement/GenOutArgNames.bin Binary files differnew file mode 100644 index 00000000..2ebce86c --- /dev/null +++ b/2.3-1/macros/ASTManagement/GenOutArgNames.bin diff --git a/2.3-1/macros/ASTManagement/GenOutArgNames.sci b/2.3-1/macros/ASTManagement/GenOutArgNames.sci index 0e683835..7b62c794 100644 --- a/2.3-1/macros/ASTManagement/GenOutArgNames.sci +++ b/2.3-1/macros/ASTManagement/GenOutArgNames.sci @@ -32,6 +32,12 @@ SCI2CNInArgCheck(argn(2),9,9); nxtscifunname = SharedInfo.NextSCIFunName; nxtscifunnumber = SharedInfo.NextSCIFunNumber; ReportFileName = FileInfo.Funct(nxtscifunnumber).ReportFileName; + + +global SCI2CSTACK +global StackPosition; +global STACKDEDUG + // #RNU_RES_B PrintStringInfo(' Generating Out Arg names.',ReportFileName,'file','y'); // #RNU_RES_E @@ -43,47 +49,69 @@ OutArg = OldOutArg; // --------------------------------------------------------------------------------------- // At this step only the name of the output arguments can be generated. --- //#RNU_RES_E -if (NLhsArg > 0) - //#RNU_RES_B - // Use the equal Lhs names. - PrintStringInfo('Using Equal Lhs names.',ReportFileName,'file','y'); - //#RNU_RES_E - if (NLhsArg ~= NOutArg) - error(9999, 'NLhsArg='+string(NLhsArg)+' must be equal to NOutArg='+string(NOutArg)+'.'); - end - for counteroutputargs = 1:NOutArg - OutArg(counteroutputargs).Name=LhsArg(counteroutputargs).Name; - OutArg(counteroutputargs).Scope=LhsArg(counteroutputargs).Scope; - end +if (FunctionName ~= 'OpLogGt' & FunctionName ~= 'OpLogLt' & FunctionName ~= 'OpLogGe' & FunctionName ~= 'OpLogLe' & FunctionName ~= 'OpLogNe' & FunctionName ~= 'OpLogEq') + if (NLhsArg > 0) + //#RNU_RES_B + // Use the equal Lhs names. + PrintStringInfo('Using Equal Lhs names.',ReportFileName,'file','y'); + //#RNU_RES_E + if (NLhsArg ~= NOutArg) + error(9999, 'NLhsArg='+string(NLhsArg)+' must be equal to NOutArg='+string(NOutArg)+'.'); + end + for counteroutputargs = 1:NOutArg + OutArg(counteroutputargs).Name=LhsArg(counteroutputargs).Name; + OutArg(counteroutputargs).Scope=LhsArg(counteroutputargs).Scope; + end + else + //#RNU_RES_B + // Generate temporary variables. + PrintStringInfo('Generating temporary variables.',ReportFileName,'file','y'); + //#RNU_RES_E + if ((sum(mtlb_strcmp(FunctionName,SharedInfo.Annotations.DataPrec)) > 0) & ... + (SharedInfo.SkipNextPrec == 1)) + //#RNU_RES_B + PrintStringInfo(' Skipping code generating because already generated in the previous function.',ReportFileName,'file','y'); + //#RNU_RES_E + for counteroutputargs = 1:NOutArg + OutArg(counteroutputargs).Name = InArg(counteroutputargs).Name; + end + elseif (mtlb_strcmp(FunctionName,'OpEqual')) + // do nothing. + //NUT: verifica questa parte di codice. e' sicuro che se ho equal gli oldoutarg contengono gia' il nome? + else + for counteroutputargs = 1:NOutArg + if ((SharedInfo.ASTReader.EnableTempVarsReuse == 1) & ... + (length(SharedInfo.ASTReader.ReusableTempVars) > 0)) + TmpOutArgName = strcat([SharedInfo.ASTReader.TempVarsName,string(SharedInfo.ASTReader.ReusableTempVars(1))]); + SharedInfo.ASTReader.ReusableTempVars = SharedInfo.ASTReader.ReusableTempVars(2:$); + else + SharedInfo.ASTReader.UsedTempVars = SharedInfo.ASTReader.UsedTempVars + 1; + TmpOutArgName = strcat([SharedInfo.ASTReader.TempVarsName,string(SharedInfo.ASTReader.UsedTempVars)]); + end + OutArg(counteroutputargs).Name=TmpOutArgName; + end + end + end else - //#RNU_RES_B - // Generate temporary variables. - PrintStringInfo('Generating temporary variables.',ReportFileName,'file','y'); - //#RNU_RES_E - if ((sum(mtlb_strcmp(FunctionName,SharedInfo.Annotations.DataPrec)) > 0) & ... - (SharedInfo.SkipNextPrec == 1)) - //#RNU_RES_B - PrintStringInfo(' Skipping code generating because already generated in the previous function.',ReportFileName,'file','y'); - //#RNU_RES_E - for counteroutputargs = 1:NOutArg - OutArg(counteroutputargs).Name = InArg(counteroutputargs).Name; - end - elseif (mtlb_strcmp(FunctionName,'OpEqual')) - // do nothing. - //NUT: verifica questa parte di codice. e' sicuro che se ho equal gli oldoutarg contengono gia' il nome? - else - for counteroutputargs = 1:NOutArg - if ((SharedInfo.ASTReader.EnableTempVarsReuse == 1) & ... - (length(SharedInfo.ASTReader.ReusableTempVars) > 0)) - TmpOutArgName = strcat([SharedInfo.ASTReader.TempVarsName,string(SharedInfo.ASTReader.ReusableTempVars(1))]); - SharedInfo.ASTReader.ReusableTempVars = SharedInfo.ASTReader.ReusableTempVars(2:$); - else - SharedInfo.ASTReader.UsedTempVars = SharedInfo.ASTReader.UsedTempVars + 1; - TmpOutArgName = strcat([SharedInfo.ASTReader.TempVarsName,string(SharedInfo.ASTReader.UsedTempVars)]); - end - OutArg(counteroutputargs).Name=TmpOutArgName; - end - end + for counterinputargs = 1:NInArg + tmppushstack=InArg(counterinputargs).Name; + PrintStringInfo(' Pushing in the AST stack: ""'+tmppushstack+'"".',ReportFileName,'file','y'); + AST_PushASTStack(tmppushstack); + if FunctionName=='OpLogGt' + AST_PushASTStack('>'); + elseif FunctionName=='OpLogGe' + AST_PushASTStack('>='); + elseif FunctionName=='OpLogLt' + AST_PushASTStack('<'); + elseif FunctionName=='OpLogLe' + AST_PushASTStack('<='); + elseif FunctionName=='OpLogEq' + AST_PushASTStack('=='); + elseif FunctionName=='OpLogNe' + AST_PushASTStack('!='); + end + end + s = AST_PopASTStack(); + PrintStringInfo(' Pushing in the AST stack: ""'+s+'"".',ReportFileName,'file','y'); end - endfunction diff --git a/2.3-1/macros/ASTManagement/Operator2FunName.bin b/2.3-1/macros/ASTManagement/Operator2FunName.bin Binary files differnew file mode 100644 index 00000000..884c99bc --- /dev/null +++ b/2.3-1/macros/ASTManagement/Operator2FunName.bin diff --git a/2.3-1/macros/ASTManagement/SciFile2ASTFile.bin b/2.3-1/macros/ASTManagement/SciFile2ASTFile.bin Binary files differnew file mode 100644 index 00000000..be8bc0d5 --- /dev/null +++ b/2.3-1/macros/ASTManagement/SciFile2ASTFile.bin diff --git a/2.3-1/macros/ASTManagement/_comment_string.bin b/2.3-1/macros/ASTManagement/_comment_string.bin Binary files differnew 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/_cste_string.bin b/2.3-1/macros/ASTManagement/_cste_string.bin Binary files differnew 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/_equal_string.bin b/2.3-1/macros/ASTManagement/_equal_string.bin Binary files differnew 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/_for_string.bin b/2.3-1/macros/ASTManagement/_for_string.bin Binary files differnew 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/_funcall_string.bin b/2.3-1/macros/ASTManagement/_funcall_string.bin Binary files differnew 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/_ifthenel_string.bin b/2.3-1/macros/ASTManagement/_ifthenel_string.bin Binary files differnew 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/_ifthenelse_string.bin b/2.3-1/macros/ASTManagement/_ifthenelse_string.bin Binary files differnew file mode 100644 index 00000000..456ffadc --- /dev/null +++ b/2.3-1/macros/ASTManagement/_ifthenelse_string.bin diff --git a/2.3-1/macros/ASTManagement/_operatio_string.bin b/2.3-1/macros/ASTManagement/_operatio_string.bin Binary files differnew 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/_operation_string.bin b/2.3-1/macros/ASTManagement/_operation_string.bin Binary files differnew file mode 100644 index 00000000..dfbeec96 --- /dev/null +++ b/2.3-1/macros/ASTManagement/_operation_string.bin diff --git a/2.3-1/macros/ASTManagement/_program_p.bin b/2.3-1/macros/ASTManagement/_program_p.bin Binary files differnew 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_string.bin b/2.3-1/macros/ASTManagement/_program_string.bin Binary files differnew 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/_variable_string.bin b/2.3-1/macros/ASTManagement/_variable_string.bin Binary files differnew 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/_while_string.bin b/2.3-1/macros/ASTManagement/_while_string.bin Binary files differnew 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/lib b/2.3-1/macros/ASTManagement/lib Binary files differindex 67ea09be..42ffc2a7 100644 --- a/2.3-1/macros/ASTManagement/lib +++ b/2.3-1/macros/ASTManagement/lib diff --git a/2.3-1/macros/ASTManagement/objectlist2string.bin b/2.3-1/macros/ASTManagement/objectlist2string.bin Binary files differnew file mode 100644 index 00000000..96159f22 --- /dev/null +++ b/2.3-1/macros/ASTManagement/objectlist2string.bin diff --git a/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin b/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin Binary files differnew file mode 100644 index 00000000..b4005914 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin diff --git a/2.3-1/macros/CCodeGeneration/C_ForExpression.bin b/2.3-1/macros/CCodeGeneration/C_ForExpression.bin Binary files differnew file mode 100644 index 00000000..1c3f6747 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_ForExpression.bin diff --git a/2.3-1/macros/CCodeGeneration/C_Funcall.bin b/2.3-1/macros/CCodeGeneration/C_Funcall.bin Binary files differnew file mode 100644 index 00000000..80fda7c4 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_Funcall.bin diff --git a/2.3-1/macros/CCodeGeneration/C_GenDeclarations.bin b/2.3-1/macros/CCodeGeneration/C_GenDeclarations.bin Binary files differnew file mode 100644 index 00000000..c3b36009 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_GenDeclarations.bin diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateFunName.bin b/2.3-1/macros/CCodeGeneration/C_GenerateFunName.bin Binary files differnew file mode 100644 index 00000000..1b723f16 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_GenerateFunName.bin diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateLaunchScript.bin b/2.3-1/macros/CCodeGeneration/C_GenerateLaunchScript.bin Binary files differnew file mode 100644 index 00000000..587c1547 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_GenerateLaunchScript.bin diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin Binary files differnew file mode 100644 index 00000000..cea86411 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile_msvc.bin b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile_msvc.bin Binary files differnew file mode 100644 index 00000000..838c674e --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile_msvc.bin diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateSCI2CHeader.bin b/2.3-1/macros/CCodeGeneration/C_GenerateSCI2CHeader.bin Binary files differnew file mode 100644 index 00000000..2e02cae4 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_GenerateSCI2CHeader.bin diff --git a/2.3-1/macros/CCodeGeneration/C_IfElseBlocks.bin b/2.3-1/macros/CCodeGeneration/C_IfElseBlocks.bin Binary files differnew file mode 100644 index 00000000..332e89bf --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_IfElseBlocks.bin diff --git a/2.3-1/macros/CCodeGeneration/C_IfExpression.bin b/2.3-1/macros/CCodeGeneration/C_IfExpression.bin Binary files differnew file mode 100644 index 00000000..b1dc7370 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_IfExpression.bin diff --git a/2.3-1/macros/CCodeGeneration/C_IfExpression.sci b/2.3-1/macros/CCodeGeneration/C_IfExpression.sci index 48a05383..c723d95a 100644 --- a/2.3-1/macros/CCodeGeneration/C_IfExpression.sci +++ b/2.3-1/macros/CCodeGeneration/C_IfExpression.sci @@ -1,4 +1,4 @@ -function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,SharedInfo) +function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,Op,NOp,ASTIfExpType,FileInfo,SharedInfo) // function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,SharedInfo) // ----------------------------------------------------------------- // //NUT: add description here @@ -19,12 +19,16 @@ function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo, // ------------------------------ // --- Check input arguments. --- // ------------------------------ -SCI2CNInArgCheck(argn(2),5,5); +//SCI2CNInArgCheck(argn(4),7,7); + +//global SCI2CSTACK +//global StackPosition; +//global STACKDEDUG // --- Check NIfCondArg value. --- -if ((NIfCondArg ~= 1) & (ASTIfExpType~='else')) - error(9999, 'Cannot manage ""if/elseif"" with a number of condition variables not equal to 1.'); -end +//if ((NIfCondArg ~= 1) & (ASTIfExpType~='else')) + // error(9999, 'Cannot manage ""if/elseif"" with a number of condition variables not equal to 1.'); +//end // ----------------------- // --- Initialization. --- @@ -37,7 +41,7 @@ CPass1FileName = FileInfo.Funct(nxtscifunnumber).CPass1FileName; // #RNU_RES_B PrintStringInfo(' ',ReportFileName,'file','y'); -PrintStringInfo('***Generating C code***',ReportFileName,'file','y'); +PrintStringInfo('***Generating C code***'+ string(NIfCondArg),ReportFileName,'file','y'); // #RNU_RES_E // --------------------------- // --- End Initialization. --- @@ -66,10 +70,23 @@ if SCI2Cstrncmps1size(ASTIfExpType,'else') SharedInfo = C_IfElseBlocks(FileInfo,SharedInfo,'out'); end +i=1; +k=1; CCall =''; CCall = CCall+CFunName; if (ASTIfExpType~='else') - CCall = CCall+'('+IfCondArg(1)+')'; + CCall = CCall+'('; + while i <= NIfCondArg + CCall = CCall + IfCondArg(i) + ' '; + //d = modulo(i,3); + //PrintStringInfo(' '+string(i)+string(d),'file','y'); + if (modulo(i,3)==0 & i<>NIfCondArg) + CCall = CCall + Op(k) + ' '; + k = k + 1; + end + i = i + 1; + end + CCall = CCall+')'; end PrintStringInfo(' '+CCall,ReportFileName,'file','y'); PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y'); diff --git a/2.3-1/macros/CCodeGeneration/C_IndentBlanks.bin b/2.3-1/macros/CCodeGeneration/C_IndentBlanks.bin Binary files differnew file mode 100644 index 00000000..77bfaebc --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_IndentBlanks.bin diff --git a/2.3-1/macros/CCodeGeneration/C_InitHeader.bin b/2.3-1/macros/CCodeGeneration/C_InitHeader.bin Binary files differnew file mode 100644 index 00000000..567822c0 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_InitHeader.bin diff --git a/2.3-1/macros/CCodeGeneration/C_MemAllocOutTempVars.bin b/2.3-1/macros/CCodeGeneration/C_MemAllocOutTempVars.bin Binary files differnew file mode 100644 index 00000000..443ad3c1 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_MemAllocOutTempVars.bin diff --git a/2.3-1/macros/CCodeGeneration/C_SCI2CHeader.bin b/2.3-1/macros/CCodeGeneration/C_SCI2CHeader.bin Binary files differnew file mode 100644 index 00000000..1d3e6182 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_SCI2CHeader.bin diff --git a/2.3-1/macros/CCodeGeneration/C_Type.bin b/2.3-1/macros/CCodeGeneration/C_Type.bin Binary files differnew file mode 100644 index 00000000..7b5bf444 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_Type.bin diff --git a/2.3-1/macros/CCodeGeneration/C_WhileExpression.bin b/2.3-1/macros/CCodeGeneration/C_WhileExpression.bin Binary files differnew file mode 100644 index 00000000..5e426505 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_WhileExpression.bin diff --git a/2.3-1/macros/CCodeGeneration/C_WhileExpression.sci b/2.3-1/macros/CCodeGeneration/C_WhileExpression.sci index edd2830e..d7cf70ec 100644 --- a/2.3-1/macros/CCodeGeneration/C_WhileExpression.sci +++ b/2.3-1/macros/CCodeGeneration/C_WhileExpression.sci @@ -1,4 +1,4 @@ -function SharedInfo = C_WhileExpression(FileInfo,SharedInfo) +function SharedInfo = C_WhileExpression(IfCondArg,NIfCondArg,Op,NOp,FileInfo,SharedInfo) // function SharedInfo = C_WhileExpression(FileInfo,SharedInfo) // ----------------------------------------------------------------- // //NUT: add description here @@ -19,7 +19,7 @@ function SharedInfo = C_WhileExpression(FileInfo,SharedInfo) // ------------------------------ // --- Check input arguments. --- // ------------------------------ -SCI2CNInArgCheck(argn(2),2,2); +//SCI2CNInArgCheck(argn(2),2,2); // ----------------------- // --- Initialization. --- @@ -63,7 +63,7 @@ for cntstr = 1:NumCStrings // Epilogue if (length(C_Strings(cntstr)) == 0) C_Strings(cntstr) = ' '; // RNU for Bruno: If I don't do that I get a PrintStringInfo error related to mputstr. - // Function not defined for given argument type(s),
+ // Function not defined for given argument type(s), // check arguments or define function %0_mputstr for overloading. end PrintStringInfo(C_Strings(cntstr),CPass1WhileEpilFileName ,'file','y','n'); @@ -76,7 +76,27 @@ PrintStringInfo('}',CPass1WhileEpilFileName ,'file','y'); // ------------------------------ // --- Insert for expression. --- // ------------------------------ -CCall = 'while('+SharedInfo.WhileExpr.CondVar+')'; +//CCall = 'while('+SharedInfo.WhileExpr.CondVar+')'; +//PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y'); + +i=1; +k=1; +CCall =''; +CCall = CCall+'while'; + CCall = CCall+'('; + while i <= NIfCondArg + CCall = CCall + IfCondArg(i) + ' '; + //d = modulo(i,3); + //PrintStringInfo(' '+string(i)+string(d),'file','y'); + if (modulo(i,3)==0 & i<>NIfCondArg) + CCall = CCall + Op(k) + ' '; + k = k + 1; + end + i = i + 1; + end + CCall = CCall+')'; + +PrintStringInfo(' '+CCall,ReportFileName,'file','y'); PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y'); // ------------------- diff --git a/2.3-1/macros/CCodeGeneration/GenCFunDatFiles.bin b/2.3-1/macros/CCodeGeneration/GenCFunDatFiles.bin Binary files differnew file mode 100644 index 00000000..6a374f5b --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/GenCFunDatFiles.bin diff --git a/2.3-1/macros/CCodeGeneration/GetClsFileName.bin b/2.3-1/macros/CCodeGeneration/GetClsFileName.bin Binary files differnew file mode 100644 index 00000000..dda02933 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/GetClsFileName.bin diff --git a/2.3-1/macros/CCodeGeneration/GetClsFileName.sci b/2.3-1/macros/CCodeGeneration/GetClsFileName.sci index 46f08201..d92a431c 100644 --- a/2.3-1/macros/CCodeGeneration/GetClsFileName.sci +++ b/2.3-1/macros/CCodeGeneration/GetClsFileName.sci @@ -45,6 +45,7 @@ if SCI2Cfileexist(FileInfo.USER2CLibCAnnFun,tmpannfilename) // #RNU_RES_B // It is a C function of the USER2C library. // #RNU_RES_E + PrintStringInfo('cUser2c',ReportFileName,'file','y'); FlagFoundAnnFile = 1; AnnFileName = fullfile(FileInfo.USER2CLibCAnnFun,tmpannfilename); SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); @@ -53,6 +54,7 @@ elseif SCI2Cfileexist(FileInfo.USER2CLibSCIAnnFun,tmpannfilename) // #RNU_RES_B // It is a scilab function of the USER2C library. // #RNU_RES_E + PrintStringInfo('fUser2c',ReportFileName,'file','y'); FlagFoundAnnFile = 1; AnnFileName = fullfile(FileInfo.USER2CLibSCIAnnFun,tmpannfilename); SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); @@ -61,6 +63,7 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibCAnnFun,tmpannfilename)) // #RNU_RES_B // It is a C function of the SCI2C library. // #RNU_RES_E + PrintStringInfo('csci2c',ReportFileName,'file','y'); FlagFoundAnnFile = 1; AnnFileName = fullfile(FileInfo.SCI2CLibCAnnFun,tmpannfilename); SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); @@ -69,6 +72,7 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename)) // #RNU_RES_B // It is a scilab function of the SCI2C library. // #RNU_RES_E + PrintStringInfo('fsci2c',ReportFileName,'file','y'); FlagFoundAnnFile = 1; AnnFileName = fullfile(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename); SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); diff --git a/2.3-1/macros/CCodeGeneration/GetSymbolDimension.bin b/2.3-1/macros/CCodeGeneration/GetSymbolDimension.bin Binary files differnew file mode 100644 index 00000000..5c73f435 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/GetSymbolDimension.bin diff --git a/2.3-1/macros/CCodeGeneration/GetWhileCondVariable.bin b/2.3-1/macros/CCodeGeneration/GetWhileCondVariable.bin Binary files differnew file mode 100644 index 00000000..6815fb4b --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/GetWhileCondVariable.bin diff --git a/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.bin b/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.bin Binary files differnew file mode 100644 index 00000000..084ab085 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.bin diff --git a/2.3-1/macros/CCodeGeneration/Sci2AnnotationFile.bin b/2.3-1/macros/CCodeGeneration/Sci2AnnotationFile.bin Binary files differnew file mode 100644 index 00000000..95fe5611 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/Sci2AnnotationFile.bin diff --git a/2.3-1/macros/CCodeGeneration/lib b/2.3-1/macros/CCodeGeneration/lib Binary files differindex 2db4b8c8..b62a6c72 100644 --- a/2.3-1/macros/CCodeGeneration/lib +++ b/2.3-1/macros/CCodeGeneration/lib diff --git a/2.3-1/macros/ErrorMessages/EM_NanSize.bin b/2.3-1/macros/ErrorMessages/EM_NanSize.bin Binary files differnew file mode 100644 index 00000000..d0ad584b --- /dev/null +++ b/2.3-1/macros/ErrorMessages/EM_NanSize.bin diff --git a/2.3-1/macros/ErrorMessages/EM_UnknownStep.bin b/2.3-1/macros/ErrorMessages/EM_UnknownStep.bin Binary files differnew file mode 100644 index 00000000..57a2b4d7 --- /dev/null +++ b/2.3-1/macros/ErrorMessages/EM_UnknownStep.bin diff --git a/2.3-1/macros/ErrorMessages/EM_ZeroSize.bin b/2.3-1/macros/ErrorMessages/EM_ZeroSize.bin Binary files differnew file mode 100644 index 00000000..f8d2830f --- /dev/null +++ b/2.3-1/macros/ErrorMessages/EM_ZeroSize.bin diff --git a/2.3-1/macros/ErrorMessages/lib b/2.3-1/macros/ErrorMessages/lib Binary files differindex 0a9f8913..dc2a3386 100644 --- a/2.3-1/macros/ErrorMessages/lib +++ b/2.3-1/macros/ErrorMessages/lib diff --git a/2.3-1/macros/FunctionAnnotation/FA_ADD.bin b/2.3-1/macros/FunctionAnnotation/FA_ADD.bin Binary files differnew file mode 100644 index 00000000..6c810828 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_ADD.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_DIV.bin b/2.3-1/macros/FunctionAnnotation/FA_DIV.bin Binary files differnew file mode 100644 index 00000000..6e6708fe --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_DIV.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin Binary files differnew file mode 100644 index 00000000..fa48e833 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin Binary files differnew file mode 100644 index 00000000..ff29181c --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci index d11e3cee..3fadd1f2 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci @@ -52,7 +52,7 @@ FunSizeAnnot = ''; // ---------------------------------------------
// --- Open the .sci file (read only). ---
inclsfid = SCI2COpenFileRead(SCI2CClassFileName);
-
+PrintStringInfo(' '+string(inclsfid),ReportFileName,'file','y');
// #RNU_RES_B
// --- Loop over the lines of the input file. ---
// Position file pointer to the desired NInArg/NOutArg section,
@@ -212,5 +212,6 @@ mclose(inclsfid); // -------------------------------------------------
// --- End Read the annotations of the function. ---
// -------------------------------------------------
+PrintStringInfo(' end of annotation '+string(NOutArg_mod),ReportFileName,'file','y');
endfunction
diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin Binary files differnew file mode 100644 index 00000000..89c0d1d3 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin b/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin Binary files differnew file mode 100644 index 00000000..77397e01 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_INT.bin b/2.3-1/macros/FunctionAnnotation/FA_INT.bin Binary files differnew file mode 100644 index 00000000..edf9bb84 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_INT.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_MAX.bin b/2.3-1/macros/FunctionAnnotation/FA_MAX.bin Binary files differnew file mode 100644 index 00000000..a9debbab --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_MAX.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_MIN.bin b/2.3-1/macros/FunctionAnnotation/FA_MIN.bin Binary files differnew file mode 100644 index 00000000..cc9bd02e --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_MIN.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_MUL.bin b/2.3-1/macros/FunctionAnnotation/FA_MUL.bin Binary files differnew file mode 100644 index 00000000..8b674c21 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_MUL.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_REAL.bin Binary files differnew file mode 100644 index 00000000..ed68eb74 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_REAL.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin Binary files differnew file mode 100644 index 00000000..292a6193 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin Binary files differnew file mode 100644 index 00000000..4b0b438f --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SUB.bin b/2.3-1/macros/FunctionAnnotation/FA_SUB.bin Binary files differnew file mode 100644 index 00000000..fdc52b4d --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SUB.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin Binary files differnew file mode 100644 index 00000000..c01ff59d --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin Binary files differnew file mode 100644 index 00000000..00834df4 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin Binary files differnew file mode 100644 index 00000000..a3b34afc --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin Binary files differnew file mode 100644 index 00000000..76748237 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin Binary files differnew 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_DEC2BIN.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin Binary files differnew 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_DEC2HEX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin Binary files differnew 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_DEC2OCT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin Binary files differnew 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_DIFF.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin Binary files differnew file mode 100644 index 00000000..08d66c13 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin Binary files differnew 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_FROM_VAL.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin Binary files differnew file mode 100644 index 00000000..a06f3b16 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin Binary files differnew file mode 100644 index 00000000..60cb9d4e --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin Binary files differnew file mode 100644 index 00000000..8abfa39b --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin Binary files differnew file mode 100644 index 00000000..843fb2ce --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin Binary files differnew file mode 100644 index 00000000..b936e29c --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin Binary files differnew file mode 100644 index 00000000..90e50348 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin Binary files differnew file mode 100644 index 00000000..be3e89ac --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin Binary files differnew file mode 100644 index 00000000..767385a3 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin Binary files differnew file mode 100644 index 00000000..822cb5e8 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin Binary files differnew file mode 100644 index 00000000..2af7e390 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin Binary files differnew file mode 100644 index 00000000..72d6e23d --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin Binary files differnew file mode 100644 index 00000000..f060e87e --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin Binary files differnew file mode 100644 index 00000000..6be9a457 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin Binary files differnew file mode 100644 index 00000000..feb8122d --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin Binary files differnew file mode 100644 index 00000000..e4419128 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin Binary files differnew file mode 100644 index 00000000..afe431b3 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin Binary files differnew file mode 100644 index 00000000..87d2d5bf --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin Binary files differnew file mode 100644 index 00000000..c3a1d88c --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin Binary files differnew file mode 100644 index 00000000..80216050 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin Binary files differnew file mode 100644 index 00000000..417fe265 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin Binary files differnew file mode 100644 index 00000000..6c9f9bf0 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin Binary files differnew file mode 100644 index 00000000..417a9195 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin Binary files differnew file mode 100644 index 00000000..af6c2a8e --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin Binary files differnew file mode 100644 index 00000000..deac97df --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin Binary files differnew file mode 100644 index 00000000..da84349d --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin Binary files differnew file mode 100644 index 00000000..b45ac592 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin Binary files differnew file mode 100644 index 00000000..6d55e274 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin Binary files differnew file mode 100644 index 00000000..14bb17f9 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin Binary files differnew file mode 100644 index 00000000..2f28cb62 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin Binary files differnew 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_ROW_COLUMN_CAT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin Binary files differnew file mode 100644 index 00000000..3b0c0b78 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin Binary files differnew file mode 100644 index 00000000..f5f1a236 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin Binary files differnew file mode 100644 index 00000000..e5d8e650 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin Binary files differnew file mode 100644 index 00000000..1d68a2e6 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin Binary files differnew file mode 100644 index 00000000..d3897f7d --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_C.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_C.bin Binary files differnew file mode 100644 index 00000000..d13d92ca --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_C.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin Binary files differnew file mode 100644 index 00000000..3400b2af --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin Binary files differnew file mode 100644 index 00000000..a7327099 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_D.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_D.bin Binary files differnew file mode 100644 index 00000000..12293dab --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_D.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_I.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_I.bin Binary files differnew file mode 100644 index 00000000..503be40b --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_I.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin Binary files differnew file mode 100644 index 00000000..fba4305a --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin Binary files differnew file mode 100644 index 00000000..f67d7485 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin Binary files differnew file mode 100644 index 00000000..099ea1ba --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin Binary files differnew file mode 100644 index 00000000..60293a1d --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin Binary files differnew file mode 100644 index 00000000..7e54122a --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_S.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_S.bin Binary files differnew file mode 100644 index 00000000..1419e461 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_S.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin Binary files differnew file mode 100644 index 00000000..dc455ca6 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin Binary files differnew file mode 100644 index 00000000..508db417 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin Binary files differnew file mode 100644 index 00000000..87e18d54 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin Binary files differnew file mode 100644 index 00000000..6c371723 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib Binary files differindex f02997b0..600d25dc 100644 --- a/2.3-1/macros/FunctionAnnotation/lib +++ b/2.3-1/macros/FunctionAnnotation/lib diff --git a/2.3-1/macros/FunctionList/FL_ExistCFunction.bin b/2.3-1/macros/FunctionList/FL_ExistCFunction.bin Binary files differnew file mode 100644 index 00000000..1c85aa21 --- /dev/null +++ b/2.3-1/macros/FunctionList/FL_ExistCFunction.bin diff --git a/2.3-1/macros/FunctionList/FL_ExtractFuncList.bin b/2.3-1/macros/FunctionList/FL_ExtractFuncList.bin Binary files differnew file mode 100644 index 00000000..ec74708d --- /dev/null +++ b/2.3-1/macros/FunctionList/FL_ExtractFuncList.bin diff --git a/2.3-1/macros/FunctionList/FL_GetFunctionClass.bin b/2.3-1/macros/FunctionList/FL_GetFunctionClass.bin Binary files differnew file mode 100644 index 00000000..faa210e6 --- /dev/null +++ b/2.3-1/macros/FunctionList/FL_GetFunctionClass.bin diff --git a/2.3-1/macros/FunctionList/FL_InOutArgs2CFunNames.bin b/2.3-1/macros/FunctionList/FL_InOutArgs2CFunNames.bin Binary files differnew file mode 100644 index 00000000..09d5eb5e --- /dev/null +++ b/2.3-1/macros/FunctionList/FL_InOutArgs2CFunNames.bin diff --git a/2.3-1/macros/FunctionList/FL_UpdateConverted.bin b/2.3-1/macros/FunctionList/FL_UpdateConverted.bin Binary files differnew file mode 100644 index 00000000..73f2cf02 --- /dev/null +++ b/2.3-1/macros/FunctionList/FL_UpdateConverted.bin diff --git a/2.3-1/macros/FunctionList/FL_UpdateToBeConv.bin b/2.3-1/macros/FunctionList/FL_UpdateToBeConv.bin Binary files differnew file mode 100644 index 00000000..44b5803f --- /dev/null +++ b/2.3-1/macros/FunctionList/FL_UpdateToBeConv.bin diff --git a/2.3-1/macros/FunctionList/lib b/2.3-1/macros/FunctionList/lib Binary files differindex 2bbf0cbe..30a44eee 100644 --- a/2.3-1/macros/FunctionList/lib +++ b/2.3-1/macros/FunctionList/lib diff --git a/2.3-1/macros/GeneralFunctions/Array2String.bin b/2.3-1/macros/GeneralFunctions/Array2String.bin Binary files differnew file mode 100644 index 00000000..c40274de --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/Array2String.bin diff --git a/2.3-1/macros/GeneralFunctions/ConvertPathMat2C.bin b/2.3-1/macros/GeneralFunctions/ConvertPathMat2C.bin Binary files differnew file mode 100644 index 00000000..7dd14227 --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/ConvertPathMat2C.bin diff --git a/2.3-1/macros/GeneralFunctions/File2StringArray.bin b/2.3-1/macros/GeneralFunctions/File2StringArray.bin Binary files differnew file mode 100644 index 00000000..1b050f4e --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/File2StringArray.bin diff --git a/2.3-1/macros/GeneralFunctions/FunName2SciFileName.bin b/2.3-1/macros/GeneralFunctions/FunName2SciFileName.bin Binary files differnew file mode 100644 index 00000000..c3cb5387 --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/FunName2SciFileName.bin diff --git a/2.3-1/macros/GeneralFunctions/IsNanSize.bin b/2.3-1/macros/GeneralFunctions/IsNanSize.bin Binary files differnew file mode 100644 index 00000000..71735125 --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/IsNanSize.bin diff --git a/2.3-1/macros/GeneralFunctions/KeyStr2FileStrPos.bin b/2.3-1/macros/GeneralFunctions/KeyStr2FileStrPos.bin Binary files differnew file mode 100644 index 00000000..5c6cfaff --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/KeyStr2FileStrPos.bin diff --git a/2.3-1/macros/GeneralFunctions/PrintStepInfo.bin b/2.3-1/macros/GeneralFunctions/PrintStepInfo.bin Binary files differnew file mode 100644 index 00000000..98208f8f --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/PrintStepInfo.bin diff --git a/2.3-1/macros/GeneralFunctions/PrintStringInfo.bin b/2.3-1/macros/GeneralFunctions/PrintStringInfo.bin Binary files differnew file mode 100644 index 00000000..c936b207 --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/PrintStringInfo.bin diff --git a/2.3-1/macros/GeneralFunctions/ReadStringCard.bin b/2.3-1/macros/GeneralFunctions/ReadStringCard.bin Binary files differnew file mode 100644 index 00000000..f9b28283 --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/ReadStringCard.bin diff --git a/2.3-1/macros/GeneralFunctions/SCI2CCreateDir.bin b/2.3-1/macros/GeneralFunctions/SCI2CCreateDir.bin Binary files differnew file mode 100644 index 00000000..007b6fb8 --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/SCI2CCreateDir.bin diff --git a/2.3-1/macros/GeneralFunctions/SCI2CFindFile.bin b/2.3-1/macros/GeneralFunctions/SCI2CFindFile.bin Binary files differnew file mode 100644 index 00000000..fe8e783d --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/SCI2CFindFile.bin diff --git a/2.3-1/macros/GeneralFunctions/SCI2CNInArgCheck.bin b/2.3-1/macros/GeneralFunctions/SCI2CNInArgCheck.bin Binary files differnew file mode 100644 index 00000000..8d96b6e9 --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/SCI2CNInArgCheck.bin diff --git a/2.3-1/macros/GeneralFunctions/SCI2COpenFileRead.bin b/2.3-1/macros/GeneralFunctions/SCI2COpenFileRead.bin Binary files differnew file mode 100644 index 00000000..f3f6a5e3 --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/SCI2COpenFileRead.bin diff --git a/2.3-1/macros/GeneralFunctions/SCI2COpenFileWrite.bin b/2.3-1/macros/GeneralFunctions/SCI2COpenFileWrite.bin Binary files differnew file mode 100644 index 00000000..0287b3aa --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/SCI2COpenFileWrite.bin diff --git a/2.3-1/macros/GeneralFunctions/SCI2CTemplate.bin b/2.3-1/macros/GeneralFunctions/SCI2CTemplate.bin Binary files differnew file mode 100644 index 00000000..c485b457 --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/SCI2CTemplate.bin diff --git a/2.3-1/macros/GeneralFunctions/SCI2Ccopyfile.bin b/2.3-1/macros/GeneralFunctions/SCI2Ccopyfile.bin Binary files differnew file mode 100644 index 00000000..e6d0a866 --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/SCI2Ccopyfile.bin diff --git a/2.3-1/macros/GeneralFunctions/SCI2Cfileexist.bin b/2.3-1/macros/GeneralFunctions/SCI2Cfileexist.bin Binary files differnew file mode 100644 index 00000000..524c8c42 --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/SCI2Cfileexist.bin diff --git a/2.3-1/macros/GeneralFunctions/SCI2Cflipud.bin b/2.3-1/macros/GeneralFunctions/SCI2Cflipud.bin Binary files differnew file mode 100644 index 00000000..baf71bb9 --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/SCI2Cflipud.bin diff --git a/2.3-1/macros/GeneralFunctions/SCI2Cmdelete.bin b/2.3-1/macros/GeneralFunctions/SCI2Cmdelete.bin Binary files differnew file mode 100644 index 00000000..67694b7f --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/SCI2Cmdelete.bin diff --git a/2.3-1/macros/GeneralFunctions/SCI2Cresize.bin b/2.3-1/macros/GeneralFunctions/SCI2Cresize.bin Binary files differnew file mode 100644 index 00000000..a909d306 --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/SCI2Cresize.bin diff --git a/2.3-1/macros/GeneralFunctions/SCI2Cstring.bin b/2.3-1/macros/GeneralFunctions/SCI2Cstring.bin Binary files differnew file mode 100644 index 00000000..887482bb --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/SCI2Cstring.bin diff --git a/2.3-1/macros/GeneralFunctions/SCI2Cstrncmp.bin b/2.3-1/macros/GeneralFunctions/SCI2Cstrncmp.bin Binary files differnew file mode 100644 index 00000000..78ce9a1a --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/SCI2Cstrncmp.bin diff --git a/2.3-1/macros/GeneralFunctions/SCI2Cstrncmps1size.bin b/2.3-1/macros/GeneralFunctions/SCI2Cstrncmps1size.bin Binary files differnew file mode 100644 index 00000000..e9a45d96 --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/SCI2Cstrncmps1size.bin diff --git a/2.3-1/macros/GeneralFunctions/SizeInByte.bin b/2.3-1/macros/GeneralFunctions/SizeInByte.bin Binary files differnew file mode 100644 index 00000000..04c7a752 --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/SizeInByte.bin diff --git a/2.3-1/macros/GeneralFunctions/dispina.bin b/2.3-1/macros/GeneralFunctions/dispina.bin Binary files differnew file mode 100644 index 00000000..25d03faf --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/dispina.bin diff --git a/2.3-1/macros/GeneralFunctions/filenamefprintf.bin b/2.3-1/macros/GeneralFunctions/filenamefprintf.bin Binary files differnew file mode 100644 index 00000000..864a494d --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/filenamefprintf.bin diff --git a/2.3-1/macros/GeneralFunctions/float.bin b/2.3-1/macros/GeneralFunctions/float.bin Binary files differnew file mode 100644 index 00000000..fd0c449e --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/float.bin diff --git a/2.3-1/macros/GeneralFunctions/lib b/2.3-1/macros/GeneralFunctions/lib Binary files differindex e1d6f0fb..30d87791 100644 --- a/2.3-1/macros/GeneralFunctions/lib +++ b/2.3-1/macros/GeneralFunctions/lib diff --git a/2.3-1/macros/GeneralFunctions/squeezestrings.bin b/2.3-1/macros/GeneralFunctions/squeezestrings.bin Binary files differnew file mode 100644 index 00000000..11b97ec9 --- /dev/null +++ b/2.3-1/macros/GeneralFunctions/squeezestrings.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRADCSetup.bin b/2.3-1/macros/Hardware/AVR/AVRADCSetup.bin Binary files differnew file mode 100644 index 00000000..a1cbcf3c --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRADCSetup.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRDigitalIn.bin b/2.3-1/macros/Hardware/AVR/AVRDigitalIn.bin Binary files differnew file mode 100644 index 00000000..0fdfab82 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRDigitalIn.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRDigitalOut.bin b/2.3-1/macros/Hardware/AVR/AVRDigitalOut.bin Binary files differnew file mode 100644 index 00000000..7e56e466 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRDigitalOut.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRDigitalPortSetup.bin b/2.3-1/macros/Hardware/AVR/AVRDigitalPortSetup.bin Binary files differnew file mode 100644 index 00000000..cf96fbb1 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRDigitalPortSetup.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRDigitalSetup.bin b/2.3-1/macros/Hardware/AVR/AVRDigitalSetup.bin Binary files differnew file mode 100644 index 00000000..dec6eb2a --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRDigitalSetup.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRGetTimerValue.bin b/2.3-1/macros/Hardware/AVR/AVRGetTimerValue.bin Binary files differnew file mode 100644 index 00000000..1b883131 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRGetTimerValue.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM0SetDuty.bin b/2.3-1/macros/Hardware/AVR/AVRPWM0SetDuty.bin Binary files differnew file mode 100644 index 00000000..1518222d --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRPWM0SetDuty.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM0Setup.bin b/2.3-1/macros/Hardware/AVR/AVRPWM0Setup.bin Binary files differnew file mode 100644 index 00000000..08867048 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRPWM0Setup.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM1SetDuty.bin b/2.3-1/macros/Hardware/AVR/AVRPWM1SetDuty.bin Binary files differnew file mode 100644 index 00000000..79e4ab62 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRPWM1SetDuty.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM1Setup.bin b/2.3-1/macros/Hardware/AVR/AVRPWM1Setup.bin Binary files differnew file mode 100644 index 00000000..235cdba2 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRPWM1Setup.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM2SetDuty.bin b/2.3-1/macros/Hardware/AVR/AVRPWM2SetDuty.bin Binary files differnew file mode 100644 index 00000000..a1c7f3b2 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRPWM2SetDuty.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM2Setup.bin b/2.3-1/macros/Hardware/AVR/AVRPWM2Setup.bin Binary files differnew file mode 100644 index 00000000..66996c08 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRPWM2Setup.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRReadADC.bin b/2.3-1/macros/Hardware/AVR/AVRReadADC.bin Binary files differnew file mode 100644 index 00000000..25b45a83 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRReadADC.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRSleep.bin b/2.3-1/macros/Hardware/AVR/AVRSleep.bin Binary files differnew file mode 100644 index 00000000..e4b10d83 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRSleep.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRTimerSetup.bin b/2.3-1/macros/Hardware/AVR/AVRTimerSetup.bin Binary files differnew file mode 100644 index 00000000..775d718a --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRTimerSetup.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRUARTReceive.bin b/2.3-1/macros/Hardware/AVR/AVRUARTReceive.bin Binary files differnew file mode 100644 index 00000000..013036e3 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRUARTReceive.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRUARTSetup.bin b/2.3-1/macros/Hardware/AVR/AVRUARTSetup.bin Binary files differnew file mode 100644 index 00000000..82ec2911 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRUARTSetup.bin diff --git a/2.3-1/macros/Hardware/AVR/AVRUARTTransmit.bin b/2.3-1/macros/Hardware/AVR/AVRUARTTransmit.bin Binary files differnew file mode 100644 index 00000000..9e53d9a6 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRUARTTransmit.bin diff --git a/2.3-1/macros/Hardware/AVR/GetAVRSupportFunctions.bin b/2.3-1/macros/Hardware/AVR/GetAVRSupportFunctions.bin Binary files differnew file mode 100644 index 00000000..48ab5cd8 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/GetAVRSupportFunctions.bin diff --git a/2.3-1/macros/Hardware/AVR/GetPeripheral.bin b/2.3-1/macros/Hardware/AVR/GetPeripheral.bin Binary files differnew file mode 100644 index 00000000..b496bbb0 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/GetPeripheral.bin diff --git a/2.3-1/macros/Hardware/AVR/InsertPeripheralInList.bin b/2.3-1/macros/Hardware/AVR/InsertPeripheralInList.bin Binary files differnew file mode 100644 index 00000000..c49f4e04 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/InsertPeripheralInList.bin diff --git a/2.3-1/macros/Hardware/AVR/IsAVRSupportFunction.bin b/2.3-1/macros/Hardware/AVR/IsAVRSupportFunction.bin Binary files differnew file mode 100644 index 00000000..e2382308 --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/IsAVRSupportFunction.bin diff --git a/2.3-1/macros/Hardware/AVR/lib b/2.3-1/macros/Hardware/AVR/lib Binary files differindex 5c8f0da2..2b6d33d4 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/GetRPISupportFunctions.bin b/2.3-1/macros/Hardware/RasberryPi/GetRPISupportFunctions.bin Binary files differnew file mode 100644 index 00000000..a70999c0 --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/GetRPISupportFunctions.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/IsRPISupportFunction.bin b/2.3-1/macros/Hardware/RasberryPi/IsRPISupportFunction.bin Binary files differnew file mode 100644 index 00000000..11533d3e --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/IsRPISupportFunction.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_DelayMicro.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_DelayMicro.bin Binary files differnew file mode 100644 index 00000000..a4d32cb6 --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_DelayMicro.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_DelayMilli.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_DelayMilli.bin Binary files differnew file mode 100644 index 00000000..b6eeb30b --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_DelayMilli.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalIn.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalIn.bin Binary files differnew file mode 100644 index 00000000..f4c16f39 --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalIn.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalOut.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalOut.bin Binary files differnew file mode 100644 index 00000000..b7ad06e5 --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalOut.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalSetup.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalSetup.bin Binary files differnew file mode 100644 index 00000000..1ac5b582 --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalSetup.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_GetMicros.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_GetMicros.bin Binary files differnew file mode 100644 index 00000000..3e6c08fa --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_GetMicros.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_GetMillis.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_GetMillis.bin Binary files differnew file mode 100644 index 00000000..b9143650 --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_GetMillis.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetClock.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetClock.bin Binary files differnew file mode 100644 index 00000000..1efe0803 --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetClock.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetMode.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetMode.bin Binary files differnew file mode 100644 index 00000000..075d6e60 --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetMode.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetRange.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetRange.bin Binary files differnew file mode 100644 index 00000000..8ded2709 --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetRange.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMWrite.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMWrite.bin Binary files differnew file mode 100644 index 00000000..9957f3a4 --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMWrite.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_PinISR.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_PinISR.bin Binary files differnew file mode 100644 index 00000000..ddeff684 --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_PinISR.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialClose.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialClose.bin Binary files differnew file mode 100644 index 00000000..dce972dc --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialClose.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialFlush.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialFlush.bin Binary files differnew file mode 100644 index 00000000..2a3704d0 --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialFlush.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialGetChar.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialGetChar.bin Binary files differnew file mode 100644 index 00000000..928f28a3 --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialGetChar.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSendChar.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSendChar.bin Binary files differnew file mode 100644 index 00000000..7614ebcb --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSendChar.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSendData.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSendData.bin Binary files differnew file mode 100644 index 00000000..a3524a6c --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSendData.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSetup.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSetup.bin Binary files differnew file mode 100644 index 00000000..0128c27b --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSetup.bin diff --git a/2.3-1/macros/Hardware/RasberryPi/lib b/2.3-1/macros/Hardware/RasberryPi/lib Binary files differindex 9afd77da..c15f8e8b 100644 --- a/2.3-1/macros/Hardware/RasberryPi/lib +++ b/2.3-1/macros/Hardware/RasberryPi/lib diff --git a/2.3-1/macros/Hardware/RasberryPi/u16RPISerialDataAvail.bin b/2.3-1/macros/Hardware/RasberryPi/u16RPISerialDataAvail.bin Binary files differnew file mode 100644 index 00000000..3789bd6c --- /dev/null +++ b/2.3-1/macros/Hardware/RasberryPi/u16RPISerialDataAvail.bin diff --git a/2.3-1/macros/ImageProcessing/core/CV_CreateImage.bin b/2.3-1/macros/ImageProcessing/core/CV_CreateImage.bin Binary files differnew file mode 100644 index 00000000..d5aa3080 --- /dev/null +++ b/2.3-1/macros/ImageProcessing/core/CV_CreateImage.bin diff --git a/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.bin b/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.bin Binary files differnew file mode 100644 index 00000000..ede60e6f --- /dev/null +++ b/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.bin diff --git a/2.3-1/macros/ImageProcessing/core/lib b/2.3-1/macros/ImageProcessing/core/lib Binary files differindex 56053510..5ea86603 100644 --- a/2.3-1/macros/ImageProcessing/core/lib +++ b/2.3-1/macros/ImageProcessing/core/lib diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_LoadImage.bin b/2.3-1/macros/ImageProcessing/highgui/CV_LoadImage.bin Binary files differnew file mode 100644 index 00000000..f8e13375 --- /dev/null +++ b/2.3-1/macros/ImageProcessing/highgui/CV_LoadImage.bin diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.bin b/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.bin Binary files differnew file mode 100644 index 00000000..8d056bf1 --- /dev/null +++ b/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.bin diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.bin b/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.bin Binary files differnew file mode 100644 index 00000000..c4e00fc7 --- /dev/null +++ b/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.bin diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.bin b/2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.bin Binary files differnew file mode 100644 index 00000000..30a42f41 --- /dev/null +++ b/2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.bin diff --git a/2.3-1/macros/ImageProcessing/highgui/lib b/2.3-1/macros/ImageProcessing/highgui/lib Binary files differindex a46d5d87..b43eb00d 100644 --- a/2.3-1/macros/ImageProcessing/highgui/lib +++ b/2.3-1/macros/ImageProcessing/highgui/lib diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.bin Binary files differnew file mode 100644 index 00000000..26a58c0c --- /dev/null +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.bin diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Blur.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_Blur.bin Binary files differnew file mode 100644 index 00000000..9fc1af49 --- /dev/null +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Blur.bin diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Canny.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_Canny.bin Binary files differnew file mode 100644 index 00000000..df824781 --- /dev/null +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Canny.bin diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_CornerHarris.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_CornerHarris.bin Binary files differnew file mode 100644 index 00000000..291d3e4d --- /dev/null +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_CornerHarris.bin diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.bin Binary files differnew file mode 100644 index 00000000..eee1018f --- /dev/null +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.bin diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.bin Binary files differnew file mode 100644 index 00000000..3f2d2d99 --- /dev/null +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.bin diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_DistanceTransform.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_DistanceTransform.bin Binary files differnew file mode 100644 index 00000000..0955b5f0 --- /dev/null +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_DistanceTransform.bin diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Erode.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_Erode.bin Binary files differnew file mode 100644 index 00000000..33d42312 --- /dev/null +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Erode.bin diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.bin Binary files differnew file mode 100644 index 00000000..b1766626 --- /dev/null +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.bin diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_MedianBlur.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_MedianBlur.bin Binary files differnew file mode 100644 index 00000000..fdcd23ed --- /dev/null +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_MedianBlur.bin diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.bin Binary files differnew file mode 100644 index 00000000..c2ce1c60 --- /dev/null +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.bin diff --git a/2.3-1/macros/ImageProcessing/imgproc/lib b/2.3-1/macros/ImageProcessing/imgproc/lib Binary files differindex 4863059b..ac7252be 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/lib +++ b/2.3-1/macros/ImageProcessing/imgproc/lib diff --git a/2.3-1/macros/Scilab-Arduino/GenerateSetupFunction.bin b/2.3-1/macros/Scilab-Arduino/GenerateSetupFunction.bin Binary files differnew file mode 100644 index 00000000..0051630c --- /dev/null +++ b/2.3-1/macros/Scilab-Arduino/GenerateSetupFunction.bin diff --git a/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.bin b/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.bin Binary files differnew file mode 100644 index 00000000..fe9e2040 --- /dev/null +++ b/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.bin diff --git a/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.bin b/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.bin Binary files differnew file mode 100644 index 00000000..67f9fada --- /dev/null +++ b/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.bin diff --git a/2.3-1/macros/Scilab-Arduino/InsertSetupInList.bin b/2.3-1/macros/Scilab-Arduino/InsertSetupInList.bin Binary files differnew file mode 100644 index 00000000..29e37315 --- /dev/null +++ b/2.3-1/macros/Scilab-Arduino/InsertSetupInList.bin diff --git a/2.3-1/macros/Scilab-Arduino/IsArduinoFunction.bin b/2.3-1/macros/Scilab-Arduino/IsArduinoFunction.bin Binary files differnew file mode 100644 index 00000000..5dbfacad --- /dev/null +++ b/2.3-1/macros/Scilab-Arduino/IsArduinoFunction.bin diff --git a/2.3-1/macros/Scilab-Arduino/IsArduinoSetupFunction.bin b/2.3-1/macros/Scilab-Arduino/IsArduinoSetupFunction.bin Binary files differnew file mode 100644 index 00000000..8948d1a3 --- /dev/null +++ b/2.3-1/macros/Scilab-Arduino/IsArduinoSetupFunction.bin diff --git a/2.3-1/macros/Scilab-Arduino/lib b/2.3-1/macros/Scilab-Arduino/lib Binary files differindex 0304cade..21c7d5bf 100644 --- a/2.3-1/macros/Scilab-Arduino/lib +++ b/2.3-1/macros/Scilab-Arduino/lib diff --git a/2.3-1/macros/SymbolTable/ST_AnalyzeScope.bin b/2.3-1/macros/SymbolTable/ST_AnalyzeScope.bin Binary files differnew file mode 100644 index 00000000..7e727a04 --- /dev/null +++ b/2.3-1/macros/SymbolTable/ST_AnalyzeScope.bin diff --git a/2.3-1/macros/SymbolTable/ST_Del.bin b/2.3-1/macros/SymbolTable/ST_Del.bin Binary files differnew file mode 100644 index 00000000..c26e2e58 --- /dev/null +++ b/2.3-1/macros/SymbolTable/ST_Del.bin diff --git a/2.3-1/macros/SymbolTable/ST_FindPos.bin b/2.3-1/macros/SymbolTable/ST_FindPos.bin Binary files differnew file mode 100644 index 00000000..c7003f30 --- /dev/null +++ b/2.3-1/macros/SymbolTable/ST_FindPos.bin diff --git a/2.3-1/macros/SymbolTable/ST_Get.bin b/2.3-1/macros/SymbolTable/ST_Get.bin Binary files differnew file mode 100644 index 00000000..512e72b7 --- /dev/null +++ b/2.3-1/macros/SymbolTable/ST_Get.bin diff --git a/2.3-1/macros/SymbolTable/ST_GetInArgInfo.bin b/2.3-1/macros/SymbolTable/ST_GetInArgInfo.bin Binary files differnew file mode 100644 index 00000000..6eb16e37 --- /dev/null +++ b/2.3-1/macros/SymbolTable/ST_GetInArgInfo.bin diff --git a/2.3-1/macros/SymbolTable/ST_GetSymbolInfo.bin b/2.3-1/macros/SymbolTable/ST_GetSymbolInfo.bin Binary files differnew file mode 100644 index 00000000..b8a7cf74 --- /dev/null +++ b/2.3-1/macros/SymbolTable/ST_GetSymbolInfo.bin diff --git a/2.3-1/macros/SymbolTable/ST_InsForCntVars.bin b/2.3-1/macros/SymbolTable/ST_InsForCntVars.bin Binary files differnew file mode 100644 index 00000000..12882fc7 --- /dev/null +++ b/2.3-1/macros/SymbolTable/ST_InsForCntVars.bin diff --git a/2.3-1/macros/SymbolTable/ST_InsOutArg.bin b/2.3-1/macros/SymbolTable/ST_InsOutArg.bin Binary files differnew file mode 100644 index 00000000..ec9970cb --- /dev/null +++ b/2.3-1/macros/SymbolTable/ST_InsOutArg.bin diff --git a/2.3-1/macros/SymbolTable/ST_Load.bin b/2.3-1/macros/SymbolTable/ST_Load.bin Binary files differnew file mode 100644 index 00000000..f158c2b6 --- /dev/null +++ b/2.3-1/macros/SymbolTable/ST_Load.bin diff --git a/2.3-1/macros/SymbolTable/ST_MatchSymbol.bin b/2.3-1/macros/SymbolTable/ST_MatchSymbol.bin Binary files differnew file mode 100644 index 00000000..278560d0 --- /dev/null +++ b/2.3-1/macros/SymbolTable/ST_MatchSymbol.bin diff --git a/2.3-1/macros/SymbolTable/ST_Save.bin b/2.3-1/macros/SymbolTable/ST_Save.bin Binary files differnew file mode 100644 index 00000000..4aa50a20 --- /dev/null +++ b/2.3-1/macros/SymbolTable/ST_Save.bin diff --git a/2.3-1/macros/SymbolTable/ST_Set.bin b/2.3-1/macros/SymbolTable/ST_Set.bin Binary files differnew file mode 100644 index 00000000..cbd26274 --- /dev/null +++ b/2.3-1/macros/SymbolTable/ST_Set.bin diff --git a/2.3-1/macros/SymbolTable/lib b/2.3-1/macros/SymbolTable/lib Binary files differindex dbc603e2..4e2f0193 100644 --- a/2.3-1/macros/SymbolTable/lib +++ b/2.3-1/macros/SymbolTable/lib diff --git a/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin b/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin Binary files differnew file mode 100644 index 00000000..16ebab82 --- /dev/null +++ b/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin Binary files differnew file mode 100644 index 00000000..37cd5655 --- /dev/null +++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index f0a83604..bf7ef244 100644 --- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -844,6 +844,207 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
// -------------------
+// --- Class Isreal. ---
+// -------------------
+ClassName = 'Isreal';
+
+// --- 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');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+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+'d0',ClassFileName,'file','y');
+//PrintStringInfo('z0'+ArgSeparator+'d0',ClassFileName,'file','y');
+//PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'isreal';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+ClassName = 'gcd';
+
+// --- 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');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+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('u82'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+//PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'gcd';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+ClassName = 'nextpow2';
+
+// --- 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');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+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('u82'+ArgSeparator+'u80',ClassFileName,'file','y');
+//PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'nextpow2';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+
+ClassName = 'interp1';
+
+// --- 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');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+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');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+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');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+PrintStringInfo('OUT(1).SZ(1)= IN(3).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 4',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+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('u82'+ArgSeparator+'u80',ClassFileName,'file','y');
+//PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+//PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('d2d2d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('d2d2d2g2'+ArgSeparator+'d2',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 DCT. ---
+// -------------------
+ClassName = 'dct';
+
+// --- 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');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+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');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+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('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('z2d0'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('c2s0'+ArgSeparator+'c2',ClassFileName,'file','y');
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'dct';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+// -------------------
+// --- Class IDCT. ---
+// -------------------
+ClassName = 'idct';
+
+// --- 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');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+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('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'idct';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+
+// -------------------
// --- Class Sqrt. ---
// -------------------
ClassName = 'Sqrt';
@@ -7455,6 +7656,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2d2d2'+ArgSeparator+'d0',ClassFileName,'file','y');
PrintStringInfo('d2d2d0g2'+ArgSeparator+'d0',ClassFileName,'file','y');
//PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
//PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
@@ -7472,6 +7674,36 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+// --- Class Modk. ---
+// ------------------
+ClassName = 'Modk';
+
+// --- 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= ''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');
+
+// --- Function List Class. ---
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+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 = 'modk';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
//------------------------------------
//---- Class PRIMES --------------------
diff --git a/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin b/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin Binary files differnew file mode 100644 index 00000000..f7d2aa59 --- /dev/null +++ b/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin b/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin Binary files differnew file mode 100644 index 00000000..a8d47222 --- /dev/null +++ b/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin b/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin Binary files differnew file mode 100644 index 00000000..bc3bc873 --- /dev/null +++ b/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin b/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin Binary files differnew file mode 100644 index 00000000..7263830a --- /dev/null +++ b/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin b/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin Binary files differnew file mode 100644 index 00000000..c85aac6e --- /dev/null +++ b/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin b/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin Binary files differnew file mode 100644 index 00000000..c1ee9ec0 --- /dev/null +++ b/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin b/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin Binary files differnew file mode 100644 index 00000000..19402302 --- /dev/null +++ b/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin b/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin Binary files differnew file mode 100644 index 00000000..31238a31 --- /dev/null +++ b/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin diff --git a/2.3-1/macros/ToolInitialization/ManageNextConversion.bin b/2.3-1/macros/ToolInitialization/ManageNextConversion.bin Binary files differnew file mode 100644 index 00000000..bf43562a --- /dev/null +++ b/2.3-1/macros/ToolInitialization/ManageNextConversion.bin diff --git a/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin b/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin Binary files differnew file mode 100644 index 00000000..c13904d2 --- /dev/null +++ b/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin diff --git a/2.3-1/macros/ToolInitialization/doublecomplex.bin b/2.3-1/macros/ToolInitialization/doublecomplex.bin Binary files differnew file mode 100644 index 00000000..5e616f7c --- /dev/null +++ b/2.3-1/macros/ToolInitialization/doublecomplex.bin diff --git a/2.3-1/macros/ToolInitialization/floatcomplex.bin b/2.3-1/macros/ToolInitialization/floatcomplex.bin Binary files differnew file mode 100644 index 00000000..bd77a45f --- /dev/null +++ b/2.3-1/macros/ToolInitialization/floatcomplex.bin diff --git a/2.3-1/macros/ToolInitialization/lib b/2.3-1/macros/ToolInitialization/lib Binary files differindex 4d03bdc5..b7e8685b 100644 --- a/2.3-1/macros/ToolInitialization/lib +++ b/2.3-1/macros/ToolInitialization/lib diff --git a/2.3-1/macros/cb_sci2c_gui.bin b/2.3-1/macros/cb_sci2c_gui.bin Binary files differnew file mode 100644 index 00000000..bc691e45 --- /dev/null +++ b/2.3-1/macros/cb_sci2c_gui.bin diff --git a/2.3-1/macros/findDeps/Scilab2CDeps.bin b/2.3-1/macros/findDeps/Scilab2CDeps.bin Binary files differnew file mode 100644 index 00000000..ae162ecb --- /dev/null +++ b/2.3-1/macros/findDeps/Scilab2CDeps.bin diff --git a/2.3-1/macros/findDeps/findDeps.bin b/2.3-1/macros/findDeps/findDeps.bin Binary files differnew file mode 100644 index 00000000..fb11e006 --- /dev/null +++ b/2.3-1/macros/findDeps/findDeps.bin diff --git a/2.3-1/macros/findDeps/getAllHeaders.bin b/2.3-1/macros/findDeps/getAllHeaders.bin Binary files differnew file mode 100644 index 00000000..35c87db0 --- /dev/null +++ b/2.3-1/macros/findDeps/getAllHeaders.bin diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci index b7f26b33..9e633f6e 100644 --- a/2.3-1/macros/findDeps/getAllHeaders.sci +++ b/2.3-1/macros/findDeps/getAllHeaders.sci @@ -72,6 +72,10 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/matrixOperations/includes/kron.h" "src/c/matrixOperations/includes/flipdim.h" "src/c/matrixOperations/includes/norm.h" + "src/c/interpolation/includes/interp1.h" + "src/c/elementaryFunctions/includes/nextpow2.h" + "src/c/elementaryFunctions/includes/gcd.h" + "src/c/elementaryFunctions/includes/isreal.h" "src/c/elementaryFunctions/includes/cos.h" "src/c/elementaryFunctions/includes/fix.h" "src/c/elementaryFunctions/includes/exp.h" @@ -140,6 +144,9 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/string/includes/dynlib_string.h" "src/c/string/includes/disp.h" "src/c/string/includes/str.h" + "src/c/signalProcessing/includes/modk.h" + "src/c/signalProcessing/includes/idct.h" + "src/c/signalProcessing/includes/dct.h" "src/c/signalProcessing/fft/fft_internal.h" "src/c/signalProcessing/ifft/ifft_internal.h" "src/c/signalProcessing/levin/levinUtils.h" diff --git a/2.3-1/macros/findDeps/getAllInterfaces.bin b/2.3-1/macros/findDeps/getAllInterfaces.bin Binary files differnew file mode 100644 index 00000000..4fa47780 --- /dev/null +++ b/2.3-1/macros/findDeps/getAllInterfaces.bin diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci index c5c31165..42ed51d6 100644 --- a/2.3-1/macros/findDeps/getAllInterfaces.sci +++ b/2.3-1/macros/findDeps/getAllInterfaces.sci @@ -61,6 +61,10 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/matrixOperations/interfaces/int_flipdim.h" "src/c/matrixOperations/interfaces/int_permute.h" "src/c/matrixOperations/interfaces/int_norm.h" + "src/c/interpolation/interfaces/int_interp1.h" + "src/c/elementaryFunctions/interfaces/int_nextpow2.h" + "src/c/elementaryFunctions/interfaces/int_gcd.h" + "src/c/elementaryFunctions/interfaces/int_isreal.h" "src/c/elementaryFunctions/interfaces/int_asinh.h" "src/c/elementaryFunctions/interfaces/int_atanh.h" "src/c/elementaryFunctions/interfaces/int_sinh.h" @@ -140,6 +144,9 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/operations/interfaces/int_OpIns.h" "src/c/string/interfaces/int_disp.h" "src/c/string/interfaces/int_string.h" + "src/c/signalProcessing/interfaces/int_modk.h" + "src/c/signalProcessing/interfaces/int_idct.h" + "src/c/signalProcessing/interfaces/int_dct.h" "src/c/signalProcessing/interfaces/int_ifft.h" "src/c/signalProcessing/interfaces/int_lpc2cep.h" "src/c/signalProcessing/interfaces/int_cepstrum.h" diff --git a/2.3-1/macros/findDeps/getAllLibraries.bin b/2.3-1/macros/findDeps/getAllLibraries.bin Binary files differnew file mode 100644 index 00000000..098b51e6 --- /dev/null +++ b/2.3-1/macros/findDeps/getAllLibraries.bin diff --git a/2.3-1/macros/findDeps/getAllSources.bin b/2.3-1/macros/findDeps/getAllSources.bin Binary files differnew file mode 100644 index 00000000..bf618020 --- /dev/null +++ b/2.3-1/macros/findDeps/getAllSources.bin diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci index fd8b664c..afa51194 100644 --- a/2.3-1/macros/findDeps/getAllSources.sci +++ b/2.3-1/macros/findDeps/getAllSources.sci @@ -334,6 +334,9 @@ function allSources = getAllSources(SharedInfo) "src/c/matrixOperations/kron/skrona.c" "src/c/matrixOperations/norm/dnormv.c" "src/c/matrixOperations/norm/dnorma.c" + "src/c/elementaryFunctions/nextpow2/dnextpow2a.c" + "src/c/elementaryFunctions/isreal/sisreals.c" + "src/c/elementaryFunctions/isreal/disreals.c" "src/c/elementaryFunctions/cos/dcosa.c" "src/c/elementaryFunctions/cos/dcoss.c" "src/c/elementaryFunctions/cos/scosa.c" @@ -964,6 +967,13 @@ function allSources = getAllSources(SharedInfo) "src/c/string/string/u16strings.c" "src/c/string/string/i16stringa.c" "src/c/string/string/i16strings.c" + "src/c/signalProcessing/modk/dmodka.c" + "src/c/signalProcessing/transforms/idct/cidcta.c" + "src/c/signalProcessing/transforms/idct/zidcta.c" + "src/c/signalProcessing/transforms/idct/didcta.c" + "src/c/signalProcessing/transforms/dct/cdcta.c" + "src/c/signalProcessing/transforms/dct/zdcta.c" + "src/c/signalProcessing/transforms/dct/ddcta.c" "src/c/signalProcessing/fft/dfft2.c" "src/c/signalProcessing/fft/cfftma.c" "src/c/signalProcessing/fft/r2tx.c" @@ -1175,6 +1185,9 @@ function allSources = getAllSources(SharedInfo) "src/c/elementaryFunctions/Trigonometry/sech/zsechs.c" "src/c/elementaryFunctions/Trigonometry/sech/csecha.c" "src/c/elementaryFunctions/Trigonometry/sech/csechs.c" + "src/c/interpolation/interp1/dinterp13a.c" + "src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcds.c" + "src/c/elementaryFunctions/discrete_mathematics/gcd/dgcda.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" diff --git a/2.3-1/macros/findDeps/getArduinoFiles.bin b/2.3-1/macros/findDeps/getArduinoFiles.bin Binary files differnew file mode 100644 index 00000000..411018b0 --- /dev/null +++ b/2.3-1/macros/findDeps/getArduinoFiles.bin diff --git a/2.3-1/macros/findDeps/lib b/2.3-1/macros/findDeps/lib Binary files differindex a49dc793..d94232c2 100644 --- a/2.3-1/macros/findDeps/lib +++ b/2.3-1/macros/findDeps/lib diff --git a/2.3-1/macros/getScilab2cVersion.bin b/2.3-1/macros/getScilab2cVersion.bin Binary files differnew file mode 100644 index 00000000..9620859e --- /dev/null +++ b/2.3-1/macros/getScilab2cVersion.bin diff --git a/2.3-1/macros/lib b/2.3-1/macros/lib Binary files differindex d818e184..7ce29e55 100644 --- a/2.3-1/macros/lib +++ b/2.3-1/macros/lib diff --git a/2.3-1/macros/runsci2c.bin b/2.3-1/macros/runsci2c.bin Binary files differnew file mode 100644 index 00000000..319e1c2e --- /dev/null +++ b/2.3-1/macros/runsci2c.bin diff --git a/2.3-1/macros/runsci2c.sci b/2.3-1/macros/runsci2c.sci index eb32a4b5..333d0f1b 100644 --- a/2.3-1/macros/runsci2c.sci +++ b/2.3-1/macros/runsci2c.sci @@ -113,7 +113,7 @@ PrintStepInfo('Copying sources', FileInfo.GeneralReport,'both'); for i = 1:size(allSources, "*")
// DEBUG only
- //disp("Copying "+allSources(i)+" in "+SCI2COutputPath+"/src/c/");
+ disp("Copying "+allSources(i)+" in "+SCI2COutputPath+"/src/c/");
//Copy ode related functions only if 'ode' function is used.
if(~isempty(strstr(allSources(i),'dode')))
if(size(SharedInfo.Includelist) <> 0)
@@ -130,7 +130,7 @@ end PrintStepInfo('Copying headers', FileInfo.GeneralReport,'both');
for i = 1:size(allHeaders, "*")
// DEBUG only
- //disp("Copying "+allHeaders(i)+" in "+SCI2COutputPath+"/includes/");
+ disp("Copying "+allHeaders(i)+" in "+SCI2COutputPath+"/includes/");
copyfile(allHeaders(i), SCI2COutputPath+"/includes/");
end
diff --git a/2.3-1/macros/runscicode.bin b/2.3-1/macros/runscicode.bin Binary files differnew file mode 100644 index 00000000..46bda7cc --- /dev/null +++ b/2.3-1/macros/runscicode.bin diff --git a/2.3-1/macros/sci2c_gui.bin b/2.3-1/macros/sci2c_gui.bin Binary files differnew file mode 100644 index 00000000..57a2f696 --- /dev/null +++ b/2.3-1/macros/sci2c_gui.bin diff --git a/2.3-1/macros/scilab2c.bin b/2.3-1/macros/scilab2c.bin Binary files differnew file mode 100644 index 00000000..9fc934f8 --- /dev/null +++ b/2.3-1/macros/scilab2c.bin diff --git a/2.3-1/src/c/elementaryFunctions/discrete_mathematics/gcd/dgcda.c b/2.3-1/src/c/elementaryFunctions/discrete_mathematics/gcd/dgcda.c new file mode 100644 index 00000000..a32ed773 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/discrete_mathematics/gcd/dgcda.c @@ -0,0 +1,32 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#include "gcd.h" +#include "types.h" + +void dgcda(double *in,int size,double *out) +{ + double a=in[0]; + double b=in[1]; + while(a!=b && a!=0 && b!=0) + { + if(a>b) + { + a=a-b; + } + else + { + b=b-a; + } + } + out[0]=b; +} diff --git a/2.3-1/src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcds.c b/2.3-1/src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcds.c new file mode 100644 index 00000000..75f831fc --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcds.c @@ -0,0 +1,32 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#include "gcd.h" +#include "types.h" + +int8 u8gcds(int8 *in,int size) +{ + int a=in[0]; + int b=in[1]; + while(a!=b && a!=0 && b!=0) + { + if(a>b) + { + a=a-b; + } + else + { + b=b-a; + } + } + return b; +} diff --git a/2.3-1/src/c/elementaryFunctions/includes/gcd.h b/2.3-1/src/c/elementaryFunctions/includes/gcd.h new file mode 100644 index 00000000..eb75c973 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/includes/gcd.h @@ -0,0 +1,31 @@ +/* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2007-2008 - INRIA - Bruno JOFRET + * + * This file must be used under the terms of the CeCILL. + * This source file is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at + * Author: Ukasha Noor + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + * + */ + +#ifndef __GCD_H__ +#define __GCD_H__ + +#include "types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +int8 u8gcds(int8 *in,int size); + +void dgcda(double *in,int size,double *out); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif diff --git a/2.3-1/src/c/elementaryFunctions/includes/isreal.h b/2.3-1/src/c/elementaryFunctions/includes/isreal.h new file mode 100644 index 00000000..0183ebce --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/includes/isreal.h @@ -0,0 +1,30 @@ +/* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2007-2008 - INRIA - Bruno JOFRET + * + * This file must be used under the terms of the CeCILL. + * This source file is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + * + */ + +#ifndef __ISREAL_H__ +#define __ISREAL_H__ + +#include "types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +float sisreals(float a); + +double disreals(double a); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif diff --git a/2.3-1/src/c/elementaryFunctions/includes/nextpow2.h b/2.3-1/src/c/elementaryFunctions/includes/nextpow2.h new file mode 100644 index 00000000..c86bea01 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/includes/nextpow2.h @@ -0,0 +1,28 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + +#ifndef __NEXTPOW2_H__ +#define __NEXTPOW2_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +void dnextpow2a(double *in,int size,double *out); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif + diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_gcd.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_gcd.h new file mode 100644 index 00000000..c2135b70 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/interfaces/int_gcd.h @@ -0,0 +1,25 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* THIS IS AN AUTOMATICALLY GENERATED FILE : DO NOT EDIT BY HAND. */ + +#ifndef __INT_GCD_H__ +#define __INT_GCD_H__ + +#include "gcd.h" + +#define u82gcdu80(in,size) u8gcds(in,size) + +#define d2gcdd2(in,size,out) dgcda(in,size[0]*size[1],out) + +#endif + diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_isreal.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_isreal.h new file mode 100644 index 00000000..cebbf6db --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/interfaces/int_isreal.h @@ -0,0 +1,22 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + + +#ifndef __INT_ISREAL_H__ +#define __INT_ISREAL_H__ + +#define s0isreals0(in) sisreals(in) + +#define d0isreald0(in) disreals(in) + +#endif diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_nextpow2.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_nextpow2.h new file mode 100644 index 00000000..6ae4747b --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/interfaces/int_nextpow2.h @@ -0,0 +1,26 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* THIS IS AN AUTOMATICALLY GENERATED FILE : DO NOT EDIT BY HAND. */ + + +#ifndef __INT_NEXTPOW2_H__ +#define __INT_NEXTPOW2_H__ + + +#include "nextpow2.h" + +#define d0nextpow2d0(in,size,out) dnextpow2a(in,size[0]*size[1],out) + +#define d2nextpow2d2(in,size,out) dnextpow2a(in,size[0]*size[1],out) + +#endif diff --git a/2.3-1/src/c/elementaryFunctions/isreal/disreals.c b/2.3-1/src/c/elementaryFunctions/isreal/disreals.c new file mode 100644 index 00000000..8c7c8201 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/isreal/disreals.c @@ -0,0 +1,17 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#include "isreal.h" + +double disreals(double a){ + return 1; +} diff --git a/2.3-1/src/c/elementaryFunctions/isreal/sisreals.c b/2.3-1/src/c/elementaryFunctions/isreal/sisreals.c new file mode 100644 index 00000000..4b93c02c --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/isreal/sisreals.c @@ -0,0 +1,17 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#include "isreal.h" + +float sisreals(float a){ + return 1; +} diff --git a/2.3-1/src/c/elementaryFunctions/nextpow2/dnextpow2a.c b/2.3-1/src/c/elementaryFunctions/nextpow2/dnextpow2a.c new file mode 100644 index 00000000..46f7eb80 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/nextpow2/dnextpow2a.c @@ -0,0 +1,30 @@ +/* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Organization: FOSSEE, IIT Bombay + Author: Ukasha Noor + Email: toolbox@scilab.in +*/ + +#include "nextpow2.h" +#include <math.h> + +void dnextpow2a(double *in,int size,double *out) +{ + int i,j,s; + double k; + i=2; + for(s=0;s<size;s++) + { + j=-1; + do{ + j++; + k=pow(i,j); + }while(in[s]>k); + out[s]=j; + } +} diff --git a/2.3-1/src/c/interpolation/includes/interp1.h b/2.3-1/src/c/interpolation/includes/interp1.h new file mode 100644 index 00000000..1c01417e --- /dev/null +++ b/2.3-1/src/c/interpolation/includes/interp1.h @@ -0,0 +1,30 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#ifndef __INTERP1_H__ +#define __INTERP1_H__ + +#include <string.h> + +#ifdef __cplusplus +extern "C" { +#endif + + +//void dinterp13a(double *x,double *fx,double *q,int size,double *out); +void dinterp13a(double *x,int size1,double *fx,int size2,double *q,int size3,char *a,int size4,double *out); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif diff --git a/2.3-1/src/c/interpolation/interfaces/int_interp1.h b/2.3-1/src/c/interpolation/interfaces/int_interp1.h new file mode 100644 index 00000000..6d579e10 --- /dev/null +++ b/2.3-1/src/c/interpolation/interfaces/int_interp1.h @@ -0,0 +1,28 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* THIS IS AN AUTOMATICALLY GENERATED FILE : DO NOT EDIT BY HAND. */ + + +#ifndef __INT_INTERP1_H__ +#define __INT_INTERP1_H__ + +#include "interp1.h" +#include <string.h> + +#define d2d2d2interp1d2(x,size1,fx,size2,q,size3,out) dinterp13a(x,size1[0]*size1[1],fx,size2[0]*size1[1],q,size3[0]*size3[1],"linear",6,out) + +#define d2d2d2g2interp1d2(x,size1,fx,size2,q,size3,ch,size4,out) dinterp13a(x,size1[0]*size1[1],fx,size2[0]*size1[1],q,size3[0]*size3[1],ch,size4[0]*size4[1],out) + + +#endif + diff --git a/2.3-1/src/c/interpolation/interp1/dinterp13a.c b/2.3-1/src/c/interpolation/interp1/dinterp13a.c new file mode 100644 index 00000000..7b755e1c --- /dev/null +++ b/2.3-1/src/c/interpolation/interp1/dinterp13a.c @@ -0,0 +1,75 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + +#include "interp1.h" +#include <string.h> + +void dinterp13a(double *x,int size1,double *fx,int size2,double *q,int size3,char *ch,int size4,double *out) +{ + int i,j,k,f; + double a,b; + if(strcmp(ch,"linear")==0) + { + for(i=0;i<size3;i++) + { + f=0; + for(j=0;j<size1;j++) + { + if(q[i]==x[j]) + { + out[i]=fx[j]; + f=1; + break; + } + } + if(f==0) + { + j=0; + while(q[i]>x[j]) + { + j++; + } + a=x[j-1]; + b=x[j]; + out[i]=fx[j-1]+(q[i]-a)*((fx[j]-fx[j-1])/(b-a)); + } + } + } + else if(strcmp(ch,"nearest")==0) + { + for(i=0;i<size3;i++) + { + f=0; + for(j=0;j<size1;j++) + { + if(q[i]==x[j]) + { + out[i]=fx[j]; + f=1; + break; + } + } + if(f==0) + { + j=0; + while(q[i]>x[j]) + { + j++; + } + out[i]=fx[j]; + } + } + } +} + + diff --git a/2.3-1/src/c/matrixOperations/cat/ccata.c b/2.3-1/src/c/matrixOperations/cat/ccata.c index a6ac6cf0..cd2b4c92 100644 --- a/2.3-1/src/c/matrixOperations/cat/ccata.c +++ b/2.3-1/src/c/matrixOperations/cat/ccata.c @@ -26,7 +26,7 @@ void crowcata(floatComplex *in1, int lines1, int columns1, floatComplex *in2, i { for (j = 0 ; j < lines1 ; ++j) { - /*out[i*(lines1 + lines2) + j] = in1[i*lines1 + j];*/ + out[i*(lines1 + lines2) + j] = in1[i*lines1 + j]; } for (j = 0 ; j < lines2 ; ++j) { diff --git a/2.3-1/src/c/matrixOperations/cat/zcata.c b/2.3-1/src/c/matrixOperations/cat/zcata.c index bfb6e922..485553d7 100644 --- a/2.3-1/src/c/matrixOperations/cat/zcata.c +++ b/2.3-1/src/c/matrixOperations/cat/zcata.c @@ -26,7 +26,7 @@ void zrowcata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, { for (j = 0 ; j < lines1 ; ++j) { - /*out[i*(lines1 + lines2) + j] = in1[i*lines1 + j];*/ + out[i*(lines1 + lines2) + j] = in1[i*lines1 + j]; } for (j = 0 ; j < lines2 ; ++j) { diff --git a/2.3-1/src/c/signalProcessing/includes/dct.h b/2.3-1/src/c/signalProcessing/includes/dct.h new file mode 100644 index 00000000..5255241e --- /dev/null +++ b/2.3-1/src/c/signalProcessing/includes/dct.h @@ -0,0 +1,36 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + +#ifndef __DCT_H__ +#define __DCT_H__ + +#include <math.h> +#include "types.h" +#include "doubleComplex.h" +#include "addition.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void ddcta(double *in,int row,int col,int sign,double *out); + +void zdcta(doubleComplex *in,int row,int col,int sign,doubleComplex *out); + +void cdcta(floatComplex *in,int row,int col,int sign,floatComplex *out); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif diff --git a/2.3-1/src/c/signalProcessing/includes/idct.h b/2.3-1/src/c/signalProcessing/includes/idct.h new file mode 100644 index 00000000..13458b7d --- /dev/null +++ b/2.3-1/src/c/signalProcessing/includes/idct.h @@ -0,0 +1,36 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + +#ifndef __IDCT_H__ +#define __IDCT_H__ + +#include <math.h> +#include "types.h" +#include "doubleComplex.h" +#include "addition.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void didcta(double *in,int row,int col,double *out); + +void zidcta(doubleComplex *in,int row,int col,doubleComplex *out); + +void cidcta(floatComplex *in,int row,int col,floatComplex *out); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif diff --git a/2.3-1/src/c/signalProcessing/includes/modk.h b/2.3-1/src/c/signalProcessing/includes/modk.h new file mode 100644 index 00000000..5040eb7f --- /dev/null +++ b/2.3-1/src/c/signalProcessing/includes/modk.h @@ -0,0 +1,28 @@ +/* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ankit Raj + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +#ifndef __MODK_H__ +#define __MODK_H__ +#include "types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void dmodka(double* inp,int size,double* oup); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* __MODK_H__ */ + diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_dct.h b/2.3-1/src/c/signalProcessing/interfaces/int_dct.h new file mode 100644 index 00000000..6cfb21c7 --- /dev/null +++ b/2.3-1/src/c/signalProcessing/interfaces/int_dct.h @@ -0,0 +1,32 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + + +#ifndef __INT_DCT_H__ +#define __INT_DCT_H__ + + + +#define d2dctd2(in,size,out) ddcta(in,size[0],size[1],-1,out) + +#define d2d0dctd2(in,size,sign,out) ddcta(in,size[0],size[1],sign,out) + +#define z2dctz2(in,size,out) zdcta(in,size[0],size[1],-1,out) + +#define z2d0dctz2(in,size,sign,out) zdcta(in,size[0],size[1],sign,out) + +#define c2dctc2(in,size,out) cdcta(in,size[0],size[1],-1,out) + +#define c2s0dctc2(in,size,sign,out) cdcta(in,size[0],size[1],sign,out) + +#endif diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_idct.h b/2.3-1/src/c/signalProcessing/interfaces/int_idct.h new file mode 100644 index 00000000..c3a174ac --- /dev/null +++ b/2.3-1/src/c/signalProcessing/interfaces/int_idct.h @@ -0,0 +1,26 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + + +#ifndef __INT_IDCT_H__ +#define __INT_IDCT_H__ + + + +#define d2idctd2(in,size,out) didcta(in,size[0],size[1],out) + +#define z2idctz2(in,size,out) zidcta(in,size[0],size[1],out) + +#define c2idctc2(in,size,out) cidcta(in,size[0],size[1],out) + +#endif diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_modk.h b/2.3-1/src/c/signalProcessing/interfaces/int_modk.h new file mode 100644 index 00000000..441b9b13 --- /dev/null +++ b/2.3-1/src/c/signalProcessing/interfaces/int_modk.h @@ -0,0 +1,18 @@ +/* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ankit Raj + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +#ifndef __INT_MODK_H__ +#define __INT_MODK_H__ + +#define d2modkd2(inp,size,oup) dmodka(inp,size[1],oup) + +#endif /* !INT_MODK_H__! */ diff --git a/2.3-1/src/c/signalProcessing/modk/dmodka.c b/2.3-1/src/c/signalProcessing/modk/dmodka.c new file mode 100644 index 00000000..c0630ec0 --- /dev/null +++ b/2.3-1/src/c/signalProcessing/modk/dmodka.c @@ -0,0 +1,97 @@ +#include<stdio.h> +#include<math.h> +#include "modk.h" +double max_calc(double* ptr,int sz) +{ + int i=0; + double mx; + if(ptr[0]<0) + { + ptr[0]=-1*ptr[0]; + } + mx=(ptr[0]); + //printf("%lf\n",mx); + for(i=1;i<sz;i++) + { + if(ptr[i]<0) + { + ptr[i]=-1*ptr[i]; + } + if(mx<(ptr[i])) + mx=(ptr[i]); + } + return mx; +} +void dmodka(double* inp,int size,double* oup) +{ + double ones[size],PI=M_PI; + double eps=pow(2,-52); + int i; + for(i=0;i<size;i++) + { + ones[i]=1; + } + double a[size],b[size],c[size],an[size],bn[size],cn[size],kans[size]; + + int j,kk,l,m; + for(j=0;j<size;j++) + { + a[j]=1; + } + for(kk=0;kk<size;kk++) + { + b[kk]=sqrt(ones[kk]-inp[kk]); + } + for(l=0;l<size;l++) + { + c[l]=sqrt(inp[l]); + + } + int x=0; + //double maxi; + //maxi=max_calc(c,size); + //printf("%lf",maxi); + + while(max_calc(c,size)>eps) + { + int q,w,r; + for(q=0;q<size;q++) + { + an[q]=0.5*(a[q]+b[q]); + } + for(w=0;w<size;w++) + { + bn[w]=sqrt(a[w]*b[w]); + } + for(r=0;r<size;r++) + { + cn[r]=0.5*(a[r]-b[r]); + } + int x,y,z; + for(x=0;x<size;x++) + { + a[x]=an[x]; + } + for(y=0;y<size;y++) + { + b[y]=bn[y]; + } + for(z=0;z<size;z++) + { + c[z]=cn[z]; + } + } + int q,w; + for(q=0;q<size;q++) + { + oup[q]=PI*(ones[q]/(2*a[q])); + } + +} +/* +int main() +{ + double m[3]={0.1,0.2,0.3}; + dka(m,3); +} +*/ diff --git a/2.3-1/src/c/signalProcessing/transforms/dct/cdcta.c b/2.3-1/src/c/signalProcessing/transforms/dct/cdcta.c new file mode 100644 index 00000000..5bc27929 --- /dev/null +++ b/2.3-1/src/c/signalProcessing/transforms/dct/cdcta.c @@ -0,0 +1,177 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + +#include "dct.h" +#include "addition.h" +#include "types.h" +#include "floatComplex.h" +/*#include "matrixMultiplication"*/ +/*#include <fftw3.h>*/ +#include <math.h> + +void cdcta(floatComplex *in,int row,int col,int sign,floatComplex *out) +{ + int i,j,k,u,v; + int n; + int x,y; + float res,ress; + float re,z,q,m; + floatComplex accu = DoubleComplex(0, 0); + floatComplex temp,mm; + if(sign==-1) + { + if(row==1) + { + n=col; + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=FloatComplex(0,0); + for(i=0;i<row;i++) + { + for(j=0;j<col;j++) + { + y=row*j+i; + temp=in[y]*(cos(((M_PI)*(y+1-1./2.)*(x))/n)); + out[x]=cadds(out[x],temp); + } + } + if(x==0) + out[x]*=1./(sqrt(n)); + else + { + float res=2./n; + out[x]*=sqrt(res); + } + } + } + } + else + { + n=col*row; + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=FloatComplex(0,0); + for(i=0;i<row;i++) + { + temp=FloatComplex(0,0); + mm=FloatComplex(0,0); + for(j=0;j<col;j++) + { + y=j*row+i; + z=(float)(((float)j+1.0/2.0)*(float)v); + q=(float)(M_PI/(float)col); + mm=in[y]*(cos(q*z)); + temp=cadds(temp,mm); + } + z=(float)(((float)i+1.0/2.0)*(float)u); + q=(float)(M_PI/(float)row); + temp*=cos(q*z); + out[x]=cadds(out[x],temp); + } + if(u==0) + { + out[x]*=1./sqrt((float)row); + if(v==0) + out[x]*=1./sqrt((float)col); + else + out[x]*=sqrt(2./col); + } + else + { + out[x]*=sqrt(2./row); + if(v==0) + out[x]*=1./sqrt((float)col); + else + out[x]*=sqrt(2./col); + } + } + } + } + } + else if(sign==1) + { + n=col; + if(row==1) + { + res=1./sqrt(n); + ress=sqrt(2./n); + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=FloatComplex(0,0); + for(i=0;i<row;i++) + { + for(j=0;j<col;j++) + { + y=row*j+i; + if(y==0) + { + q=res*(cos(((M_PI)*(j)*(v+1./2.))/n)); + out[x]=cadds(out[x],in[y]*q); + } + else + { + q=ress*(cos(((M_PI)*(j)*(v+1./2.))/n)); + out[x]=cadds(out[x],in[y]*q); + } + } + } + } + + } + } + else + { + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=FloatComplex(0,0); + for(i=0;i<row;i++) + { + re=0; + mm=FloatComplex(0,0); + temp=FloatComplex(0,0); + for(j=0;j<col;j++) + { + y=row*j+i; + mm=in[j*row+i]; + z=(float)(((float)v+1.0/2.0)*(float)j); + q=(float)(M_PI/(float)col); + mm=mm*(cos(q*z)); + if(j==0) + temp=cadds(temp,mm*(1./sqrt((float)col))); + else + temp=cadds(temp,mm*sqrt(2./col)); + } + z=(float)(((float)u+1.0/2.0)*(float)i); + q=(float)(M_PI/(float)row); + if(i==0) + out[x]=cadds(out[x],temp*((cos(z*q))*(1./sqrt(row)))); + else + out[x]=cadds(out[x],temp*((cos(z*q))*sqrt(2./row))); + } + } + } + } + } +} diff --git a/2.3-1/src/c/signalProcessing/transforms/dct/ddcta.c b/2.3-1/src/c/signalProcessing/transforms/dct/ddcta.c new file mode 100644 index 00000000..3802c816 --- /dev/null +++ b/2.3-1/src/c/signalProcessing/transforms/dct/ddcta.c @@ -0,0 +1,160 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + +#include "dct.h" +/*#include <fftw3.h>*/ +#include <math.h> + +void ddcta(double *in,int row,int col,int sign,double *out) +{ + int i,j,k,u,v; + int n; + int x,y; + double res,ress; + double re,z,q,m; + if(sign==-1) + { + if(row==1) + { + n=col; + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=0; + for(i=0;i<row;i++) + { + for(j=0;j<col;j++) + { + y=row*j+i; + out[x]+=in[y]*(cos(((M_PI)*(y+1-1./2.)*(x))/n)); + } + } + if(x==0) + out[x]*=1./(sqrt(n)); + else + { + double res=2./n; + out[x]*=sqrt(res); + } + } + } + } + else + { + n=col*row; + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=0; + for(i=0;i<row;i++) + { + re=0; + for(j=0;j<col;j++) + { + m=(double)in[j*row+i]; + z=(double)(((double)j+1.0/2.0)*(double)v); + q=(double)(M_PI/(double)col); + re+=m*(cos(q*z)); + } + z=(double)(((double)i+1.0/2.0)*(double)u); + q=(double)(M_PI/(double)row); + out[x]+=re*(cos(q*z)); + } + if(u==0) + { + out[x]/=sqrt((double)row); + if(v==0) + out[x]/=sqrt((double)col); + else + out[x]*=sqrt(2./col); + } + else + { + out[x]*=sqrt(2./row); + if(v==0) + out[x]/=sqrt((double)col); + else + out[x]*=sqrt(2./col); + } + } + } + + } + } + else if(sign==1) + { + n=col; + if(row==1) + { + res=1./sqrt(n); + ress=sqrt(2./n); + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=0; + for(i=0;i<row;i++) + { + for(j=0;j<col;j++) + { + y=row*j+i; + if(y==0) + out[x]+=res*in[y]*(cos(((M_PI)*(j)*(v+1./2.))/n)); + else + out[x]+=ress*in[y]*(cos(((M_PI)*(j)*(v+1./2.))/n)); + } + } + } + + } + } + else + { + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=0; + for(i=0;i<row;i++) + { + re=0; + for(j=0;j<col;j++) + { + y=row*j+i; + m=(double)in[j*row+i]; + z=(double)(((double)v+1.0/2.0)*(double)j); + q=(double)(M_PI/(double)col); + m=m*(cos(q*z)); + if(j==0) + re+=m/sqrt((double)col); + else + re+=m*sqrt(2./col); + } + z=(double)(((double)u+1.0/2.0)*(double)i); + q=(double)(M_PI/(double)row); + if(i==0) + out[x]+=(re*(cos(z*q)))/sqrt((double)row); + else + out[x]+=(re*(cos(z*q))*sqrt(2./row)); + } + } + } + } + } +} diff --git a/2.3-1/src/c/signalProcessing/transforms/dct/zdcta.c b/2.3-1/src/c/signalProcessing/transforms/dct/zdcta.c new file mode 100644 index 00000000..0204d682 --- /dev/null +++ b/2.3-1/src/c/signalProcessing/transforms/dct/zdcta.c @@ -0,0 +1,177 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + +#include "dct.h" +#include "addition.h" +#include "types.h" +#include "doubleComplex.h" +/*#include "matrixMultiplication"*/ +/*#include <fftw3.h>*/ +#include <math.h> + +void zdcta(doubleComplex *in,int row,int col,int sign,doubleComplex *out) +{ + int i,j,k,u,v; + int n; + int x,y; + double res,ress; + double re,z,q,m; + doubleComplex accu = DoubleComplex(0, 0); + doubleComplex temp,mm; + if(sign==-1) + { + if(row==1) + { + n=col; + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=DoubleComplex(0,0); + for(i=0;i<row;i++) + { + for(j=0;j<col;j++) + { + y=row*j+i; + temp=in[y]*(cos(((M_PI)*(y+1-1./2.)*(x))/n)); + out[x]=zadds(out[x],temp); + } + } + if(x==0) + out[x]*=1./(sqrt(n)); + else + { + double res=2./n; + out[x]*=sqrt(res); + } + } + } + } + else + { + n=col*row; + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=DoubleComplex(0,0); + for(i=0;i<row;i++) + { + temp=DoubleComplex(0,0); + mm=DoubleComplex(0,0); + for(j=0;j<col;j++) + { + y=j*row+i; + z=(double)(((double)j+1.0/2.0)*(double)v); + q=(double)(M_PI/(double)col); + mm=in[y]*(cos(q*z)); + temp=zadds(temp,mm); + } + z=(double)(((double)i+1.0/2.0)*(double)u); + q=(double)(M_PI/(double)row); + temp*=cos(q*z); + out[x]=zadds(out[x],temp); + } + if(u==0) + { + out[x]*=1./sqrt((double)row); + if(v==0) + out[x]*=1./sqrt((double)col); + else + out[x]*=sqrt(2./col); + } + else + { + out[x]*=sqrt(2./row); + if(v==0) + out[x]*=1./sqrt((double)col); + else + out[x]*=sqrt(2./col); + } + } + } + } + } + else if(sign==1) + { + n=col; + if(row==1) + { + res=1./sqrt(n); + ress=sqrt(2./n); + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=DoubleComplex(0,0); + for(i=0;i<row;i++) + { + for(j=0;j<col;j++) + { + y=row*j+i; + if(y==0) + { + q=res*(cos(((M_PI)*(j)*(v+1./2.))/n)); + out[x]=zadds(out[x],in[y]*q); + } + else + { + q=ress*(cos(((M_PI)*(j)*(v+1./2.))/n)); + out[x]=zadds(out[x],in[y]*q); + } + } + } + } + + } + } + else + { + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=DoubleComplex(0,0); + for(i=0;i<row;i++) + { + re=0; + mm=DoubleComplex(0,0); + temp=DoubleComplex(0,0); + for(j=0;j<col;j++) + { + y=row*j+i; + mm=in[j*row+i]; + z=(double)(((double)v+1.0/2.0)*(double)j); + q=(double)(M_PI/(double)col); + mm=mm*(cos(q*z)); + if(j==0) + temp=zadds(temp,mm*(1./sqrt((double)col))); + else + temp=zadds(temp,mm*sqrt(2./col)); + } + z=(double)(((double)u+1.0/2.0)*(double)i); + q=(double)(M_PI/(double)row); + if(i==0) + out[x]=zadds(out[x],temp*((cos(z*q))*(1./sqrt(row)))); + else + out[x]=zadds(out[x],temp*((cos(z*q))*sqrt(2./row))); + } + } + } + } + } +} diff --git a/2.3-1/src/c/signalProcessing/transforms/idct/cidcta.c b/2.3-1/src/c/signalProcessing/transforms/idct/cidcta.c new file mode 100644 index 00000000..ec0df0c7 --- /dev/null +++ b/2.3-1/src/c/signalProcessing/transforms/idct/cidcta.c @@ -0,0 +1,97 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + +#include "idct.h" +#include "addition.h" +#include "types.h" +#include "floatComplex.h" +/*#include "matrixMultiplication"*/ +/*#include <fftw3.h>*/ +#include <math.h> + +void cidcta(floatComplex *in,int row,int col,floatComplex *out) +{ + int i,j,k,u,v; + int n=col; + int x,y; + float res,ress; + float re,z,q,m; + floatComplex accu = DoubleComplex(0, 0); + floatComplex temp,mm; + if(row==1) + { + res=1./sqrt(n); + ress=sqrt(2./n); + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=FloatComplex(0,0); + for(i=0;i<row;i++) + { + for(j=0;j<col;j++) + { + y=row*j+i; + if(y==0) + { + q=res*(cos(((M_PI)*(j)*(v+1./2.))/n)); + out[x]=cadds(out[x],in[y]*q); + } + else + { + q=ress*(cos(((M_PI)*(j)*(v+1./2.))/n)); + out[x]=cadds(out[x],in[y]*q); + } + } + } + } + + } + } + else + { + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=FloatComplex(0,0); + for(i=0;i<row;i++) + { + re=0; + mm=FloatComplex(0,0); + temp=FloatComplex(0,0); + for(j=0;j<col;j++) + { + y=row*j+i; + mm=in[j*row+i]; + z=(float)(((float)v+1.0/2.0)*(float)j); + q=(float)(M_PI/(float)col); + mm=mm*(cos(q*z)); + if(j==0) + temp=cadds(temp,mm*(1./sqrt((float)col))); + else + temp=cadds(temp,mm*sqrt(2./col)); + } + z=(float)(((float)u+1.0/2.0)*(float)i); + q=(float)(M_PI/(float)row); + if(i==0) + out[x]=cadds(out[x],temp*((cos(z*q))*(1./sqrt(row)))); + else + out[x]=cadds(out[x],temp*((cos(z*q))*sqrt(2./row))); + } + } + } + } +} diff --git a/2.3-1/src/c/signalProcessing/transforms/idct/didcta.c b/2.3-1/src/c/signalProcessing/transforms/idct/didcta.c new file mode 100644 index 00000000..5f475160 --- /dev/null +++ b/2.3-1/src/c/signalProcessing/transforms/idct/didcta.c @@ -0,0 +1,83 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + +#include "idct.h" +/*#include <fftw3.h>*/ +#include <math.h> + +void didcta(double *in,int row,int col,double *out) +{ + int i,j,k,u,v; + int n=col; + int x,y; + double res,ress; + double re,z,q,m; + if(row==1) + { + res=1./sqrt(n); + ress=sqrt(2./n); + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=0; + for(i=0;i<row;i++) + { + for(j=0;j<col;j++) + { + y=row*j+i; + if(y==0) + out[x]+=res*in[y]*(cos(((M_PI)*(j)*(v+1./2.))/n)); + else + out[x]+=ress*in[y]*(cos(((M_PI)*(j)*(v+1./2.))/n)); + } + } + } + + } + } + else + { + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=0; + for(i=0;i<row;i++) + { + re=0; + for(j=0;j<col;j++) + { + y=row*j+i; + m=(double)in[j*row+i]; + z=(double)(((double)v+1.0/2.0)*(double)j); + q=(double)(M_PI/(double)col); + m=m*(cos(q*z)); + if(j==0) + re+=m/sqrt((double)col); + else + re+=m*sqrt(2./col); + } + z=(double)(((double)u+1.0/2.0)*(double)i); + q=(double)(M_PI/(double)row); + if(i==0) + out[x]+=(re*(cos(z*q)))/sqrt((double)row); + else + out[x]+=(re*(cos(z*q))*sqrt(2./row)); + } + } + } + } +} diff --git a/2.3-1/src/c/signalProcessing/transforms/idct/zidcta.c b/2.3-1/src/c/signalProcessing/transforms/idct/zidcta.c new file mode 100644 index 00000000..2177b18c --- /dev/null +++ b/2.3-1/src/c/signalProcessing/transforms/idct/zidcta.c @@ -0,0 +1,97 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + +#include "idct.h" +#include "addition.h" +#include "types.h" +#include "doubleComplex.h" +/*#include "matrixMultiplication"*/ +/*#include <fftw3.h>*/ +#include <math.h> + +void zidcta(doubleComplex *in,int row,int col,doubleComplex *out) +{ + int i,j,k,u,v; + int n=col; + int x,y; + double res,ress; + double re,z,q,m; + doubleComplex accu = DoubleComplex(0, 0); + doubleComplex temp,mm; + if(row==1) + { + res=1./sqrt(n); + ress=sqrt(2./n); + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=DoubleComplex(0,0); + for(i=0;i<row;i++) + { + for(j=0;j<col;j++) + { + y=row*j+i; + if(y==0) + { + q=res*(cos(((M_PI)*(j)*(v+1./2.))/n)); + out[x]=zadds(out[x],in[y]*q); + } + else + { + q=ress*(cos(((M_PI)*(j)*(v+1./2.))/n)); + out[x]=zadds(out[x],in[y]*q); + } + } + } + } + + } + } + else + { + for(u=0;u<row;u++) + { + for(v=0;v<col;v++) + { + x=v*row+u; + out[x]=DoubleComplex(0,0); + for(i=0;i<row;i++) + { + re=0; + mm=DoubleComplex(0,0); + temp=DoubleComplex(0,0); + for(j=0;j<col;j++) + { + y=row*j+i; + mm=in[j*row+i]; + z=(double)(((double)v+1.0/2.0)*(double)j); + q=(double)(M_PI/(double)col); + mm=mm*(cos(q*z)); + if(j==0) + temp=zadds(temp,mm*(1./sqrt((double)col))); + else + temp=zadds(temp,mm*sqrt(2./col)); + } + z=(double)(((double)u+1.0/2.0)*(double)i); + q=(double)(M_PI/(double)row); + if(i==0) + out[x]=zadds(out[x],temp*((cos(z*q))*(1./sqrt(row)))); + else + out[x]=zadds(out[x],temp*((cos(z*q))*sqrt(2./row))); + } + } + } + } +} diff --git a/2.3-1/unloader.sce b/2.3-1/unloader.sce index e4ec09c7..a8bf1673 100644 --- a/2.3-1/unloader.sce +++ b/2.3-1/unloader.sce @@ -1,31 +1,14 @@ // This file is released under the 3-clause BSD license. See COPYING-BSD. // Generated by builder.sce: Please, do not edit this file -oldmode = mode(); mode(-1); -oldlines = lines()(2); lines(0); try - // Unregister the library of macros. This does not unregister its macros - clear scilab2clib - // Del help chapter - if or(getscilabmode() == ["NW";"STD"]) then - mprintf("\tRemove help chapter\n"); - del_help_chapter("scilab2c", %F); - end - // Remove Preferences GUI - if getscilabmode() == "STD" then - removeModulePreferences(get_absolute_file_path("unloader.sce")) - end - // TODO: detect and unlink related gateways + getversion("scilab"); catch - [errmsg, tmp, nline, func] = lasterror() - msg = "%s: error on line #%d: ""%s""\n" - msg = msprintf(msg, func, nline, errmsg) - lines(oldlines) - mode(oldmode); - clear oldlines oldmode tmp nline func - error(msg); + error("Scilab 5.4 or more is required."); +end; + +fileQuit = get_absolute_file_path("unloader.sce") + "etc/" + "scilab2c.quit"; +if isfile(fileQuit) then + exec(fileQuit); end -lines(oldlines); -mode(oldmode); -clear oldlines oldmode; |