From 6a320264c2de3d6dd8cc1d1327b3c30df4c8cb26 Mon Sep 17 00:00:00 2001 From: Siddhesh Wani Date: Mon, 25 May 2015 14:46:31 +0530 Subject: Original Version --- 2.3-1/macros/FunctionAnnotation/FA_ADD.bin | Bin 0 -> 4856 bytes 2.3-1/macros/FunctionAnnotation/FA_ADD.sci | 43 +++++ 2.3-1/macros/FunctionAnnotation/FA_DIV.bin | Bin 0 -> 4904 bytes 2.3-1/macros/FunctionAnnotation/FA_DIV.sci | 41 +++++ .../FunctionAnnotation/FA_GetDefaultPrecision.bin | Bin 0 -> 10540 bytes .../FunctionAnnotation/FA_GetDefaultPrecision.sci | 86 +++++++++ 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin | Bin 0 -> 30676 bytes 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci | 204 +++++++++++++++++++++ .../macros/FunctionAnnotation/FA_GetOutArgInfo.bin | Bin 0 -> 16712 bytes .../macros/FunctionAnnotation/FA_GetOutArgInfo.sci | 126 +++++++++++++ .../FunctionAnnotation/FA_GetResizeApproach.bin | Bin 0 -> 10484 bytes .../FunctionAnnotation/FA_GetResizeApproach.sci | 79 ++++++++ 2.3-1/macros/FunctionAnnotation/FA_INT.bin | Bin 0 -> 4516 bytes 2.3-1/macros/FunctionAnnotation/FA_INT.sci | 40 ++++ 2.3-1/macros/FunctionAnnotation/FA_MAX.bin | Bin 0 -> 5320 bytes 2.3-1/macros/FunctionAnnotation/FA_MAX.sci | 50 +++++ 2.3-1/macros/FunctionAnnotation/FA_MIN.bin | Bin 0 -> 4524 bytes 2.3-1/macros/FunctionAnnotation/FA_MIN.sci | 45 +++++ 2.3-1/macros/FunctionAnnotation/FA_MUL.bin | Bin 0 -> 4932 bytes 2.3-1/macros/FunctionAnnotation/FA_MUL.sci | 42 +++++ 2.3-1/macros/FunctionAnnotation/FA_REAL.bin | Bin 0 -> 4400 bytes 2.3-1/macros/FunctionAnnotation/FA_REAL.sci | 50 +++++ 2.3-1/macros/FunctionAnnotation/FA_SUB.bin | Bin 0 -> 4916 bytes 2.3-1/macros/FunctionAnnotation/FA_SUB.sci | 41 +++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin | Bin 0 -> 2604 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_1.sci | 20 ++ 2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin | Bin 0 -> 2612 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_2.sci | 20 ++ 2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin | Bin 0 -> 3448 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci | 36 ++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin | Bin 0 -> 3224 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.sci | 26 +++ .../FunctionAnnotation/FA_SZ_OPBACKSLASH.bin | Bin 0 -> 4320 bytes .../FunctionAnnotation/FA_SZ_OPBACKSLASH.sci | 39 ++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin | Bin 0 -> 5056 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.sci | 40 ++++ .../macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin | Bin 0 -> 1960 bytes .../macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.sci | 16 ++ .../FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin | Bin 0 -> 2036 bytes .../FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.sci | 16 ++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin | Bin 0 -> 5712 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.sci | 43 +++++ .../macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin | Bin 0 -> 2020 bytes .../macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.sci | 16 ++ .../macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin | Bin 0 -> 3664 bytes .../macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.sci | 32 ++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin | Bin 0 -> 5688 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.sci | 43 +++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin | Bin 0 -> 2012 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.sci | 16 ++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin | Bin 0 -> 2008 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.sci | 16 ++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin | Bin 0 -> 2008 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.sci | 16 ++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin | Bin 0 -> 2008 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.sci | 16 ++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin | Bin 0 -> 2008 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.sci | 16 ++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin | Bin 0 -> 2008 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.sci | 16 ++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin | Bin 0 -> 2008 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.sci | 16 ++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin | Bin 0 -> 1956 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.sci | 16 ++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin | Bin 0 -> 2008 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.sci | 16 ++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin | Bin 0 -> 6704 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.sci | 51 ++++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin | Bin 0 -> 14040 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci | 93 ++++++++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin | Bin 0 -> 8516 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.sci | 66 +++++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin | Bin 0 -> 5056 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.sci | 40 ++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin | Bin 0 -> 3600 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.sci | 37 ++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin | Bin 0 -> 8228 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.sci | 68 +++++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin | Bin 0 -> 7028 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.sci | 48 +++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin | Bin 0 -> 6920 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.sci | 44 +++++ 2.3-1/macros/FunctionAnnotation/FA_TP_C.bin | Bin 0 -> 3252 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_C.sci | 32 ++++ 2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin | Bin 0 -> 4520 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.sci | 42 +++++ 2.3-1/macros/FunctionAnnotation/FA_TP_D.bin | Bin 0 -> 3220 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_D.sci | 32 ++++ 2.3-1/macros/FunctionAnnotation/FA_TP_I.bin | Bin 0 -> 3208 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_I.sci | 32 ++++ 2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin | Bin 0 -> 5028 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_MAX.sci | 45 +++++ 2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin | Bin 0 -> 3512 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.sci | 35 ++++ 2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin | Bin 0 -> 4036 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_REAL.sci | 38 ++++ 2.3-1/macros/FunctionAnnotation/FA_TP_S.bin | Bin 0 -> 3216 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_S.sci | 32 ++++ 2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin | Bin 0 -> 5172 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_USER.sci | 38 ++++ 2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin | Bin 0 -> 3252 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_Z.sci | 32 ++++ 2.3-1/macros/FunctionAnnotation/buildmacros.sce | 15 ++ 2.3-1/macros/FunctionAnnotation/lib | Bin 0 -> 1656 bytes 2.3-1/macros/FunctionAnnotation/names | 51 ++++++ 105 files changed, 2209 insertions(+) create mode 100644 2.3-1/macros/FunctionAnnotation/FA_ADD.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_ADD.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_DIV.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_DIV.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_INT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_INT.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_MAX.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_MAX.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_MIN.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_MIN.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_MUL.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_MUL.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_REAL.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_REAL.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SUB.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SUB.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_1.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_2.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_C.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_C.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_D.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_D.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_I.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_I.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_MAX.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_REAL.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_S.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_S.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_USER.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_Z.sci create mode 100644 2.3-1/macros/FunctionAnnotation/buildmacros.sce create mode 100644 2.3-1/macros/FunctionAnnotation/lib create mode 100644 2.3-1/macros/FunctionAnnotation/names (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_ADD.bin b/2.3-1/macros/FunctionAnnotation/FA_ADD.bin new file mode 100644 index 00000000..6c810828 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_ADD.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_ADD.sci b/2.3-1/macros/FunctionAnnotation/FA_ADD.sci new file mode 100644 index 00000000..4193422b --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_ADD.sci @@ -0,0 +1,43 @@ +function opout = FA_ADD(in1,in2) +// function opout = FA_ADD(in1,in2) +// ----------------------------------------------------------------- +// Addition function for Function Annotations. +// +// Input data: +// in1: string specifying a number or a symbol. +// in2: string specifying a number or a symbol. +// +// Output data: +// opout: string containing the computed result. +// +// Status: +// 26-Oct-2007 -- Raffaele Nutricato: Author. +// 26-Oct-2007 -- Alberto Morea: Test Ok. +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +if (isnum(in1) & isnum(in2)) + in1num = eval(in1); + in2num = eval(in2); + outnum = in1num+in2num; + if isnan(outnum) + opout = '__SCI2CNANSIZE'; + else + opout = string(outnum); + end +else + opout = string('('+in1+'+'+in2+')'); +end + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_DIV.bin b/2.3-1/macros/FunctionAnnotation/FA_DIV.bin new file mode 100644 index 00000000..6e6708fe Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_DIV.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_DIV.sci b/2.3-1/macros/FunctionAnnotation/FA_DIV.sci new file mode 100644 index 00000000..d4ec0ccd --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_DIV.sci @@ -0,0 +1,41 @@ +function opout = FA_DIV(in1,in2) +// function opout = FA_DIV(in1,in2) +// ----------------------------------------------------------------- +// Division function for Function Annotations. +// +// Input data: +// in1: string specifying a number or a symbol. +// in2: string specifying a number or a symbol. +// +// Output data: +// opout: string containing the computed result. +// +// Status: +// 26-Oct-2007 -- Raffaele Nutricato: Author. +// 26-Oct-2007 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +if (isnum(in1) & isnum(in2)) + in1num = eval(in1); + in2num = eval(in2); + outnum = in1num/in2num; + if isnan(outnum) + opout = '__SCI2CNANSIZE'; + else + opout = string(outnum); + end +else + opout = '('+string(in1)+'/'+string(in2)+')'; +end +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin new file mode 100644 index 00000000..026863b2 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.sci b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.sci new file mode 100644 index 00000000..3afe2648 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.sci @@ -0,0 +1,86 @@ +function defaultprecision = FA_GetDefaultPrecision(scifilename,ReportFileName) +// function defaultprecision = FA_GetDefaultPrecision(scifilename,ReportFileName) +// ----------------------------------------------------------------- +// #RNU_RES_B +// Extracts the default precision for the file .sci passed in input. +// The following annotation will be searched in the scilab code: +// //SCI2C: DEFAULT_PRECISION= FLOAT +// //SCI2C: DEFAULT_PRECISION= DOUBLE +// If the annotation is missing the default DOUBLE precision will be +// implicitly used. +// #RNU_RES_E +// +// Input data: +// --- +// +// Output data: +// defaultprecision: string which specifies the default precision to be +// used in the translation of scifilename. +// +// Status: +// 12-Feb-2008 -- Raffaele Nutricato: Author. +// 12-Feb-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +// ----------------------- +// --- Initialization. --- +// ----------------------- +defaultprecision = 'd'; +annotationstring = '//SCI2C: DEFAULT_PRECISION=' +// #RNU_RES_B +PrintStringInfo('***Get default precision from: '+scifilename,ReportFileName,'file','y'); +// #RNU_RES_E +// --------------------------- +// --- End Initialization. --- +// --------------------------- + +// --- Open the .sci file (read only). --- +scifid = SCI2COpenFileRead(scifilename); + +// #RNU_RES_B +// --- Loop over the lines of the input file. --- +// Position file pointer to the desired NInArg/NOutArg section, +// and read the NOutArg annotation. +// #RNU_RES_E +foundannotation = 0; +line_position = 0; +while ((meof(scifid) == 0) & (foundannotation == 0)) + check_string = stripblanks(mgetl(scifid,1)); + line_position = line_position + 1; + if (~isempty(check_string)) + + if (SCI2Cstrncmps1size(annotationstring,check_string)) + tmpprecision = stripblanks(part(check_string,length(annotationstring)+1:length(check_string))); + // #RNU_RES_B + PrintStringInfo(' Line '+string(line_position)+... + ' - Found annotation for default precision'+' ""'+check_string+' ""',... + ReportFileName,'file','y'); + // #RNU_RES_E + foundannotation = 1; + end + end +end + +if (foundannotation == 0) + // #RNU_RES_B + PrintStringInfo('Annotation for default precision not found.',ReportFileName,'file','y'); + PrintStringInfo('Using the ""DOUBLE"" default precision.',ReportFileName,'file','y'); + // #RNU_RES_E +else + if (tmpprecision == 'FLOAT') + defaultprecision = 's'; + elseif (tmpprecision == 'DOUBLE') + defaultprecision = 'd'; + end +end + +mclose(scifid); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin new file mode 100644 index 00000000..7bb2f2bd Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci new file mode 100644 index 00000000..e5fb8ac8 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci @@ -0,0 +1,204 @@ +function [FunTypeAnnot,FunSizeAnnot] = ... + FA_GetFunAnn(NInArg,NOutArg,FunName,FileInfo,SharedInfo) +// function [FunTypeAnnot,FunSizeAnnot] = ... +// FA_GetFunAnn(NInArg,NOutArg,FunName,FileInfo,SharedInfo) +// ----------------------------------------------------------------- +// #RNU_RES_B +// This function extracts the TYPE and SIZE annotations from the +// input .ann file. +// No blank lines are allowed between function annotations. +// +// #RNU_RES_E +// Input data: +// //NUT: Add description here +// +// Output data: +// //NUT: Add description here +// +// Status: +// 11-Jul-2007 -- Nutricato Raffaele: Author. +// +// Copyright 2007 Raffaele Nutricato. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +//NUT: consider the possibility to split this function into more functions. + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),5,5); + +// ----------------------- +// --- Initialization. --- +// ----------------------- +nxtscifunname = SharedInfo.NextSCIFunName; +nxtscifunnumber = SharedInfo.NextSCIFunNumber; +ReportFileName = FileInfo.Funct(nxtscifunnumber).ReportFileName; +// #RNU_RES_B +PrintStringInfo(' ',ReportFileName,'file','y'); +PrintStringInfo('***Reading function annotations***',ReportFileName,'file','y'); +// #RNU_RES_E +SCI2CClassFileName = GetClsFileName(FunName,FileInfo,SharedInfo); +FunTypeAnnot = ''; +FunSizeAnnot = ''; +// --------------------------- +// --- End Initialization. --- +// --------------------------- + + +// --------------------------------------------- +// --- Read the annotations of the function. --- +// --------------------------------------------- +// --- Open the .sci file (read only). --- +inclsfid = SCI2COpenFileRead(SCI2CClassFileName); + +// #RNU_RES_B +// --- Loop over the lines of the input file. --- +// Position file pointer to the desired NInArg/NOutArg section, +// and read the NOutArg annotation. +// #RNU_RES_E +FoundNIn = 0; +FoundNOut = 0; +line_position = 0; +while ((meof(inclsfid) == 0) & (FoundNIn == 0) & (FoundNOut == 0)) + check_string = stripblanks(mgetl(inclsfid,1)); + line_position = line_position + 1; + if (~isempty(check_string)) + +// #RNU_RES_B +// --- Search for the NIN annotation. --- +// #RNU_RES_E + if (SCI2Cstrncmps1size(SharedInfo.Annotations.FUNNIN,check_string)) + FUNNINAnnot = part(check_string,length(SharedInfo.Annotations.FUNNIN)+1:length(check_string)); +// #RNU_RES_B +// --- Check NIN value. --- +// #RNU_RES_E + if (eval(FUNNINAnnot) == NInArg) +// #RNU_RES_B + PrintStringInfo(' Line '+string(line_position)+' - Function NInArg Annotation: '+' ""'+check_string+' ""',... + ReportFileName,'file','y'); +// #RNU_RES_E + FoundNIn = 1; + check_string = stripblanks(mgetl(inclsfid,1)); + line_position = line_position + 1; + if (~isempty(check_string)) + +// #RNU_RES_B +// --- Search for the NOUT annotation. --- +// #RNU_RES_E + if (SCI2Cstrncmps1size(SharedInfo.Annotations.FUNNOUT,check_string)) + FUNNOUTAnnot = part(check_string,length(SharedInfo.Annotations.FUNNOUT)+1:length(check_string)); + +// #RNU_RES_B +// --- Check NOUT value. --- +// #RNU_RES_E + if (eval(FUNNOUTAnnot) == NOutArg) +// #RNU_RES_B + PrintStringInfo(' Line '+string(line_position)+' - Function NOutArg Annotation: '+' ""'+check_string+' ""',... + ReportFileName,'file','y'); +// #RNU_RES_E + FoundNOut = 1; + else + FoundNIn = 0; + end + else + PrintStringInfo(' ',ReportFileName,'both','y'); + PrintStringInfo('SCI2CERROR: Incorrect format for function annotation.',ReportFileName,'both','y'); + PrintStringInfo('SCI2CERROR: Expected '+SharedInfo.Annotations.FUNNIN+' field in the annotations of the function.',ReportFileName,'both','y'); + PrintStringInfo(' ',ReportFileName,'both','y'); + error(9999, 'SCI2CERROR: Incorrect format for function annotation.'); + end + else + PrintStringInfo(' ',ReportFileName,'both','y'); + PrintStringInfo('SCI2CERROR: Incorrect format for function annotation.',ReportFileName,'both','y'); + PrintStringInfo('SCI2CERROR: Expected '+SharedInfo.Annotations.FUNNIN+' field in the annotations of the function.',ReportFileName,'both','y'); + PrintStringInfo(' ',ReportFileName,'both','y'); + error(9999, 'SCI2CERROR: Incorrect format for function annotation.'); + end + end + end + end +end + +if (FoundNOut*FoundNIn == 0) + PrintStringInfo(' ',ReportFileName,'both','y'); + PrintStringInfo('SCI2CERROR: Please check file: '+SCI2CClassFileName,ReportFileName,'both','y'); + PrintStringInfo('SCI2CERROR: Incorrect function annotation.',ReportFileName,'both','y'); + PrintStringInfo('SCI2CERROR: There are two possibilities:',ReportFileName,'both','y'); + PrintStringInfo('SCI2CERROR: 1. Syntax error in function annotations.',ReportFileName,'both','y'); + PrintStringInfo('SCI2CERROR: 2. Missing the right combination of NIN/NOUT annotations: ""'+SharedInfo.Annotations.FUNNIN+string(NInArg)+','+SharedInfo.Annotations.FUNNOUT+' '+string(NOutArg)+'"".',ReportFileName,'both','y'); + PrintStringInfo(' ',ReportFileName,'both','y'); + error(9999, 'SCI2CERROR: Incorrect function annotation.'); +else + + // In case we are reading to much informations + readNewLine = %t; + + for cntout = 1:NOutArg + SCI2C_nout=cntout; // Useful for eval. + +// #RNU_RES_B +// Read the Fun type annotation. +// #RNU_RES_E + if (readNewLine == %t) + check_string = stripblanks(mgetl(inclsfid,1)); + line_position = line_position + 1; + else + // reset state + readNewLine = %t; + end + if (isempty(check_string) == %F) + tmpannstring = eval(SharedInfo.Annotations.FUNTYPE); + if (SCI2Cstrncmps1size(tmpannstring,check_string)) +// #RNU_RES_B + PrintStringInfo(' Line '+string(line_position)+' - Function Type Annotation: '+' ""'+check_string+' ""',... + ReportFileName,'file','y'); +// #RNU_RES_E + FunTypeAnnot(cntout) = ... + stripblanks(part(check_string,length(tmpannstring)+1:length(check_string))); + end + else + PrintStringInfo(' ',ReportFileName,'both','y'); + PrintStringInfo('SCI2CERROR: Line '+string(line_position)+' Function type annotation not found in file: '+SCI2CClassFileName,ReportFileName,'both','y'); + PrintStringInfo(' ',ReportFileName,'both','y'); + error(9999, 'SCI2CERROR: Line '+string(line_position)+' Function type annotation not found in file: '+SCI2CClassFileName); + end + +// #RNU_RES_B +// --- Read the Fun size annotation. --- +// #RNU_RES_E + SCI2C_nelem = 0; // Useful for eval. +// while(SCI2C_nelem < 2 & isempty(check_string) == %F) + while(SCI2C_nelem < 3 & isempty(check_string) == %F) + line_position = line_position + 1; +// #RNU_RES_B + PrintStringInfo(' Line '+string(line_position)+' - Function Size Annotation: '+' ""'+check_string+' ""',... + ReportFileName,'file','y'); + if (isempty(check_string) == %F) + SCI2C_nelem = SCI2C_nelem + 1 + tmpannstring = eval(SharedInfo.Annotations.FUNSIZE); + check_string = stripblanks(mgetl(inclsfid,1)); + if (SCI2Cstrncmps1size(tmpannstring,check_string)) +// #RNU_RES_E + FunSizeAnnot(cntout,SCI2C_nelem) = ... + stripblanks(part(check_string,length(tmpannstring)+1:length(check_string))); + else + readNewLine = %f; + end + else + PrintStringInfo(' ',ReportFileName,'both','y'); + PrintStringInfo('SCI2CERROR: Line '+string(line_position)+' Function size annotation not found in file: '+SCI2CClassFileName,ReportFileName,'both','y'); + PrintStringInfo(' ',ReportFileName,'both','y'); + error(9999, 'SCI2CERROR: Line '+string(line_position)+' Function size annotation not found in file: '+SCI2CClassFileName); + end + end + end +end +// --- End loop over the lines of the input file. --- +mclose(inclsfid); +// ------------------------------------------------- +// --- End Read the annotations of the function. --- +// ------------------------------------------------- + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin new file mode 100644 index 00000000..177df55a Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci new file mode 100644 index 00000000..84640dfc --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci @@ -0,0 +1,126 @@ +function UpdatedOutArg = ... + FA_GetOutArgInfo(InArg,NInArg,OutArg,NOutArg,SharedInfo,FunPrecSpecifier,FunTypeAnnot,FunSizeAnnot,ReportFileName) +// function UpdatedOutArg = ... +// FA_GetOutArgInfo(InArg,NInArg,OutArg,NOutArg,SharedInfo,FunPrecSpecifier,FunTypeAnnot,FunSizeAnnot,ReportFileName) +// ----------------------------------------------------------------- +// #RNU_RES_B +// InArg is used by eval don't remove it from the function call. +// +// #RNU_RES_E +// Input data: +// //NUT: Add description here +// +// Output data: +// //NUT: Add description here +// +// Status: +// 25-Oct-2007 -- Raffaele Nutricato: Author. +// +// Copyright 2007 Raffaele Nutricato. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),9,9); +// ----------------------- +// --- Initialization. --- +// ----------------------- +UpdatedOutArg = OutArg; +for cntin = 1:NInArg + IN(cntin).TP = InArg(cntin).Type; + for _InArgSize=1:size(InArg(cntin).Size, '*') + IN(cntin).SZ(_InArgSize) = InArg(cntin).Size(_InArgSize); + end + if ((isnan(InArg(cntin).Value)) & (GetSymbolDimension(InArg(cntin).Size) == 0)) + // #RNU_RES_B + // IN(cntin).VAL = '__SCI2CNANSIZE'; //RNU: toglimi + //RNU: Replace the value of the variable with its name, in case it is a scalar variable. + // #RNU_RES_E + IN(cntin).VAL = InArg(cntin).Name; + else + IN(cntin).VAL = string(InArg(cntin).Value); + end +end +DefaultPrecision = SharedInfo.DefaultPrecision; + +// --------------------------- +// --- End Initialization. --- +// --------------------------- +if (FunTypeAnnot(1) == '') + NOutArg = 0; +else + NOutArg = max(size(FunTypeAnnot)); +end + +flagfindlike = 0; +for counterin = 1:NInArg + if (InArg(counterin).FindLike == 1 | InArg(counterin).FindLike == -1) + // #RNU_RES_B + // Then we must assume that the output will be findlike + // 0 = no find-like + // 1 = pure find-like + //-1 = similar to find-like (out=fun(in)) where in is find-like. + // #RNU_RES_E + flagfindlike = -1; + end +end + +for counterout = 1:NOutArg + + if(FunTypeAnnot == 'FA_TP_USER') + UpdatedOutArg(counterout).Type = FA_TP_USER(FunPrecSpecifier,DefaultPrecision); + else + UpdatedOutArg(counterout).Type = eval(FunTypeAnnot(counterout)); + end + UpdatedOutArg(counterout).FindLike = 0; + + // This is just to remove the FA_SZ_RTMAX tag ??? + lengthFA_SZ_RTMAX = length('FA_SZ_RTMAX'); + if (SCI2Cstrncmps1size('FA_SZ_RTMAX',FunSizeAnnot(counterout,1))) + UpdatedOutArg(counterout).FindLike = 1; + FunSizeAnnot(counterout,1) = part(FunSizeAnnot(counterout,1),lengthFA_SZ_RTMAX+1:length(FunSizeAnnot(counterout,1))); + end + + if (SCI2Cstrncmps1size('FA_SZ_RTMAX',FunSizeAnnot(counterout,2))) + UpdatedOutArg(counterout).FindLike = 1; + FunSizeAnnot(counterout,2) = part(FunSizeAnnot(counterout,2),lengthFA_SZ_RTMAX+1:length(FunSizeAnnot(counterout,2))); + end + + if (flagfindlike == -1) + UpdatedOutArg(counterout).FindLike = -1; + end + + // #RNU_RES_B + // When the size is given by e IN(x).VAL annotation we can have two cases: + // IN(x).VAL is a number or IN(x).VAL is %nan. When it is %nan the + // size is equal to the name of IN(x). + // This is a dynamic memory extension of a local variable and for the moment + // we issue an error according to SCI2C specifications + // #RNU_RES_E + + for iterOutputPosition=1:size(FunSizeAnnot, 'c') + tmpeval = eval(FunSizeAnnot(counterout, iterOutputPosition)); + if (IsNanSize(tmpeval)) + if SharedInfo.ForExpr.OnExec == 0 + EM_NanSize(ReportFileName); + else + UpdatedOutArg(counterout).Size(iterOutputPosition) = string(tmpeval); + end + elseif(isnum(tmpeval)) + if (eval(tmpeval) <= 0) + EM_ZeroSize(ReportFileName); + else + UpdatedOutArg(counterout).Size(iterOutputPosition) = string(tmpeval); + end + else + UpdatedOutArg(counterout).Size(iterOutputPosition) = string(tmpeval); + end + end + + UpdatedOutArg(counterout).Value = %nan; + UpdatedOutArg(counterout).Dimension = GetSymbolDimension(UpdatedOutArg(counterout).Size); + UpdatedOutArg(counterout).Scope = 'Temp';//NUT anche su questo si puo' ragionare verifica anche la handleoperation. +end +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin b/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin new file mode 100644 index 00000000..6ebef2c9 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.sci b/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.sci new file mode 100644 index 00000000..95427001 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.sci @@ -0,0 +1,79 @@ +function ResizeApproach = FA_GetResizeApproach(scifilename,ReportFileName) + +// function ResizeApproach = FA_GetResizeApproach(scifilename,ReportFileName) +// ----------------------------------------------------------------- +// Extracts the resize approach from the file .sci passed in input. +// The following annotation will be searched in the scilab code: +// //SCI2C: RESIZE_APPROACH= NO_RESIZE +// //SCI2C: RESIZE_APPROACH= RESIZE_ALL +// //SCI2C: RESIZE_APPROACH= REALLOC_ALL_RESIZE_ALL +// //SCI2C: RESIZE_APPROACH= RESIZE_TEMP +// //SCI2C: RESIZE_APPROACH= RESIZE_LOCAL +// //SCI2C: RESIZE_APPROACH= RESIZE_GLOBAL +// If the annotation is missing the default NO_RESIZE approach will be +// implicitly used. +// +// Input data: +// --- +// +// Output data: +// ResizeApproach: string which specifies the resize approach +// used in the translation of scifilename. +// +// Status: +// 12-Jul-2008 -- Raffaele Nutricato: Author. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +// ----------------------- +// --- Initialization. --- +// ----------------------- +ResizeApproach = 'NO_RESIZE'; +annotationstring = '//SCI2C: RESIZE_APPROACH=' +PrintStringInfo('***Get resize approach from: '+scifilename,ReportFileName,'file','y'); // #RNUREM_ME +// --------------------------- +// --- End Initialization. --- +// --------------------------- + +// --- Open the .sci file (read only). --- +scifid = SCI2COpenFileRead(scifilename); + +// --- Loop over the lines of the input file. --- +// Position file pointer to the desired NInArg/NOutArg section, +// and read the NOutArg annotation. +foundannotation = 0; +line_position = 0; + +while ((meof(scifid) == 0) & (foundannotation == 0)) + check_string = stripblanks(mgetl(scifid,1)); + line_position = line_position + 1; + if (~isempty(check_string)) + if (SCI2Cstrncmps1size(annotationstring,check_string)) + tmpresize = stripblanks(part(check_string,length(annotationstring)+1:length(check_string))); + // #RNU_RES_B + PrintStringInfo(' Line '+string(line_position)+... + ' - Found annotation for resize approach'+' ""'+check_string+' ""',... + ReportFileName,'file','y'); + // #RNU_RES_E + foundannotation = 1; + end + end +end + +if (foundannotation == 0) + // #RNU_RES_B + PrintStringInfo('Annotation for resize approach not found.',ReportFileName,'file','y'); + PrintStringInfo('Using the ''NO_RESIZE'' resize approach.',ReportFileName,'file','y'); + // #RNU_RES_E +else + ResizeApproach = tmpresize; +end +mclose(scifid); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_INT.bin b/2.3-1/macros/FunctionAnnotation/FA_INT.bin new file mode 100644 index 00000000..edf9bb84 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_INT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_INT.sci b/2.3-1/macros/FunctionAnnotation/FA_INT.sci new file mode 100644 index 00000000..e1bdba33 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_INT.sci @@ -0,0 +1,40 @@ +function opout = FA_INT(in1) +// function opout = FA_INT(in1) +// ----------------------------------------------------------------- +// Int function for Function Annotations. +// When in1 is a number opout = int(in1); where int truncates in1 +// to integer. If in1 is string opout = in1. +// +// Input data: +// in1: string specifying a number or a symbol. +// +// Output data: +// opout: string containing the computed result. +// +// Status: +// 26-Oct-2007 -- Raffaele Nutricato: Author. +// 26-Oct-2007 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),1,1); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +if (isnum(in1)) + outnum = int(eval(in1)); + if isnan(outnum) + opout = '__SCI2CNANSIZE'; + else + opout = string(outnum); + end +else + opout = in1; +end +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_MAX.bin b/2.3-1/macros/FunctionAnnotation/FA_MAX.bin new file mode 100644 index 00000000..b69cd8fc Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_MAX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_MAX.sci b/2.3-1/macros/FunctionAnnotation/FA_MAX.sci new file mode 100644 index 00000000..c5406f14 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_MAX.sci @@ -0,0 +1,50 @@ +function opout = FA_MAX(in1,in2) +// function opout = FA_MAX(in1,in2) +// ----------------------------------------------------------------- +// Maximum function for Function Annotations. +// When in1 and in2 are both symbols this function returns +// in1. +// +// Input data: +// in1: string specifying a number or a symbol. +// in2: string specifying a number or a symbol. +// +// Output data: +// opout: string containing the computed result. +// +// Status: +// 26-Oct-2007 -- Raffaele Nutricato: Author. +// 26-Oct-2007 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +if (isnum(in1)) + in1num = eval(in1); + if (isnum(in2)) + in2num = eval(in2); + outnum = max(in1num,in2num); + if isnan(outnum) + opout = '__SCI2CNANSIZE'; + else + opout = string(outnum); + end + else + if (in1num == 1) + opout = string(in2); + end + end +else + opout = string(in1); +end + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_MIN.bin b/2.3-1/macros/FunctionAnnotation/FA_MIN.bin new file mode 100644 index 00000000..6010c4bf Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_MIN.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_MIN.sci b/2.3-1/macros/FunctionAnnotation/FA_MIN.sci new file mode 100644 index 00000000..e1539103 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_MIN.sci @@ -0,0 +1,45 @@ +function opout = FA_MIN(in1,in2) +// function opout = FA_MIN(in1,in2) +// ----------------------------------------------------------------- +// Minimum function for Function Annotations. +// When in1 and in2 are both symbols this function returns +// in1. +// +// Input data: +// in1: string specifying a number or a symbol. +// in2: string specifying a number or a symbol. +// +// Output data: +// opout: string containing the computed result. + +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +if (isnum(in1)) + in1num = eval(in1); + if (isnum(in2)) + in2num = eval(in2); + outnum = min(in1num,in2num); + if isnan(outnum) + opout = '__SCI2CNANSIZE'; + else + opout = string(outnum); + end + else + if (in1num == 1) + opout = string(in2); + end + end +else + opout = string(in1); +end + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_MUL.bin b/2.3-1/macros/FunctionAnnotation/FA_MUL.bin new file mode 100644 index 00000000..8b674c21 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_MUL.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_MUL.sci b/2.3-1/macros/FunctionAnnotation/FA_MUL.sci new file mode 100644 index 00000000..8c9a930a --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_MUL.sci @@ -0,0 +1,42 @@ +function opout = FA_MUL(in1,in2) +// function opout = FA_MUL(in1,in2) +// ----------------------------------------------------------------- +// Multiplication function for Function Annotations. +// +// Input data: +// in1: string specifying a number or a symbol. +// in2: string specifying a number or a symbol. +// +// Output data: +// opout: string containing the computed result. +// +// Status: +// 26-Oct-2007 -- Raffaele Nutricato: Author. +// 26-Oct-2007 -- Alberto Morea: Test Ok. +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +if (isnum(in1) & isnum(in2)) + in1num = eval(in1); + in2num = eval(in2); + outnum = in1num*in2num; + if isnan(outnum) + opout = '__SCI2CNANSIZE'; + else + opout = string(outnum); + end +else + opout = '('+string(in1)+'*'+string(in2)+')'; +end +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_REAL.bin new file mode 100644 index 00000000..ed68eb74 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_REAL.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_REAL.sci b/2.3-1/macros/FunctionAnnotation/FA_REAL.sci new file mode 100644 index 00000000..7b8c0fda --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_REAL.sci @@ -0,0 +1,50 @@ +// +// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab +// Copyright (C) 2009-2009 - DIGITEO - 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 +// +// +function opout = FA_REAL(in1, in2) +// function opout = FA_REAL(in1, in2) +// ----------------------------------------------------------------- +// Real function for Function Annotations. +// When in1 is a number opout = real(in1); where real returns in1 +// real part. If in1 is string opout = in1. +// +// Input data: +// in1: string specifying a number or a symbol. +// in2: string specifying in1 type +// +// Output data: +// opout: string containing the computed result. +// +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +if (isnum(in1)) + outnum = real(eval(in1)); + if isnan(outnum) + opout = '__SCI2CNANSIZE'; + else + opout = string(outnum); + end +else + if (in1 == "%i") + opout = " 0 "; + else + opout = in2+"0real"+FA_TP_REAL(in2)+"0"+"("+in1+")"; + end +end +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SUB.bin b/2.3-1/macros/FunctionAnnotation/FA_SUB.bin new file mode 100644 index 00000000..fdc52b4d Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SUB.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SUB.sci b/2.3-1/macros/FunctionAnnotation/FA_SUB.sci new file mode 100644 index 00000000..1ef0ad46 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SUB.sci @@ -0,0 +1,41 @@ +function opout = FA_SUB(in1,in2) +// function opout = FA_SUB(in1,in2) +// ----------------------------------------------------------------- +// Subtraction function for Function Annotations. +// +// Input data: +// in1: string specifying a number or a symbol. +// in2: string specifying a number or a symbol. +// +// Output data: +// opout: string containing the computed result. +// +// Status: +// 26-Oct-2007 -- Raffaele Nutricato: Author. +// 26-Oct-2007 -- Alberto Morea: Test Ok. +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +if (isnum(in1) & isnum(in2)) + in1num = eval(in1); + in2num = eval(in2); + outnum = in1num-in2num; + if isnan(outnum) + opout = '__SCI2CNANSIZE'; + else + opout = string(outnum); + end +else + opout = '('+string(in1)+'-'+string(in2)+')'; +end +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin new file mode 100644 index 00000000..91cd951d Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_1.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_1.sci new file mode 100644 index 00000000..d9a481ce --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_1.sci @@ -0,0 +1,20 @@ +function outsize = FA_SZ_1(insize) +// function outsize = FA_SZ_1(insize) +// ----------------------------------------------------------------- +// Returns the first element of the size array. +// +// Input data: +// insize: size of input argument. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Output data: +// outsize: first element of the insize array. +// +// Status: +// 08-Dec-2007 -- Raffaele Nutricato: Author. +// 08-Dec-2007 -- Alberto Morea: Test Ok. +// ----------------------------------------------------------------- + +outsize = insize(1); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin new file mode 100644 index 00000000..099f1d66 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_2.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_2.sci new file mode 100644 index 00000000..64fdac10 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_2.sci @@ -0,0 +1,20 @@ +function outsize = FA_SZ_2(insize) +// function outsize = FA_SZ_2(insize) +// ----------------------------------------------------------------- +// Returns the second element of the size array. +// +// Input data: +// insize: size of input argument. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Output data: +// outsize: second element of the insize array. +// +// Status: +// 08-Dec-2007 -- Raffaele Nutricato: Author. +// 08-Dec-2007 -- Alberto Morea: Test Ok. +// ----------------------------------------------------------------- + +outsize = insize(2); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin new file mode 100644 index 00000000..9a39d12a Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci new file mode 100644 index 00000000..c3cae536 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci @@ -0,0 +1,36 @@ +function opout = FA_SZ_FROM_VAL(in1,in2) +// function opout = FA_SZ_FROM_VAL(in1,in2) +// ----------------------------------------------------------------- +// Return a size according to the floored value of the first argument +// +// Input data: +// in1: string specifying a number . +// +// Output data: +// opout: string containing the computed result. +// +// ----------------------------------------------------------------- + +SCI2CNInArgCheck(argn(2),2,2); + + +if (isnum(in1)) + in1num = eval(in1) ; + if isnan(in1num) + opout = '__SCI2CNANSIZE'; + elseif ( in1num < 0 ) + opout= '0' ; + else + opout = string ( floor (abs(in1num))) ; + + end + + +else + opout = in2+"0floor"+in2+"0"+"("+in1+")"; + opout = in2+"0abs"+in2+"0"+"("+opout+")"; + +end + + +endfunction: diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin new file mode 100644 index 00000000..90e50348 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.sci new file mode 100644 index 00000000..a93e8c50 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.sci @@ -0,0 +1,26 @@ +function opoutsize = FA_SZ_OPAPEX(in1size) +// function opoutsize = FA_SZ_OPAPEX(in1size) +// ----------------------------------------------------------------- +// Returns the size of the output computed by OPAPEX operator. +// +// +// Status: +// 08-Jan-2008 -- Raffaele Nutricato: Author. +// 08-Jan-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),1,1); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +opoutsize(1) = string(in1size(2)); +opoutsize(2) = string(in1size(1)); + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin new file mode 100644 index 00000000..be3e89ac Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.sci new file mode 100644 index 00000000..9d0625bd --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.sci @@ -0,0 +1,39 @@ +function opoutsize = FA_SZ_OPBACKSLASH(in1size,in2size) +// function opoutsize = FA_SZ_OPBACKSLASH(in1size,in2size) +// ----------------------------------------------------------------- +// Returns the size of the output computed by OPBACKSLASH operator. +// +// +// Status: +// 08-Mar-2008 -- Alberto Morea: Author. +// 08-Mar-2008 -- Raffaele Nutricato: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +in1size=string(in1size); +in2size=string(in2size); + +// --- Get dimensions of input arguments. --- +in1dim = GetSymbolDimension(in1size); +in2dim = GetSymbolDimension(in2size); + +if (in1dim == 0) + opoutsize = in2size; +elseif (in2dim == 0) + opoutsize = in1size; +else + opoutsize(1) = in1size(2); + opoutsize(2) = in2size(2); +end + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin new file mode 100644 index 00000000..767385a3 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.sci new file mode 100644 index 00000000..50527771 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.sci @@ -0,0 +1,40 @@ +function opoutsize = FA_SZ_OPCC(in1size,in2size) +// function opoutsize = FA_SZ_OPCC(in1size,in2size) +// ----------------------------------------------------------------- +// Returns the size of the output computed by OPCC operator. +// +// +// Status: +// 08-Mar-2008 -- Raffaele Nutricato: Author. +// 08-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +in1size = string(in1size); +in2size = string(in2size); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +// --- Get dimensions of input arguments. --- +in1dim = GetSymbolDimension(in1size); +in2dim = GetSymbolDimension(in2size); + +if (isnum(in1size(1)) & isnum(in2size(1))) + in1num = eval(in1size(1)); + in2num = eval(in2size(1)); + opoutsize(1) = string(in1num+in2num); +else + opoutsize(1) = '('+string(in1size(1))+'+'+string(in2size(1))+')'; +end + +opoutsize(2) = in1size(2); + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin new file mode 100644 index 00000000..822cb5e8 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.sci new file mode 100644 index 00000000..64e8030e --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.sci @@ -0,0 +1,16 @@ +function opoutsize = FA_SZ_OPDOTAPEX(in1size) +// function opoutsize = FA_SZ_OPDOTAPEX(in1size) +// ----------------------------------------------------------------- +// Alias of FA_SZ_OPDOTAPEX. +// +// +// Status: +// 08-Mar-2008 -- Raffaele Nutricato: Author. +// 08-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +opoutsize = FA_SZ_OPDOTAPEX(in1size,in2size); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin new file mode 100644 index 00000000..2af7e390 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.sci new file mode 100644 index 00000000..75f4d5c3 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.sci @@ -0,0 +1,16 @@ +function opoutsize = FA_SZ_OPDOTBACKSLASH(in1size,in2size) +// function opoutsize = FA_SZ_OPDOTBACKSLASH(in1size,in2size) +// ----------------------------------------------------------------- +// Alias of FA_SZ_OPDOTSTAR. +// +// +// Status: +// 08-Mar-2008 -- Raffaele Nutricato: Author. +// 08-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +opoutsize = FA_SZ_OPDOTSTAR(in1size,in2size); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin new file mode 100644 index 00000000..72d6e23d Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.sci new file mode 100644 index 00000000..af522bac --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.sci @@ -0,0 +1,43 @@ +function opoutsize = FA_SZ_OPDOTHAT(in1size,in2size) +// function opoutsize = FA_SZ_OPDOTHAT(in1size,in2size) +// ----------------------------------------------------------------- +// Returns the size of the output computed by OPDOTHAT operator. +// +// Assuming: +// size(in1) = [in1r,in1c] +// size(in2) = [in2r,in2c] +// size(out) = [outr,outc] +// +// we have the following combinations: +// in1 in2 outr outc +// ----------------------- +// S S in2r in2c +// S M in2r in2c +// M S in1r in1c +// M M in1r in1c +// +// Where S means that the input is a scalar +// and M means that the input is a matrix. +// +// Input data: +// in1size: size of input number 1. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// in2size: size of input number 2. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Output data: +// opoutsize: size of output. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Status: +// 10-Dec-2007 -- Raffaele Nutricato: Author. +// 10-Dec-2007 -- Alberto Morea: Test Ok. +// ----------------------------------------------------------------- + +opoutsize = FA_SZ_OPDOTSTAR(in1size,in2size); + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin new file mode 100644 index 00000000..f060e87e Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.sci new file mode 100644 index 00000000..2a071f27 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.sci @@ -0,0 +1,16 @@ +function opoutsize = FA_SZ_OPDOTSLASH(in1size,in2size) +// function opoutsize = FA_SZ_OPDOTSLASH(in1size,in2size) +// ----------------------------------------------------------------- +// Alias of FA_SZ_OPDOTSTAR. +// +// +// Status: +// 08-Mar-2008 -- Raffaele Nutricato: Author. +// 08-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +opoutsize = FA_SZ_OPDOTSTAR(in1size,in2size); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin new file mode 100644 index 00000000..6be9a457 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.sci new file mode 100644 index 00000000..3fbae19a --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.sci @@ -0,0 +1,32 @@ +function opoutsize = FA_SZ_OPDOTSTAR(in1size,in2size) +// function opoutsize = FA_SZ_OPDOTSTAR(in1size,in2size) +// ----------------------------------------------------------------- +// Returns the size of the output computed by OPDOTSTAR operator. +// +// +// Status: +// 08-Jan-2008 -- Raffaele Nutricato: Author. +// 08-Jan-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +// --- Get dimensions of input arguments. --- +in1dim = GetSymbolDimension(in1size); + +if (in1dim == 0) + opoutsize = string(in2size); +else + opoutsize = string(in1size); +end + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin new file mode 100644 index 00000000..feb8122d Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.sci new file mode 100644 index 00000000..31174511 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.sci @@ -0,0 +1,43 @@ +function opoutsize = FA_SZ_OPHAT(in1size,in2size) +// function opoutsize = FA_SZ_OPHAT(in1size,in2size) +// ----------------------------------------------------------------- +// Returns the size of the output computed by OPHAT operator. +// +// Assuming: +// size(in1) = [in1r,in1c] +// size(in2) = [in2r,in2c] +// size(out) = [outr,outc] +// +// we have the following combinations: +// in1 in2 outr outc +// ----------------------- +// S S in2r in2c +// S M in2r in2c +// M S in1r in1c +// M M in1r in1c +// +// Where S means that the input is a scalar +// and M means that the input is a matrix. +// +// Input data: +// in1size: size of input number 1. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// in2size: size of input number 2. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Output data: +// opoutsize: size of output. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Status: +// 10-Dec-2007 -- Raffaele Nutricato: Author. +// 10-Dec-2007 -- Alberto Morea: Test Ok. +// ----------------------------------------------------------------- + +opoutsize = FA_SZ_OPDOTSTAR(in1size,in2size); + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin new file mode 100644 index 00000000..e4419128 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.sci new file mode 100644 index 00000000..099bb9ac --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.sci @@ -0,0 +1,16 @@ +function opoutsize = FA_SZ_OPLOGAND(in1size,in2size) +// function opoutsize = FA_SZ_OPLOGAND(in1size,in2size) +// ----------------------------------------------------------------- +// Alias of FA_SZ_OPDOTSTAR. +// +// +// Status: +// 08-Mar-2008 -- Raffaele Nutricato: Author. +// 08-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +opoutsize = FA_SZ_OPDOTSTAR(in1size,in2size); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin new file mode 100644 index 00000000..afe431b3 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.sci new file mode 100644 index 00000000..4ade6a0f --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.sci @@ -0,0 +1,16 @@ +function opoutsize = FA_SZ_OPLOGEQ(in1size,in2size) +// function opoutsize = FA_SZ_OPLOGEQ(in1size,in2size) +// ----------------------------------------------------------------- +// Alias of FA_SZ_OPDOTSTAR. +// +// +// Status: +// 08-Mar-2008 -- Raffaele Nutricato: Author. +// 08-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +opoutsize = FA_SZ_OPDOTSTAR(in1size,in2size); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin new file mode 100644 index 00000000..87d2d5bf Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.sci new file mode 100644 index 00000000..c6d6ee3f --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.sci @@ -0,0 +1,16 @@ +function opoutsize = FA_SZ_OPLOGGE(in1size,in2size) +// function opoutsize = FA_SZ_OPLOGGE(in1size,in2size) +// ----------------------------------------------------------------- +// Alias of FA_SZ_OPDOTSTAR. +// +// +// Status: +// 08-Mar-2008 -- Raffaele Nutricato: Author. +// 08-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +opoutsize = FA_SZ_OPDOTSTAR(in1size,in2size); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin new file mode 100644 index 00000000..c3a1d88c Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.sci new file mode 100644 index 00000000..0f6493c9 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.sci @@ -0,0 +1,16 @@ +function opoutsize = FA_SZ_OPLOGGT(in1size,in2size) +// function opoutsize = FA_SZ_OPLOGGT(in1size,in2size) +// ----------------------------------------------------------------- +// Alias of FA_SZ_OPDOTSTAR. +// +// +// Status: +// 08-Mar-2008 -- Raffaele Nutricato: Author. +// 08-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +opoutsize = FA_SZ_OPDOTSTAR(in1size,in2size); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin new file mode 100644 index 00000000..80216050 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.sci new file mode 100644 index 00000000..edda359f --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.sci @@ -0,0 +1,16 @@ +function opoutsize = FA_SZ_OPLOGLE(in1size,in2size) +// function opoutsize = FA_SZ_OPLOGLE(in1size,in2size) +// ----------------------------------------------------------------- +// Alias of FA_SZ_OPDOTSTAR. +// +// +// Status: +// 08-Mar-2008 -- Raffaele Nutricato: Author. +// 08-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +opoutsize = FA_SZ_OPDOTSTAR(in1size,in2size); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin new file mode 100644 index 00000000..417fe265 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.sci new file mode 100644 index 00000000..81b1b256 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.sci @@ -0,0 +1,16 @@ +function opoutsize = FA_SZ_OPLOGLT(in1size,in2size) +// function opoutsize = FA_SZ_OPLOGLT(in1size,in2size) +// ----------------------------------------------------------------- +// Alias of FA_SZ_OPDOTSTAR. +// +// +// Status: +// 08-Mar-2008 -- Raffaele Nutricato: Author. +// 08-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +opoutsize = FA_SZ_OPDOTSTAR(in1size,in2size); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin new file mode 100644 index 00000000..6c9f9bf0 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.sci new file mode 100644 index 00000000..ff62abbf --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.sci @@ -0,0 +1,16 @@ +function opoutsize = FA_SZ_OPLOGNE(in1size,in2size) +// function opoutsize = FA_SZ_OPLOGNE(in1size,in2size) +// ----------------------------------------------------------------- +// Alias of FA_SZ_OPDOTSTAR. +// +// +// Status: +// 08-Mar-2008 -- Raffaele Nutricato: Author. +// 08-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +opoutsize = FA_SZ_OPDOTSTAR(in1size,in2size); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin new file mode 100644 index 00000000..417a9195 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.sci new file mode 100644 index 00000000..3b0c6549 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.sci @@ -0,0 +1,16 @@ +function opoutsize = FA_SZ_OPLOGNOT(in1size) +// function opoutsize = FA_SZ_OPLOGNOT(in1size) +// ----------------------------------------------------------------- +// Alias of FA_SZ_OPDOTAPEX. +// +// +// Status: +// 08-Mar-2008 -- Raffaele Nutricato: Author. +// 08-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +opoutsize = FA_SZ_OPDOTAPEX(in1size,in2size); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin new file mode 100644 index 00000000..af6c2a8e Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.sci new file mode 100644 index 00000000..f28eec2f --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.sci @@ -0,0 +1,16 @@ +function opoutsize = FA_SZ_OPLOGOR(in1size,in2size) +// function opoutsize = FA_SZ_OPLOGOR(in1size,in2size) +// ----------------------------------------------------------------- +// Alias of FA_SZ_OPDOTSTAR. +// +// +// Status: +// 08-Mar-2008 -- Raffaele Nutricato: Author. +// 08-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +opoutsize = FA_SZ_OPDOTSTAR(in1size,in2size); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin new file mode 100644 index 00000000..deac97df Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.sci new file mode 100644 index 00000000..5f7fc96a --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.sci @@ -0,0 +1,51 @@ +function opoutsize = FA_SZ_OPMINUS(in1size,in2size) +// function opoutsize = FA_SZ_OPMINUS(in1size,in2size) +// ----------------------------------------------------------------- +// Returns the size of the output computed by OPMINUS operator. +// +// Assuming: +// size(in1) = [in1r,in1c] +// size(in2) = [in2r,in2c] +// size(out) = [outr,outc] +// +// we have the following combinations: +// in1 in2 outr outc +// ----------------------- +// S S in2r in2c +// S M in2r in2c +// M S in1r in1c +// M M in1r in1c +// +// Where S means that the input is a scalar +// and M means that the input is a matrix. +// +// Input data: +// in1size: size of input number 1. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// in2size: size of input number 2. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Output data: +// opoutsize: size of output. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Status: +// 08-Dec-2007 -- Raffaele Nutricato: Author. +// 08-Dec-2007 -- Alberto Morea: Test Ok. +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +opoutsize = FA_SZ_OPPLUSA(in1size,in2size); + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin new file mode 100644 index 00000000..a0fa5424 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci new file mode 100644 index 00000000..f439e23e --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci @@ -0,0 +1,93 @@ +function opoutsize = FA_SZ_OPPLUS(in1size,in2size,in1type,in2type) +// function opoutsize = FA_SZ_OPPLUS(in1size,in2size,in1type,in2type) +// ----------------------------------------------------------------- +// Returns the size of the output computed by OPPLUS operator, +// including the string operations. +// +// Assuming: +// size(in1) = [in1r,in1c] +// size(in2) = [in2r,in2c] +// size(out) = [outr,outc] +// +// we have the following combinations: +// in1 in2 outr outc +// ----------------------- +// S S in2r in2c +// S M in2r in2c +// M S in1r in1c +// M M in1r in1c +// +// Where S means that the input is a scalar +// and M means that the input is a matrix. +// There is also the case related to the string catenation! +// This is the main difference between - and + operators. +// +// Input data: +// in1size: size of input number 1. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// in2size: size of input number 2. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Output data: +// opoutsize: size of output. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Status: +// 08-Dec-2007 -- Raffaele Nutricato: Author. +// 08-Dec-2007 -- Alberto Morea: Test Ok. +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),4,4); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +// --- Get dimensions of input arguments. --- +in1size = string(in1size); +in2size = string(in2size); +in1type = string(in1type); +in2type = string(in2type); +in1dim = GetSymbolDimension(in1size); + +if ((in1type ~= 'g') & (in2type ~= 'g')) + opoutsize = FA_SZ_OPPLUSA(in1size,in2size); +elseif ((in1type == 'g') & (in2type == 'g')) + opoutsize(1) = '1'; + if (isnum(in1size(1)) & isnum(in2size(1))) + in1num = eval(in1size(1)); + in2num = eval(in2size(1)); + if (in1num > 1 | in2num > 1) + error(9999, 'String catenation can be performed only on strings of 1 x N size not N x 1 size'); + //NUT: mi pare che non possano proprio esistere stringe di dimensione Nx1 perche' in + //NUT: scilab esiste il tipo string che e' di size 1x1 e sono io a trasformarlo in + //NUT: 1xN per cui se uso sempre questa convenzione non sbaglio mai. + //NUT: ho provato in scilab a fare la trasposta di una stringa e ottengo sempre 1x1. + end + end + if (isnum(in1size(2)) & isnum(in2size(2))) + in1num = eval(in1size(2)); + in2num = eval(in2size(2)); + opoutsize(2) = string(in1num+in2num-1); + if isnan(opoutsize(2)) + opoutsize(2) = '__SCI2CNANSIZE'; + else + opoutsize(2) = string(opoutsize(2)); + end + else + opoutsize(2) = '('+string(in1size(2))+'+'+string(in2size(2))+'-1)'; + end +else + error(9999, 'Unexpected type combination for ""+"" operator (type1,type2): ('+in1type+in2type+').'); +end + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin new file mode 100644 index 00000000..b45ac592 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.sci new file mode 100644 index 00000000..42ba90d5 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.sci @@ -0,0 +1,66 @@ +function opoutsize = FA_SZ_OPPLUSA(in1size,in2size) +// function opoutsize = FA_SZ_OPPLUSA(in1size,in2size) +// ----------------------------------------------------------------- +// Returns the size of the output computed by OPPLUS operator +// restricted to arithmetic operations (string operations not supported.) +// +// Assuming: +// size(in1) = [in1r,in1c] +// size(in2) = [in2r,in2c] +// size(out) = [outr,outc] +// +// we have the following combinations: +// in1 in2 outr outc +// ----------------------- +// S S in2r in2c +// S M in2r in2c +// M S in1r in1c +// M M in1r in1c +// +// Where S means that the input is a scalar +// and M means that the input is a matrix. +// There is also the case related to the string catenation! +// This is the main difference between - and + operators. +// +// Input data: +// in1size: size of input number 1. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// in2size: size of input number 2. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Output data: +// opoutsize: size of output. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Status: +// 18-Mar-2008 -- Raffaele Nutricato: Author. +// 18-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +// --- Get dimensions of input arguments. --- +in1size = string(in1size); +in2size = string(in2size); +in1dim = GetSymbolDimension(in1size); + +if (in1dim == 0) + opoutsize = in2size; +else + opoutsize = in1size; +end + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin new file mode 100644 index 00000000..6d55e274 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.sci new file mode 100644 index 00000000..c4da4a0f --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.sci @@ -0,0 +1,40 @@ +function opoutsize = FA_SZ_OPRC(in1size,in2size) +// function opoutsize = FA_SZ_OPRC(in1size,in2size) +// ----------------------------------------------------------------- +// Returns the size of the output computed by OPRC operator. +// +// +// Status: +// 08-Mar-2008 -- Raffaele Nutricato: Author. +// 08-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +in1size = string(in1size); +in2size = string(in2size); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +// --- Get dimensions of input arguments. --- +in1dim = GetSymbolDimension(in1size); +in2dim = GetSymbolDimension(in2size); + +opoutsize(1) = in1size(1); + +if (isnum(in1size(2)) & isnum(in2size(2))) + in1num = eval(in1size(2)); + in2num = eval(in2size(2)); + opoutsize(2) = string(in1num+in2num); +else + opoutsize(2) = '('+string(in1size(2))+'+'+string(in2size(2))+')'; +end + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin new file mode 100644 index 00000000..14bb17f9 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.sci new file mode 100644 index 00000000..a44057d9 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.sci @@ -0,0 +1,37 @@ +function opoutsize = FA_SZ_OPSLASH(in1size,in2size) +// function opoutsize = FA_SZ_OPSLASH(in1size,in2size) +// ----------------------------------------------------------------- +// Returns the size of the output computed by OPSLASH operator. +// +// Assuming: +// size(in1) = [in1r,in1c] +// size(in2) = [in2r,in2c] +// size(out) = [outr,outc] +// + + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +in1size = string(in1size); +in2size = string(in2size); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +// --- Get dimensions of input arguments. --- +in1dim = GetSymbolDimension(in1size); +in2dim = GetSymbolDimension(in2size); + +if (in1dim == 0) + opoutsize = in2size; +elseif (in2dim == 0) + opoutsize = in1size; +else + opoutsize(1) = in1size(1); + opoutsize(2) = in2size(1); +end + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin new file mode 100644 index 00000000..2f28cb62 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.sci new file mode 100644 index 00000000..12190d38 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.sci @@ -0,0 +1,68 @@ +function opoutsize = FA_SZ_OPSTAR(in1size,in2size) +// function opoutsize = FA_SZ_OPSTAR(in1size,in2size) +// ----------------------------------------------------------------- +// Returns the size of the output computed by OPSTAR operator. +// +// Assuming: +// size(in1) = [in1r,in1c] +// size(in2) = [in2r,in2c] +// size(out) = [outr,outc] +// +// we have the following combinations: +// in1 in2 outr outc +// ----------------------- +// S S in2r in2c +// S M in2r in2c +// M S in1r in1c +// M M in1r in2c +// +// Where S means that the input is a scalar +// and M means that the input is a matrix. +// +// Input data: +// in1size: size of input number 1. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// in2size: size of input number 2. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Output data: +// opoutsize: size of output. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Status: +// 08-Dec-2007 -- Raffaele Nutricato: Author. +// 08-Dec-2007 -- Alberto Morea: Test Ok. +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +in1size = string(in1size); +in2size = string(in2size); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +// --- Get dimensions of input arguments. --- +in1dim = GetSymbolDimension(in1size); +in2dim = GetSymbolDimension(in2size); + +if (in1dim == 0) + opoutsize = in2size; +elseif (in2dim == 0) + opoutsize = in1size; +else + opoutsize(1) = in1size(1); + opoutsize(2) = in2size(2); +end + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin new file mode 100644 index 00000000..1d68a2e6 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.sci new file mode 100644 index 00000000..6071e960 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.sci @@ -0,0 +1,48 @@ +function opout = FA_SZ_SEL1(in1,in2) +// function opout = FA_SZ_SEL1(in1,in2) +// ----------------------------------------------------------------- +// Determines the number of rows of the output arguments +// according to the number of rows of the first input argument and +// the specifier in2 which can be 1,2 or 'r','c' and 'm'. +// In this release the 'm' specifier is not supported so when it is +// used SCI2C will issue an error. +// +// Input data: +// in1: string specifying a number or a symbol. +// in2: string specifying a number or a symbol. +// +// Output data: +// opout: string containing the computed result. +// +// Status: +// 16-Mar-2008 -- Raffaele Nutricato: Author. +// 16-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ + + +SCI2CNInArgCheck(argn(2),2,2); +ReportFileName = ''; +in2 = string(in2); + +if (in2 == '1' | in2 == '""rr""' ) // Where can r become rr ??? + opout = '1'; +elseif (in2 == '2' | in2 == '""c""' ) + opout = in1; + + +else + PrintStringInfo(' ',ReportFileName,'both','y'); + PrintStringInfo('SCI2CERROR: Cannot associate the second input argument to a known specifier.',ReportFileName,'both','y'); + PrintStringInfo('SCI2CERROR: Please rearrange your code by using one of the following specifiers:',ReportFileName,'both','y'); + PrintStringInfo('SCI2CERROR: 1 or 2.',ReportFileName,'both','y'); + PrintStringInfo(' ',ReportFileName,'both','y'); + error(9999, 'SCI2CERROR: Cannot associate the second input argument to a known specifier.'); +end +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin new file mode 100644 index 00000000..d3897f7d Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.sci new file mode 100644 index 00000000..b0be739f --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.sci @@ -0,0 +1,44 @@ +function opout = FA_SZ_SEL2(in1,in2) +// function opout = FA_SZ_SEL2(in1,in2) +// ----------------------------------------------------------------- +// Determines the number of columns of the output arguments +// according to the number of columns of the first input argument and +// the specifier in2 which can be 1,2 or 'r','c' and 'm'. +// In this release the 'm' specifier is not supported so when it is +// used SCI2C will issue an error. +// +// Input data: +// in1: string specifying a number or a symbol. +// in2: string specifying a number or a symbol. +// +// Output data: +// opout: string containing the computed result. +// +// Status: +// 16-Mar-2008 -- Raffaele Nutricato: Author. +// 16-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); +ReportFileName = ''; +in2 = string(in2); + +if (in2 == '1'| in2 == '""rr""') + opout = in1; +elseif (in2 == '2'| in2 == '""c""') + opout = '1'; +else + PrintStringInfo(' ',ReportFileName,'both','y'); + PrintStringInfo('SCI2CERROR: Cannot associate the second input argument to a known specifier.',ReportFileName,'both','y'); + PrintStringInfo('SCI2CERROR: Please rearrange your code by using one of the following specifiers:',ReportFileName,'both','y'); + PrintStringInfo('SCI2CERROR: 1 or 2.',ReportFileName,'both','y'); + PrintStringInfo(' ',ReportFileName,'both','y'); + error(9999, 'SCI2CERROR: Cannot associate the second input argument to a known specifier.'); +end +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_C.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_C.bin new file mode 100644 index 00000000..d13d92ca Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_C.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_C.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_C.sci new file mode 100644 index 00000000..b383b5ac --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_C.sci @@ -0,0 +1,32 @@ +function typeout = FA_TP_C() +// function typeout = FA_TP_C() +// ----------------------------------------------------------------- +// Returns the "single complex" type specifier +// for Function Annotations. +// +// Input data: +// --- +// +// Output data: +// typeout: string containing the type specifier. +// +// Status: +// 26-Oct-2007 -- Raffaele Nutricato: Author. +// 26-Oct-2007 -- Alberto Morea: Test Ok. +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),0,0); + + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +typeout = 'c'; + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin new file mode 100644 index 00000000..3400b2af Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.sci new file mode 100644 index 00000000..bf3f2f9f --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.sci @@ -0,0 +1,42 @@ +function typeout = FA_TP_COMPLEX(in1) +// function typeout = FA_TP_COMPLEX(in1) +// ----------------------------------------------------------------- +// Converts into complex data type the input argument, by preserving +// the precision of the input argument. +// See following examples: +// FA_TP_COMPLEX('s') = 'c' +// FA_TP_COMPLEX('d') = 'z' +// FA_TP_COMPLEX('c') = 'c' +// FA_TP_COMPLEX('z') = 'z' +// +// Input data: +// in1: string specifying the data type number 1. +// +// Output data: +// typeout: string containing the type specifier. +// +// Status: +// 26-Jan-2008 -- Raffaele Nutricato: Author. +// 26-Jan-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),1,1); + + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +if (in1 == 's') + typeout = 'c'; +elseif (in1 == 'd') + typeout = 'z'; +else + typeout = in1; +end +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_D.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_D.bin new file mode 100644 index 00000000..12293dab Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_D.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_D.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_D.sci new file mode 100644 index 00000000..788a03fe --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_D.sci @@ -0,0 +1,32 @@ +function typeout = FA_TP_D() +// function typeout = FA_TP_D() +// ----------------------------------------------------------------- +// Returns the "double" type specifier +// for Function Annotations. +// +// Input data: +// --- +// +// Output data: +// typeout: string containing the type specifier. +// +// Status: +// 26-Oct-2007 -- Raffaele Nutricato: Author. +// 26-Oct-2007 -- Alberto Morea: Test Ok. +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),0,0); + + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +typeout = 'd'; + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_I.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_I.bin new file mode 100644 index 00000000..503be40b Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_I.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_I.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_I.sci new file mode 100644 index 00000000..94f383f4 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_I.sci @@ -0,0 +1,32 @@ +function typeout = FA_TP_I() +// function typeout = FA_TP_I() +// ----------------------------------------------------------------- +// Returns the "int" type specifier +// for Function Annotations. +// +// Input data: +// --- +// +// Output data: +// typeout: string containing the type specifier. +// +// Status: +// 26-Oct-2007 -- Raffaele Nutricato: Author. +// 26-Oct-2007 -- Alberto Morea: Test Ok. +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),0,0); + + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +typeout = 'i'; + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin new file mode 100644 index 00000000..fabb6d28 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.sci new file mode 100644 index 00000000..0b78f9e3 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.sci @@ -0,0 +1,45 @@ +function opout = FA_TP_MAX(in1,in2) +// function opout = FA_TP_MAX(in1,in2) +// ----------------------------------------------------------------- +// Type-Maximum function for Function Annotations. +// Returns the maximum between the two data types in input according +// to a predefined priority. For example z(double complex) is +// greater that c(single complex). +// +// Input data: +// in1: string specifying the data type number 1. +// in2: string specifying the data type number 2. +// +// Output data: +// opout: string containing the computed result. +// +// Status: +// 26-Oct-2007 -- Raffaele Nutricato: Author. +// 26-Oct-2007 -- Alberto Morea: Test Ok. +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +in1Pin2 = in1+in2; +opout = in1; + +if (in2 == 'z') + opout = 'z'; +elseif (in1Pin2 == 'sd') + opout = 'd'; +elseif (in1Pin2 == 'sc') + opout = 'c'; +elseif (in1Pin2 == 'dc') + opout = 'z'; +end + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin new file mode 100644 index 00000000..fa2d4c3d Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.sci new file mode 100644 index 00000000..43fc7926 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.sci @@ -0,0 +1,35 @@ +function opout = FA_TP_MIN_REAL(in1,in2) +// Status: +// 2009 -- Arnaud Torset: Author. +// +// ----------------------------------------------------------------- +// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab +// Copyright (C) INRIA +// +// 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 + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +//SCI2CNInArgCheck(argn(2),2,2); + +in1Pin2 = in1+in2; +opout = in1; + +if (opout == 'c') + opout = 's'; +elseif (opout == 'z') + opout = 'd'; +end + +if (in2 == 'c') + opout = 's'; +elseif (in2 == 's') + opout = 's'; +end + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin new file mode 100644 index 00000000..14f31012 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.sci new file mode 100644 index 00000000..67a946dc --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.sci @@ -0,0 +1,38 @@ +function opout = FA_TP_REAL(in1) +// function opout = FA_TP_REAL(in1) +// ----------------------------------------------------------------- +// Type-Real function for Function Annotations. +// Returns the real precision corresponding to the precision of +// the input operand. +// +// Input data: +// in1: string specifying the data type number 1. +// +// Output data: +// opout: string containing the computed result. +// +// Status: +// 26-Mar-2008 -- Raffaele Nutricato: Author. +// 26-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),1,1); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +opout = in1; + +if (in1 == 'c') + opout = 's'; +elseif (in1 == 'z') + opout = 'd'; +end + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_S.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_S.bin new file mode 100644 index 00000000..1419e461 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_S.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_S.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_S.sci new file mode 100644 index 00000000..3de4c20c --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_S.sci @@ -0,0 +1,32 @@ +function typeout = FA_TP_S() +// function typeout = FA_TP_S() +// ----------------------------------------------------------------- +// Returns the "float" type specifier +// for Function Annotations. +// +// Input data: +// --- +// +// Output data: +// typeout: string containing the type specifier. +// +// Status: +// 26-Oct-2007 -- Raffaele Nutricato: Author. +// 26-Oct-2007 -- Alberto Morea: Test Ok. +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),0,0); + + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +typeout = 's'; + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin new file mode 100644 index 00000000..87e18d54 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_USER.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_USER.sci new file mode 100644 index 00000000..e60a8ce8 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_USER.sci @@ -0,0 +1,38 @@ +function type_out = FA_TP_USER(PrecisionSpecifier,DefaultType) +// function type_out = FA_TP_USER(PrecisionSpecifier,DefaultType) +// ----------------------------------------------------------------- +// Generate the output type of the output argument by using the +// output (AnnotationFnc) generated by CheckAnnotationFunction. +// double and float functions can be used to specify the type +// of the output argument. They are typically used in combination +// with zeros-like function. +// +// Input data: +// PrecisionSpecifier: it can be 'double' or 'float'. +// +// Output data: +// type_out: specifies the type of the output argument. It can be +// 's' for float precision or 'd' for double precision. +// +// Status: +// 26-Oct-2007 -- Raffaele Nutricato: Author. +// 26-Oct-2007 -- Alberto Morea: Test Ok. +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +if (mtlb_strcmp(PrecisionSpecifier,'int')) + type_out = 'i'; +elseif (mtlb_strcmp(PrecisionSpecifier,'float')) + type_out = 's'; +elseif (mtlb_strcmp(PrecisionSpecifier,'double')) + type_out = 'd'; +elseif (mtlb_strcmp(PrecisionSpecifier,'default')) + type_out = DefaultType; +else + error(9999, 'Unknown precision function: ""'+AnnotationFnc+'"".'); +end +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin new file mode 100644 index 00000000..6c371723 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_Z.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_Z.sci new file mode 100644 index 00000000..2ac18dea --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_Z.sci @@ -0,0 +1,32 @@ +function typeout = FA_TP_Z() +// function typeout = FA_TP_Z() +// ----------------------------------------------------------------- +// Returns the "double complex" type specifier +// for Function Annotations. +// +// Input data: +// --- +// +// Output data: +// typeout: string containing the type specifier. +// +// Status: +// 26-Oct-2007 -- Raffaele Nutricato: Author. +// 26-Oct-2007 -- Alberto Morea: Test Ok. +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),0,0); + + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +typeout = 'z'; + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/buildmacros.sce b/2.3-1/macros/FunctionAnnotation/buildmacros.sce new file mode 100644 index 00000000..60fd2843 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/buildmacros.sce @@ -0,0 +1,15 @@ +// +// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab +// Copyright (C) 2009-2009 - DIGITEO - 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 +// +// + +tbx_build_macros(TOOLBOX_NAME, get_absolute_file_path('buildmacros.sce')); + +clear tbx_build_macros; diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib new file mode 100644 index 00000000..78fb2f09 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/lib differ diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names new file mode 100644 index 00000000..83710bca --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/names @@ -0,0 +1,51 @@ +FA_SZ_OPRC +FA_SZ_OPLOGEQ +FA_SZ_OPLOGLT +FA_DIV +FA_SZ_OPCC +FA_SZ_OPPLUS +FA_TP_Z +FA_SZ_OPLOGGE +FA_MIN +FA_MUL +FA_SZ_OPLOGOR +FA_SZ_OPSTAR +FA_SZ_OPMINUS +FA_SZ_SEL1 +FA_SZ_OPLOGNE +FA_SZ_OPSLASH +FA_SZ_OPDOTAPEX +FA_SZ_OPBACKSLASH +FA_GetFunAnn +FA_SZ_OPDOTSLASH +FA_SZ_OPPLUSA +FA_MAX +FA_GetDefaultPrecision +FA_SZ_OPHAT +FA_TP_C +FA_INT +FA_TP_REAL +FA_TP_USER +FA_REAL +FA_TP_COMPLEX +FA_ADD +FA_TP_MIN_REAL +FA_SZ_1 +FA_SZ_OPDOTHAT +FA_SZ_OPDOTBACKSLASH +FA_TP_I +FA_SZ_FROM_VAL +FA_SZ_OPLOGAND +FA_GetOutArgInfo +FA_TP_S +FA_TP_D +FA_TP_MAX +FA_SZ_2 +FA_SZ_SEL2 +FA_GetResizeApproach +FA_SZ_OPLOGGT +FA_SZ_OPDOTSTAR +FA_SUB +FA_SZ_OPLOGNOT +FA_SZ_OPLOGLE +FA_SZ_OPAPEX -- cgit From dcc7a8331ba9ae3bdd00670a018631c77517c100 Mon Sep 17 00:00:00 2001 From: Siddhesh Wani Date: Thu, 30 Jul 2015 17:06:28 +0530 Subject: Added new data types. Support for few functions with new data types added. These changes requires proper testing --- .../FunctionAnnotation/FA_GetDefaultPrecision.sci | 9 +++++++ 2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin | Bin 0 -> 9600 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_INT16.sci | 30 +++++++++++++++++++++ 2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin | Bin 0 -> 9600 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_INT8.sci | 30 +++++++++++++++++++++ 2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin | Bin 0 -> 9600 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.sci | 30 +++++++++++++++++++++ 2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin | Bin 0 -> 9600 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.sci | 30 +++++++++++++++++++++ 2.3-1/macros/FunctionAnnotation/names | 4 +++ 10 files changed, 133 insertions(+) create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_INT16.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_INT8.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.sci (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.sci b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.sci index 3afe2648..da5486dc 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.sci @@ -79,6 +79,15 @@ else defaultprecision = 's'; elseif (tmpprecision == 'DOUBLE') defaultprecision = 'd'; + elseif (tmpprecision == 'UINT8') + defaultprecision = 'u8'; + elseif (tmpprecision == 'INT8') + defaultprecision = 'i8'; + elseif (tmpprecision == 'UINT16') + defaultprecision = 'u16'; + elseif (tmpprecision == 'INT16') + defaultprecision = 'i16'; + end end diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin new file mode 100644 index 00000000..2ffc10e5 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.sci new file mode 100644 index 00000000..8971754d --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.sci @@ -0,0 +1,30 @@ +function typeout = FA_TP_INT16() +// function typeout = FA_TP_INT16() +// ----------------------------------------------------------------- +// Returns the "uint8" type specifier +// for Function Annotations. +// +// Input data: +// --- +// +// Output data: +// typeout: string containing the type specifier. +// +// Status: +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),0,0); + + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +typeout = 'i16'; + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin new file mode 100644 index 00000000..3455174f Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.sci new file mode 100644 index 00000000..49c752bb --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.sci @@ -0,0 +1,30 @@ +function typeout = FA_TP_INT8() +// function typeout = FA_TP_INT8() +// ----------------------------------------------------------------- +// Returns the "int8" type specifier +// for Function Annotations. +// +// Input data: +// --- +// +// Output data: +// typeout: string containing the type specifier. +// +// Status: +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),0,0); + + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +typeout = 'i8'; + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin new file mode 100644 index 00000000..5c0ec30c Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.sci new file mode 100644 index 00000000..5f1c98f7 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.sci @@ -0,0 +1,30 @@ +function typeout = FA_TP_UINT16() +// function typeout = FA_TP_UINT16() +// ----------------------------------------------------------------- +// Returns the "uint16" type specifier +// for Function Annotations. +// +// Input data: +// --- +// +// Output data: +// typeout: string containing the type specifier. +// +// Status: +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),0,0); + + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +typeout = 'u16'; + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin new file mode 100644 index 00000000..69661391 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.sci new file mode 100644 index 00000000..934f3540 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.sci @@ -0,0 +1,30 @@ +function typeout = FA_TP_UINT8() +// function typeout = FA_TP_UINT8() +// ----------------------------------------------------------------- +// Returns the "uint8" type specifier +// for Function Annotations. +// +// Input data: +// --- +// +// Output data: +// typeout: string containing the type specifier. +// +// Status: +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),0,0); + + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +typeout = 'u8'; + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names index 83710bca..e95bff5f 100644 --- a/2.3-1/macros/FunctionAnnotation/names +++ b/2.3-1/macros/FunctionAnnotation/names @@ -49,3 +49,7 @@ FA_SUB FA_SZ_OPLOGNOT FA_SZ_OPLOGLE FA_SZ_OPAPEX +FA_TP_UINT8 +FA_TP_INT8 +FA_TP_UINT8 +FA_TP_INT16 -- cgit From 91cf1e8d5e6469ac625ba7b96510f756b5f1b404 Mon Sep 17 00:00:00 2001 From: imushir Date: Fri, 27 Nov 2015 12:13:06 +0530 Subject: r and c condition added for max function --- 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci | 73 +++++++++++++++++++++++- 1 file changed, 71 insertions(+), 2 deletions(-) (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci index f439e23e..4ad282ff 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci @@ -53,41 +53,110 @@ SCI2CNInArgCheck(argn(2),4,4); // --- Generate Output. --- // ------------------------ // --- Get dimensions of input arguments. --- +disp(in1type,'in1type before casting : '); +disp(type(in1type),'in1type before casting using type function : '); +disp(in2type,'in2type before casting : '); +disp(type(in2type),'in2type is before casting using type function : '); +disp(in1size,'in1size before casting : '); +disp(size(in1size),'in1size before casting using size funcion : '); +disp(in2size,'in2size before casting : ') +disp(size(in2size),'in2size before casting using size function : '); in1size = string(in1size); in2size = string(in2size); in1type = string(in1type); in2type = string(in2type); +disp(in1type,'in1type After casting : '); +disp(type(in1type),'in1type After casting using type function : '); +disp(in2type,'in2type After casting : '); +disp(type(in2type),'in2type After casting using type function : '); +disp(in1size,'in1size After casting : '); +disp(size(in1size),'in1size After casting using size funcion : '); +disp(in2size,'in2size After casting : ') +disp(size(in2size),'in2size After casting using size function : '); in1dim = GetSymbolDimension(in1size); - +in2dim = GetSymbolDimension(in2size); +disp(in1dim,'in1dimension is : '); +disp(in2dim,'in2dimension is : '); if ((in1type ~= 'g') & (in2type ~= 'g')) + disp("Inside 1st if condition"); opoutsize = FA_SZ_OPPLUSA(in1size,in2size); + disp(opoutsize,'Opoutsize in 1st if condition is : '); +disp("Going to 1st elseif statement"); elseif ((in1type == 'g') & (in2type == 'g')) + disp("Inside to elseif statement"); opoutsize(1) = '1'; + disp(opoutsize(1),"oputsize(1) is : ") if (isnum(in1size(1)) & isnum(in2size(1))) + disp("Inside 2nd if condition"); in1num = eval(in1size(1)); + disp(in1num,"in1num is in 2nd if : "); in2num = eval(in2size(1)); - if (in1num > 1 | in2num > 1) + disp(in2num,"in2num is in 2nd if : "); + if (in1num > 1 & in2num > 1) + disp("Inside 3rd if condition"); error(9999, 'String catenation can be performed only on strings of 1 x N size not N x 1 size'); //NUT: mi pare che non possano proprio esistere stringe di dimensione Nx1 perche' in //NUT: scilab esiste il tipo string che e' di size 1x1 e sono io a trasformarlo in //NUT: 1xN per cui se uso sempre questa convenzione non sbaglio mai. //NUT: ho provato in scilab a fare la trasposta di una stringa e ottengo sempre 1x1. + disp("End of 3rd if condition"); end + disp("End of 2nd if condition"); end if (isnum(in1size(2)) & isnum(in2size(2))) + disp("Inside 4th if condition"); in1num = eval(in1size(2)); + disp(in1num,"in1num is in 4th if : "); in2num = eval(in2size(2)); + disp(in2num,"in2num is in 4th if : "); opoutsize(2) = string(in1num+in2num-1); + disp(opoutsize(2),"Final Oputsize(2) without casting to String : "); if isnan(opoutsize(2)) + disp("Inside 5th if condition"); opoutsize(2) = '__SCI2CNANSIZE'; + disp(opoutsize(2),"Opoutsize(2) is when it is not a Number : "); else opoutsize(2) = string(opoutsize(2)); + disp(opoutsize(2),"Opoutsize(2) is casting to String : "); end + disp("Outside of 5th if condition"); else opoutsize(2) = '('+string(in1size(2))+'+'+string(in2size(2))+'-1)'; + disp(opoutsize(2),"Final Opoutsize(2) casting to String : ") + end + disp("Outside 4th if condition"); +disp("Going to Inside 2nd elseif condition"); + +elseif (in2type == 'g') + disp("Inside 4th elseif condition"); + if (isnum(in2size(2))) + disp(in2size(2),"in2size(2) is inside 1st if of 4th elseif : "); + if(in2size(2) == 3) + in1num = eval(in1size(2)); + opoutsize(2) = string(in1num); + #opoutsize = string(in1num); + disp(opoutsize,"opoutsize inside 1st If condition of 4th elseif : "); + else + in2num = eval(in1size(1)); + opoutsize(1) = string(in2num); + #opoutsize = in2num; + disp(opoutsize,"opoutsize inside 1st Else condition of 4th elseif : "); + end + disp("OutSide of 1st if condition of 4th elseif"); + + else + disp("Inside else condition of 4th else") + if(in2size(2) == 3) + opoutsize(2) = '('+string(in1size(2))+')'; + disp(opoutsize(2),"Final Opoutsize(2) is not a number : ") + else + opoutsize(1) = '('+string(in1size(1))+')'; + disp(opoutsize(1),"Final Opoutsize(1) is not a number : ") + end end else error(9999, 'Unexpected type combination for ""+"" operator (type1,type2): ('+in1type+in2type+').'); end endfunction + -- cgit From 128638e88ce6d8414c9e1061faa96008be9bcda5 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Sat, 28 Nov 2015 11:01:40 +0530 Subject: Intermediate commit aith support added for AVR (GPIO,ADC). Does not support other targets. --- .../FunctionAnnotation/FA_GetDefaultPrecision.bin | Bin 10540 -> 11192 bytes 2.3-1/macros/FunctionAnnotation/lib | Bin 1656 -> 1928 bytes 2.3-1/macros/FunctionAnnotation/names | 88 ++++++++++----------- 3 files changed, 44 insertions(+), 44 deletions(-) (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin index 026863b2..61f446f3 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin and b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib index 78fb2f09..50f6251b 100644 Binary files a/2.3-1/macros/FunctionAnnotation/lib and b/2.3-1/macros/FunctionAnnotation/lib differ diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names index e95bff5f..d9300d20 100644 --- a/2.3-1/macros/FunctionAnnotation/names +++ b/2.3-1/macros/FunctionAnnotation/names @@ -1,55 +1,55 @@ -FA_SZ_OPRC -FA_SZ_OPLOGEQ -FA_SZ_OPLOGLT +FA_ADD FA_DIV -FA_SZ_OPCC -FA_SZ_OPPLUS -FA_TP_Z -FA_SZ_OPLOGGE -FA_MIN -FA_MUL -FA_SZ_OPLOGOR -FA_SZ_OPSTAR -FA_SZ_OPMINUS -FA_SZ_SEL1 -FA_SZ_OPLOGNE -FA_SZ_OPSLASH -FA_SZ_OPDOTAPEX -FA_SZ_OPBACKSLASH -FA_GetFunAnn -FA_SZ_OPDOTSLASH -FA_SZ_OPPLUSA -FA_MAX FA_GetDefaultPrecision -FA_SZ_OPHAT -FA_TP_C +FA_GetFunAnn +FA_GetOutArgInfo +FA_GetResizeApproach FA_INT -FA_TP_REAL -FA_TP_USER +FA_MAX +FA_MIN +FA_MUL FA_REAL -FA_TP_COMPLEX -FA_ADD -FA_TP_MIN_REAL +FA_SUB FA_SZ_1 -FA_SZ_OPDOTHAT -FA_SZ_OPDOTBACKSLASH -FA_TP_I +FA_SZ_2 FA_SZ_FROM_VAL +FA_SZ_OPAPEX +FA_SZ_OPBACKSLASH +FA_SZ_OPCC +FA_SZ_OPDOTAPEX +FA_SZ_OPDOTBACKSLASH +FA_SZ_OPDOTHAT +FA_SZ_OPDOTSLASH +FA_SZ_OPDOTSTAR +FA_SZ_OPHAT FA_SZ_OPLOGAND -FA_GetOutArgInfo -FA_TP_S -FA_TP_D -FA_TP_MAX -FA_SZ_2 -FA_SZ_SEL2 -FA_GetResizeApproach +FA_SZ_OPLOGEQ +FA_SZ_OPLOGGE FA_SZ_OPLOGGT -FA_SZ_OPDOTSTAR -FA_SUB -FA_SZ_OPLOGNOT FA_SZ_OPLOGLE -FA_SZ_OPAPEX -FA_TP_UINT8 +FA_SZ_OPLOGLT +FA_SZ_OPLOGNE +FA_SZ_OPLOGNOT +FA_SZ_OPLOGOR +FA_SZ_OPMINUS +FA_SZ_OPPLUS +FA_SZ_OPPLUSA +FA_SZ_OPRC +FA_SZ_OPSLASH +FA_SZ_OPSTAR +FA_SZ_SEL1 +FA_SZ_SEL2 +FA_TP_C +FA_TP_COMPLEX +FA_TP_D +FA_TP_I +FA_TP_INT16 FA_TP_INT8 +FA_TP_MAX +FA_TP_MIN_REAL +FA_TP_REAL +FA_TP_S +FA_TP_UINT16 FA_TP_UINT8 -FA_TP_INT16 +FA_TP_USER +FA_TP_Z -- cgit From 87e2de9869a72ab2058f4b3ca60d5a6e6d8d6035 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Tue, 8 Dec 2015 11:43:14 +0530 Subject: Modified so that code for all three output formats can be generated --- 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin | Bin 30676 -> 30676 bytes .../macros/FunctionAnnotation/FA_GetOutArgInfo.bin | Bin 16712 -> 16712 bytes .../FunctionAnnotation/FA_GetResizeApproach.bin | Bin 10484 -> 10484 bytes 2.3-1/macros/FunctionAnnotation/FA_MAX.bin | Bin 5320 -> 5320 bytes 2.3-1/macros/FunctionAnnotation/FA_MIN.bin | Bin 4524 -> 4524 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin | Bin 14040 -> 14040 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci | 73 +-------------------- 2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin | Bin 9600 -> 2888 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin | Bin 9600 -> 2876 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin | Bin 5028 -> 5028 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin | Bin 3512 -> 3512 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin | Bin 4036 -> 4036 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin | Bin 9600 -> 2896 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin | Bin 9600 -> 2884 bytes 2.3-1/macros/FunctionAnnotation/lib | Bin 1928 -> 1964 bytes 15 files changed, 2 insertions(+), 71 deletions(-) (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin index 7bb2f2bd..d3ca8c04 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin and b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin index 177df55a..1deaff60 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin and b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin b/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin index 6ebef2c9..77397e01 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin and b/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_MAX.bin b/2.3-1/macros/FunctionAnnotation/FA_MAX.bin index b69cd8fc..a9debbab 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_MAX.bin and b/2.3-1/macros/FunctionAnnotation/FA_MAX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_MIN.bin b/2.3-1/macros/FunctionAnnotation/FA_MIN.bin index 6010c4bf..cc9bd02e 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_MIN.bin and b/2.3-1/macros/FunctionAnnotation/FA_MIN.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin index a0fa5424..da84349d 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci index 4ad282ff..f439e23e 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci @@ -53,110 +53,41 @@ SCI2CNInArgCheck(argn(2),4,4); // --- Generate Output. --- // ------------------------ // --- Get dimensions of input arguments. --- -disp(in1type,'in1type before casting : '); -disp(type(in1type),'in1type before casting using type function : '); -disp(in2type,'in2type before casting : '); -disp(type(in2type),'in2type is before casting using type function : '); -disp(in1size,'in1size before casting : '); -disp(size(in1size),'in1size before casting using size funcion : '); -disp(in2size,'in2size before casting : ') -disp(size(in2size),'in2size before casting using size function : '); in1size = string(in1size); in2size = string(in2size); in1type = string(in1type); in2type = string(in2type); -disp(in1type,'in1type After casting : '); -disp(type(in1type),'in1type After casting using type function : '); -disp(in2type,'in2type After casting : '); -disp(type(in2type),'in2type After casting using type function : '); -disp(in1size,'in1size After casting : '); -disp(size(in1size),'in1size After casting using size funcion : '); -disp(in2size,'in2size After casting : ') -disp(size(in2size),'in2size After casting using size function : '); in1dim = GetSymbolDimension(in1size); -in2dim = GetSymbolDimension(in2size); -disp(in1dim,'in1dimension is : '); -disp(in2dim,'in2dimension is : '); + if ((in1type ~= 'g') & (in2type ~= 'g')) - disp("Inside 1st if condition"); opoutsize = FA_SZ_OPPLUSA(in1size,in2size); - disp(opoutsize,'Opoutsize in 1st if condition is : '); -disp("Going to 1st elseif statement"); elseif ((in1type == 'g') & (in2type == 'g')) - disp("Inside to elseif statement"); opoutsize(1) = '1'; - disp(opoutsize(1),"oputsize(1) is : ") if (isnum(in1size(1)) & isnum(in2size(1))) - disp("Inside 2nd if condition"); in1num = eval(in1size(1)); - disp(in1num,"in1num is in 2nd if : "); in2num = eval(in2size(1)); - disp(in2num,"in2num is in 2nd if : "); - if (in1num > 1 & in2num > 1) - disp("Inside 3rd if condition"); + if (in1num > 1 | in2num > 1) error(9999, 'String catenation can be performed only on strings of 1 x N size not N x 1 size'); //NUT: mi pare che non possano proprio esistere stringe di dimensione Nx1 perche' in //NUT: scilab esiste il tipo string che e' di size 1x1 e sono io a trasformarlo in //NUT: 1xN per cui se uso sempre questa convenzione non sbaglio mai. //NUT: ho provato in scilab a fare la trasposta di una stringa e ottengo sempre 1x1. - disp("End of 3rd if condition"); end - disp("End of 2nd if condition"); end if (isnum(in1size(2)) & isnum(in2size(2))) - disp("Inside 4th if condition"); in1num = eval(in1size(2)); - disp(in1num,"in1num is in 4th if : "); in2num = eval(in2size(2)); - disp(in2num,"in2num is in 4th if : "); opoutsize(2) = string(in1num+in2num-1); - disp(opoutsize(2),"Final Oputsize(2) without casting to String : "); if isnan(opoutsize(2)) - disp("Inside 5th if condition"); opoutsize(2) = '__SCI2CNANSIZE'; - disp(opoutsize(2),"Opoutsize(2) is when it is not a Number : "); else opoutsize(2) = string(opoutsize(2)); - disp(opoutsize(2),"Opoutsize(2) is casting to String : "); end - disp("Outside of 5th if condition"); else opoutsize(2) = '('+string(in1size(2))+'+'+string(in2size(2))+'-1)'; - disp(opoutsize(2),"Final Opoutsize(2) casting to String : ") - end - disp("Outside 4th if condition"); -disp("Going to Inside 2nd elseif condition"); - -elseif (in2type == 'g') - disp("Inside 4th elseif condition"); - if (isnum(in2size(2))) - disp(in2size(2),"in2size(2) is inside 1st if of 4th elseif : "); - if(in2size(2) == 3) - in1num = eval(in1size(2)); - opoutsize(2) = string(in1num); - #opoutsize = string(in1num); - disp(opoutsize,"opoutsize inside 1st If condition of 4th elseif : "); - else - in2num = eval(in1size(1)); - opoutsize(1) = string(in2num); - #opoutsize = in2num; - disp(opoutsize,"opoutsize inside 1st Else condition of 4th elseif : "); - end - disp("OutSide of 1st if condition of 4th elseif"); - - else - disp("Inside else condition of 4th else") - if(in2size(2) == 3) - opoutsize(2) = '('+string(in1size(2))+')'; - disp(opoutsize(2),"Final Opoutsize(2) is not a number : ") - else - opoutsize(1) = '('+string(in1size(1))+')'; - disp(opoutsize(1),"Final Opoutsize(1) is not a number : ") - end end else error(9999, 'Unexpected type combination for ""+"" operator (type1,type2): ('+in1type+in2type+').'); end endfunction - diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin index 2ffc10e5..2ebb7346 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin index 3455174f..3f5055fb 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin index fabb6d28..099ea1ba 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin index fa2d4c3d..60293a1d 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin index 14f31012..7e54122a 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin index 5c0ec30c..687024f6 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin index 69661391..02e74047 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib index 50f6251b..c2025c87 100644 Binary files a/2.3-1/macros/FunctionAnnotation/lib and b/2.3-1/macros/FunctionAnnotation/lib differ -- cgit From 9e66f0cb2de5e6475bf9bf6956fea40218bd1dd5 Mon Sep 17 00:00:00 2001 From: imushir Date: Mon, 28 Dec 2015 17:01:05 +0530 Subject: added support for uint8 uin16 int8 int16 --- .../FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci new file mode 100644 index 00000000..5ab0c649 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci @@ -0,0 +1,23 @@ +function outsize = FA_SZ_ROW_COLUMN_CAT(inval,in1size,in2size) + + +//Check the input arguments +SCI2CNInArgCheck(argn(2),3,3); +in1size = string(in1size); +in2size = string(in2size); +inval = string(inval); +if(inval == '1') then + in1num_r = eval(in1size); + in2num_r = eval(in2size); + outsize(1) = string(in1num_r + in2num_r); + outsize(2) = string(in2num_r); +elseif(inval == '2') then + in1num_c = eval(in1size); + in2num_c = eval(in2size) + outsize(1) = string(in1num_c); + outsize(2) = string(in1num_c + in2num_c); +else + error(36, "Wrong input argument '+inval+'. Use 1 or 2 as first argument in cat command."); +end + +endfunction -- cgit From 3425c4fedbdbc7e1a3440df7502d9af93f466b84 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Mon, 1 Feb 2016 11:05:35 +0530 Subject: Support for RPi gpios added --- .../FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin | Bin 0 -> 2812 bytes 2.3-1/macros/FunctionAnnotation/lib | Bin 1964 -> 1988 bytes 2.3-1/macros/FunctionAnnotation/names | 1 + 3 files changed, 1 insertion(+) create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin (limited to '2.3-1/macros/FunctionAnnotation') 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 new file mode 100644 index 00000000..2373b813 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib index c2025c87..6e93fb38 100644 Binary files a/2.3-1/macros/FunctionAnnotation/lib and b/2.3-1/macros/FunctionAnnotation/lib differ diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names index d9300d20..a5f862b9 100644 --- a/2.3-1/macros/FunctionAnnotation/names +++ b/2.3-1/macros/FunctionAnnotation/names @@ -37,6 +37,7 @@ FA_SZ_OPPLUSA FA_SZ_OPRC FA_SZ_OPSLASH FA_SZ_OPSTAR +FA_SZ_ROW_COLUMN_CAT FA_SZ_SEL1 FA_SZ_SEL2 FA_TP_C -- cgit From a6efab1a42eda8c1e3902c2f2d030a9cb9cfd25e Mon Sep 17 00:00:00 2001 From: imushir Date: Tue, 9 Feb 2016 16:38:27 +0530 Subject: Support for Servo motor for Arduino. Support for'diag' in c --- .../macros/FunctionAnnotation/FA_GetOutArgInfo.bin | Bin 16712 -> 16720 bytes .../macros/FunctionAnnotation/FA_GetOutArgInfo.sci | 2 + 2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin | Bin 2604 -> 2608 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_1.sci | 1 + 2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin | Bin 2612 -> 2616 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_2.sci | 1 + .../FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin | Bin 0 -> 3116 bytes .../FunctionAnnotation/FA_SZ_COLUMN_DIAG.sci | 28 +++++++ .../FA_SZ_COLUMN_DIAG_INS_EXT.bin | Bin 0 -> 3364 bytes .../FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin | Bin 0 -> 5068 bytes .../FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.sci | 30 ++++++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin | Bin 3448 -> 3448 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci | 22 +++--- .../macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin | Bin 0 -> 10920 bytes .../macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci | 85 +++++++++++++++++++++ .../FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin | Bin 0 -> 2812 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin | Bin 0 -> 3164 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.sci | 26 +++++++ .../FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin | Bin 0 -> 16296 bytes .../FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.sci | 72 +++++++++++++++++ 2.3-1/macros/FunctionAnnotation/lib | Bin 1964 -> 2104 bytes 2.3-1/macros/FunctionAnnotation/names | 6 ++ 22 files changed, 262 insertions(+), 11 deletions(-) create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG_INS_EXT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.sci (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin index 1deaff60..39d97b24 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin and b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci index 84640dfc..37e6d091 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci @@ -27,6 +27,8 @@ SCI2CNInArgCheck(argn(2),9,9); // ----------------------- // --- Initialization. --- // ----------------------- + + UpdatedOutArg = OutArg; for cntin = 1:NInArg IN(cntin).TP = InArg(cntin).Type; diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin index 91cd951d..c01ff59d 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin and b/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_1.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_1.sci index d9a481ce..3d20b992 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_1.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_1.sci @@ -17,4 +17,5 @@ function outsize = FA_SZ_1(insize) // ----------------------------------------------------------------- outsize = insize(1); + endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin index 099f1d66..00834df4 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin and b/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_2.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_2.sci index 64fdac10..164cab3f 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_2.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_2.sci @@ -17,4 +17,5 @@ function outsize = FA_SZ_2(insize) // ----------------------------------------------------------------- outsize = insize(2); + endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin new file mode 100644 index 00000000..68d6a37c Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.sci new file mode 100644 index 00000000..df129f97 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.sci @@ -0,0 +1,28 @@ +function outsize = FA_SZ_COLUMN_DIAG(insize) + // function outsize = FA_SZ_1(insize) + // ----------------------------------------------------------------- + // Returns the first element of the size array. + // + // Input data: + // insize: size of input argument. It is an array of 2 strings. + // The first string specifies the number of rows. + // The second string specifies the number of columns. + // + // Output data: + // outsize: first element of the insize array. + // + // Status: + // 08-Dec-2007 -- Raffaele Nutricato: Author. + // 08-Dec-2007 -- Alberto Morea: Test Ok. + // ----------------------------------------------------------------- + + if(insize(2)=='1') then + outsize = insize(1); + + elseif(insize(1) == insize(2)) + outsize = '1'; + else + outsize = insize(2); + + end +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG_INS_EXT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG_INS_EXT.bin new file mode 100644 index 00000000..6d883096 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG_INS_EXT.bin differ 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 new file mode 100644 index 00000000..e39a0be3 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.sci new file mode 100644 index 00000000..45d74c3a --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.sci @@ -0,0 +1,30 @@ +function outsize =FA_SZ_COL_DIAG_IN_EX(insize,val) + +///////////////////////////////COLUMN SIZE FOR INSERT POSITION////////////////// + + + + if((insize(1) == '1')) // If ROW size is 1 + if(val == '0') then //For Oth position + outsize = insize(2); //COLUMN size is equal to COLUMN size + else // For ...-2,-1,1,2... position + outsize = string(eval(insize(2))+abs(eval(val)));// COLUMN size is equal to COLUMN size + absolute value of position(for 1*3 matrix and 2nd postion COLUMN size is (3+2)=5 + end + elseif((insize(2) == '1')) // If COLUMN size is 1 + if(val == '0') then //For Oth position + outsize = insize(1); //COLUMNS size is equal to ROW size + else // For ...-2,-1,1,2.... position + outsize = string(eval(insize(1))+abs(eval(val)));// COLUMN size is equal to ROW size + absolute value of position(for 3*1 matrix and 1st postion COLUMN size is (3+1)=4 + end +//////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////COLUMN SIZE FOR EXTRACT POSITION//////////////////// + + else + outsize = '1'; // For extract condition COLUMN size is always ONE. + end + +//////////////////////////////////////////////////////////////////////////////// + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin index 9a39d12a..a06f3b16 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin and b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci index c3cae536..bb02b985 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci @@ -15,20 +15,20 @@ SCI2CNInArgCheck(argn(2),2,2); if (isnum(in1)) - in1num = eval(in1) ; - if isnan(in1num) - opout = '__SCI2CNANSIZE'; - elseif ( in1num < 0 ) - opout= '0' ; - else - opout = string ( floor (abs(in1num))) ; - - end + in1num = eval(in1) ; + if isnan(in1num) + opout = '__SCI2CNANSIZE'; + elseif ( in1num < 0 ) + opout= '0' ; + else + opout = string ( floor (abs(in1num))) ; + end else - opout = in2+"0floor"+in2+"0"+"("+in1+")"; - opout = in2+"0abs"+in2+"0"+"("+opout+")"; + opout = in2+"0floor"+in2+"0"+"("+in1+")"; + opout = in2+"0abs"+in2+"0"+"("+opout+")"; + end diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin new file mode 100644 index 00000000..edba674a Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci new file mode 100644 index 00000000..ca1d2627 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci @@ -0,0 +1,85 @@ +function opoutsize = FA_SZ_ROW_COLUMN(in1size,in2size) +// function opoutsize = FA_SZ_OPPLUSA(in1size,in2size) +// ----------------------------------------------------------------- +// Returns the size of the output computed by OPPLUS operator +// restricted to arithmetic operations (string operations not supported.) +// +// Assuming: +// size(in1) = [in1r,in1c] +// size(in2) = [in2r,in2c] +// size(out) = [outr,outc] +// +// we have the following combinations: +// in1 in2 outr outc +// ----------------------- +// S S in2r in2c +// S M in2r in2c +// M S in1r in1c +// M M in1r in1c +// +// Where S means that the input is a scalar +// and M means that the input is a matrix. +// There is also the case related to the string catenation! +// This is the main difference between - and + operators. +// +// Input data: +// in1size: size of input number 1. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// in2size: size of input number 2. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Output data: +// opoutsize: size of output. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Status: +// 18-Mar-2008 -- Raffaele Nutricato: Author. +// 18-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +// --- Get dimensions of input arguments. --- +in1size = string(in1size); +in2size = string(in2size); +in1type = string(in1type); +in2type = string(in2type); +in1dim = GetSymbolDimension(in1size); +in2dim = GetSymbolDimension(in2size); +if (isnum(in2size(2))) then + if(in2size(2) == '3') then + in1num_c = eval(in1size(2)); + in1num_r = eval(in2size(1)); + opoutsize(1) = string(in1num_r); + opoutsize(2) = string(in1num_c); + else + + in2num_r = eval(in1size(1)); + in2num_c = eval(in2size(1)); + opoutsize(1) = string(in2num_r); + opoutsize(2) = string(in2num_c); + end +else + if(in2size(2) == 3) + opoutsize(2) = '('+string(in1size(2))+')'; + + else + opoutsize(1) = '('+string(in1size(1))+')'; + + end +end + +endfunction 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 new file mode 100644 index 00000000..2373b813 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin new file mode 100644 index 00000000..7fc7dcc8 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.sci new file mode 100644 index 00000000..687a89e4 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.sci @@ -0,0 +1,26 @@ +function outsize = FA_SZ_ROW_DIAG(insize) +// function outsize = FA_SZ_1(insize) +// ----------------------------------------------------------------- +// Returns the first element of the size array. +// +// Input data: +// insize: size of input argument. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Output data: +// outsize: first element of the insize array. +// +// Status: +// 08-Dec-2007 -- Raffaele Nutricato: Author. +// 08-Dec-2007 -- Alberto Morea: Test Ok. +// ----------------------------------------------------------------- + +if(insize(1)=='1') then + outsize = insize(2); +elseif(insize(1) == insize(2)) + outsize = insize(1); +else + outsize = insize(1); +end +endfunction 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 new file mode 100644 index 00000000..046b4b78 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.sci new file mode 100644 index 00000000..1ec720a9 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.sci @@ -0,0 +1,72 @@ +function outsize = FA_SZ_ROW_DIAG_INS_EXT(insize,val) + + // val ==> Position value ...,-2,-1,0,1,2.... + //insize ==> insize(1) will give ROW size and insize(2) will give COLUMN size. + insize = string(insize); + row_num = eval(insize(1)); + col_num = eval(insize(2)); + val_num = eval(val); + /////////////////////////////////////////////// FOR INSERT CONDITION //////////////////////////////////////////// + + + + if(row_num == 1) + if(val_num == 0) then // For 0th position + outsize = string(col_num);// ROW size is equal to COLUMN size + + else // For ....-2,-1,1,2... positions + outsize = string(col_num+abs(val_num)); //ROW is equal to COLUMN SIZE + position value (i.e for 1*4 matrix and insert position 1 then ROW size is 4+1 = 5 ) + + end + elseif(col_num == 1) // if Column size is one + if(val_num == 0) then // For Oth position + outsize = string(row_num); // ROW size is equal to ROW size + + else // ....-2,-1,1,2... positions. + outsize = string(row_num + abs(val_num));//ROW is equal to ROW SIZE + position value (i.e for 4*1 matrix and insert position 1 then ROW size is 4+1 = 5 ) + + end + + /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + + ///////////////////////////////////////// FOR EXTRACT CONDITION ///////////////////////////////////////////////// + + elseif(row_num == col_num) // For no. of rows equal to no. of column (R == C) + if(val_num == 0) then //For 0th position + outsize = string(col_num); // No. of row is equal to column size + else //For ....-2,-1,1,2... Positions + outsize = string(col_num-abs(val_num)); //row value is equal to subtraction of column size and absolute value of position (i.e +ve and -ve both position values) + end + elseif(row_num > col_num) // for no. of rows greater than no. of column (R > C) + if(val_num == 0) then // if 0th position + outsize = string(col_num); // No. of row is equal to column size + elseif(val_num > 0) then // For +ve positions i.e 1,2,3..... + outsize = string(col_num-abs(val_num)); // No. of row is equal to subtraction of column size and absolute value of +ve postion + + elseif(val_num < 0 ) then // For -ve positions i.e -1,-2,-3 + temp_outsize1 = row_num-abs(val_num); //In this row values are varying for 4*3 matrix there is no repetition of same row values,for 5*3 matrix there is (5-3 = 2) two same row size(i.e 3 and 3) for -1,-2 position and for 6*3 matrix there is (6-3 = 3) three same row size(i.e 3 ,3,3) for -1,-2,-3 position + if(temp_outsize1 >= col_num) // if temp_outsize1 is greater than equal to column size then + outsize = string(col_num); // row size is equal to column + else + outsize = string(row_num-abs(val_num)); // else row size is substractio of row and abosulte value of position(i.e -1,-2,-3) + end + end + elseif(row_num < col_num) // for no. of rows less than no. of column size + if(val_num == 0) then // if 0th position + outsize = string(row_num); // No. of row is equal to row size + elseif(val_num > 0) then // for +ve positions i.e 1,2 3..... + temp_outsize2 = col_num-abs(val_num);// In this column values are varying for 3*4 matrix there is no repetition of same row values,for 3*5 matrix there is (5-3 =2) two same row size (i.e 3, 3 ) for 1 ,2 position and for 3*6 matrix there is (6-3 = 3) three row size (i.e 3 ,3 ,3) for 1,2 3 position + if(temp_outsize2 >= row_num) // if temp_outsize2 is greater than equal to row size then + outsize = string(row_num); // row size is equal to row size + else + outsize = string(col_num-abs(val_num)); // else row size substractio of column and absolute value + end + elseif(val_num < 0) then // for -ve positions i.e -1,-2,-3 .. positions + outsize = string(row_num-abs(val_num)); // row size is substraction of row size and absolute value of position values(-1,-2,-3) + end + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + end + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib index c2025c87..11e8b990 100644 Binary files a/2.3-1/macros/FunctionAnnotation/lib and b/2.3-1/macros/FunctionAnnotation/lib differ diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names index d9300d20..2df2ed28 100644 --- a/2.3-1/macros/FunctionAnnotation/names +++ b/2.3-1/macros/FunctionAnnotation/names @@ -12,6 +12,8 @@ FA_REAL FA_SUB FA_SZ_1 FA_SZ_2 +FA_SZ_COLUMN_DIAG +FA_SZ_COL_DIAG_IN_EX FA_SZ_FROM_VAL FA_SZ_OPAPEX FA_SZ_OPBACKSLASH @@ -37,6 +39,10 @@ FA_SZ_OPPLUSA FA_SZ_OPRC FA_SZ_OPSLASH FA_SZ_OPSTAR +FA_SZ_ROW_COLUMN +FA_SZ_ROW_COLUMN_CAT +FA_SZ_ROW_DIAG +FA_SZ_ROW_DIAG_INS_EXT FA_SZ_SEL1 FA_SZ_SEL2 FA_TP_C -- cgit From 53ba48050cb84aac181851b1426579e866d8d1dd Mon Sep 17 00:00:00 2001 From: imushir Date: Mon, 22 Feb 2016 14:18:24 +0530 Subject: added support of double for linspace --- 2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci new file mode 100644 index 00000000..986b5291 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci @@ -0,0 +1,4 @@ +function outsize = FA_SZ_LINSPACE_ROW(insize) + in1num = string(eval(insize(1))); + outsize = in1num; +endfunction: -- cgit From 7198d73fe85d35ef63a88e3c5cc87dc9bbd24ccb Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Mon, 7 Mar 2016 20:42:23 +0530 Subject: Errors in bit***.h files fixed --- .../macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin | Bin 0 -> 408 bytes 2.3-1/macros/FunctionAnnotation/lib | Bin 1988 -> 2132 bytes 2.3-1/macros/FunctionAnnotation/names | 6 ++++++ 3 files changed, 6 insertions(+) create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin new file mode 100644 index 00000000..0a5589ba Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib index 6e93fb38..a31bc1a7 100644 Binary files a/2.3-1/macros/FunctionAnnotation/lib and b/2.3-1/macros/FunctionAnnotation/lib differ diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names index a5f862b9..4fc53d40 100644 --- a/2.3-1/macros/FunctionAnnotation/names +++ b/2.3-1/macros/FunctionAnnotation/names @@ -12,7 +12,10 @@ FA_REAL FA_SUB FA_SZ_1 FA_SZ_2 +FA_SZ_COLUMN_DIAG +FA_SZ_COL_DIAG_IN_EX FA_SZ_FROM_VAL +FA_SZ_LINSPACE_ROW FA_SZ_OPAPEX FA_SZ_OPBACKSLASH FA_SZ_OPCC @@ -37,7 +40,10 @@ FA_SZ_OPPLUSA FA_SZ_OPRC FA_SZ_OPSLASH FA_SZ_OPSTAR +FA_SZ_ROW_COLUMN FA_SZ_ROW_COLUMN_CAT +FA_SZ_ROW_DIAG +FA_SZ_ROW_DIAG_INS_EXT FA_SZ_SEL1 FA_SZ_SEL2 FA_TP_C -- cgit From d0dae962944e7fdb42bca7d0aa80055c44881b45 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Tue, 29 Mar 2016 22:11:40 +0530 Subject: Function conversion using scilab2c call (not working) --- 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin | Bin 30676 -> 30684 bytes 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci | 2 ++ .../macros/FunctionAnnotation/FA_GetOutArgInfo.bin | Bin 16720 -> 16720 bytes .../macros/FunctionAnnotation/FA_GetOutArgInfo.sci | 6 +++--- 4 files changed, 5 insertions(+), 3 deletions(-) (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin index d3ca8c04..c94c675e 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin and b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci index e5fb8ac8..ffdfa7fb 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci @@ -194,6 +194,8 @@ else end end end + + end // --- End loop over the lines of the input file. --- mclose(inclsfid); diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin index 39d97b24..51ec64c2 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin and b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci index 37e6d091..5db26236 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci @@ -46,17 +46,18 @@ for cntin = 1:NInArg end end DefaultPrecision = SharedInfo.DefaultPrecision; - // --------------------------- // --- End Initialization. --- // --------------------------- if (FunTypeAnnot(1) == '') NOutArg = 0; + else NOutArg = max(size(FunTypeAnnot)); end flagfindlike = 0; + for counterin = 1:NInArg if (InArg(counterin).FindLike == 1 | InArg(counterin).FindLike == -1) // #RNU_RES_B @@ -68,9 +69,8 @@ for counterin = 1:NInArg flagfindlike = -1; end end - for counterout = 1:NOutArg - + if(FunTypeAnnot == 'FA_TP_USER') UpdatedOutArg(counterout).Type = FA_TP_USER(FunPrecSpecifier,DefaultPrecision); else -- cgit From 7d13dc4707f5c4387acdb1946b955490629d2f98 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Tue, 10 May 2016 17:17:41 +0530 Subject: Added support for cumprod, cumsum, triu, tril functions --- .../macros/FunctionAnnotation/FA_GetOutArgInfo.bin | Bin 16720 -> 16800 bytes .../macros/FunctionAnnotation/FA_GetOutArgInfo.sci | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin index 51ec64c2..7102319d 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin and b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci index 5db26236..314c0f28 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci @@ -101,7 +101,7 @@ for counterout = 1:NOutArg // This is a dynamic memory extension of a local variable and for the moment // we issue an error according to SCI2C specifications // #RNU_RES_E - + //disp(FunSizeAnnot) for iterOutputPosition=1:size(FunSizeAnnot, 'c') tmpeval = eval(FunSizeAnnot(counterout, iterOutputPosition)); if (IsNanSize(tmpeval)) -- cgit From 49003250e69e4e500742614888e47db789bbe451 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Fri, 27 May 2016 11:50:04 +0530 Subject: Support for basic ODE function added --- 2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.bin | Bin 0 -> 592 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.sci | 9 +++++++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.bin | Bin 0 -> 780 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.sci | 9 +++++++++ 2.3-1/macros/FunctionAnnotation/lib | Bin 2132 -> 2180 bytes 2.3-1/macros/FunctionAnnotation/names | 2 ++ 6 files changed, 20 insertions(+) create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.sci (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.bin new file mode 100644 index 00000000..c5a806a2 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.sci new file mode 100644 index 00000000..de063e60 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.sci @@ -0,0 +1,9 @@ +function outsize=FA_SZ_PERMUTE_COL(insize, val) + +outsize = 4; +//if((val(0) == '1') & (val(1) == '2')) +// outsize = insize(2); +//else +// outsize = insize(1); +//end +endfunction \ No newline at end of file diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.bin new file mode 100644 index 00000000..747a31d3 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.sci new file mode 100644 index 00000000..3dd4e604 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.sci @@ -0,0 +1,9 @@ +function outsize=FA_SZ_PERMUTE_ROW(insize, val) +disp(size(val)) +outsize = 3; +//if((val(0) == '1') & (val(1) == '2')) +// outsize = insize(1); +//else +// outsize = insize(2); +//end +endfunction \ No newline at end of file diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib index a31bc1a7..81fa5d45 100644 Binary files a/2.3-1/macros/FunctionAnnotation/lib and b/2.3-1/macros/FunctionAnnotation/lib differ diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names index 4fc53d40..5658291f 100644 --- a/2.3-1/macros/FunctionAnnotation/names +++ b/2.3-1/macros/FunctionAnnotation/names @@ -40,6 +40,8 @@ FA_SZ_OPPLUSA FA_SZ_OPRC FA_SZ_OPSLASH FA_SZ_OPSTAR +FA_SZ_PERMUTE_COL +FA_SZ_PERMUTE_ROW FA_SZ_ROW_COLUMN FA_SZ_ROW_COLUMN_CAT FA_SZ_ROW_DIAG -- cgit From 7e9419d65013fa1109dd67deaabf77aa34011a35 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Tue, 14 Jun 2016 12:30:32 +0530 Subject: Support added for diff, norm functions --- 2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin | Bin 0 -> 3876 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.sci | 39 +++++++++++++++++++++++++ 2.3-1/macros/FunctionAnnotation/lib | Bin 2180 -> 2204 bytes 2.3-1/macros/FunctionAnnotation/names | 1 + 4 files changed, 40 insertions(+) create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.sci (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin new file mode 100644 index 00000000..5f169e6f Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.sci new file mode 100644 index 00000000..df183100 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.sci @@ -0,0 +1,39 @@ +// 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: Siddhesh Wani +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in + +//This fucntion calulates size of output depending upon input +function outsize = FA_SZ_DIFF(in1size, in2val, in3val) + in1size = string(in1size); + in1row = eval(in1size(1)); + in1col = eval(in1size(2)); + in2val = string(in2val); + in2num = eval(in2val); + in3num = eval(in3val); + +if(in3num == 0) + if((in1row == 1) & (in1col <> 1)) //input is row vector + outsize(1) = '1'; + outsize(2) = string (in1col - in2num); + elseif((in1col == 1) & (in1row <> 1)) //input is column vector + outsize(1) = string(in1row - in2num); + outsize(2) = '1'; + else // input is matrix. output is a column matrix + outsize(1) = string((in1row * in1col)- in2num); + outsize(2) = '1'; + end +elseif (in3num == 1) //Difference along rows + outsize(1) = string(in1row - in2num); + outsize(2) = string(in1col); +elseif (in3num == 2) //Difference along columns + outsize(1) = string(in1row); + outsize(2) = string(in1col - in2num); +end +endfunction \ No newline at end of file diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib index 81fa5d45..b8b2d41c 100644 Binary files a/2.3-1/macros/FunctionAnnotation/lib and b/2.3-1/macros/FunctionAnnotation/lib differ diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names index 5658291f..3db59cc6 100644 --- a/2.3-1/macros/FunctionAnnotation/names +++ b/2.3-1/macros/FunctionAnnotation/names @@ -14,6 +14,7 @@ FA_SZ_1 FA_SZ_2 FA_SZ_COLUMN_DIAG FA_SZ_COL_DIAG_IN_EX +FA_SZ_DIFF FA_SZ_FROM_VAL FA_SZ_LINSPACE_ROW FA_SZ_OPAPEX -- cgit From 21ab4886b202a52189b398bd9d3137e2a567d62a Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Mon, 25 Jul 2016 15:59:40 +0530 Subject: WiringPi used for RaspberryPi (Gpio, serial, Threads, ISRs) --- .../macros/FunctionAnnotation/FA_GetOutArgInfo.bin | Bin 16800 -> 16804 bytes .../macros/FunctionAnnotation/FA_GetOutArgInfo.sci | 1 + 2 files changed, 1 insertion(+) (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin index 7102319d..2b75b7a3 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin and b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci index 314c0f28..d9696c8b 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci @@ -69,6 +69,7 @@ for counterin = 1:NInArg flagfindlike = -1; end end + for counterout = 1:NOutArg if(FunTypeAnnot == 'FA_TP_USER') -- cgit From 1552675d4ac3be8d265bcf089fbc1ac5be1547f9 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Thu, 18 Aug 2016 15:47:18 +0530 Subject: RPi-PWM and basic imaage processing --- .../FunctionAnnotation/FA_GetDefaultPrecision.bin | Bin 11192 -> 11384 bytes .../FunctionAnnotation/FA_GetDefaultPrecision.sci | 2 ++ 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin | Bin 30684 -> 30680 bytes 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci | 1 - 2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin | Bin 0 -> 2924 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.sci | 30 +++++++++++++++++++++ 2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin | Bin 2888 -> 2888 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_INT16.sci | 2 +- 2.3-1/macros/FunctionAnnotation/lib | Bin 2204 -> 2228 bytes 2.3-1/macros/FunctionAnnotation/names | 1 + 10 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.sci (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin index 61f446f3..fa48e833 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin and b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.sci b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.sci index da5486dc..3603c572 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.sci @@ -87,6 +87,8 @@ else defaultprecision = 'u16'; elseif (tmpprecision == 'INT16') defaultprecision = 'i16'; + elseif (tmpprecision == 'CVIMAGE') + defaultprecision = 'IplImage' end end diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin index c94c675e..3c2f9d4c 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin and b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci index ffdfa7fb..912d099a 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci @@ -131,7 +131,6 @@ if (FoundNOut*FoundNIn == 0) PrintStringInfo(' ',ReportFileName,'both','y'); error(9999, 'SCI2CERROR: Incorrect function annotation.'); else - // In case we are reading to much informations readNewLine = %t; diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin new file mode 100644 index 00000000..1d824fb3 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.sci new file mode 100644 index 00000000..1c0d1745 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.sci @@ -0,0 +1,30 @@ +function typeout = FA_TP_CVIMAGE() +// function typeout = FA_TP_INT16() +// ----------------------------------------------------------------- +// Returns the OpenCV image type specifier (im) +// for Function Annotations. +// +// Input data: +// --- +// +// Output data: +// typeout: string containing the type specifier. +// +// Status: +// +// Copyright 2007 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),0,0); + + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +typeout = 'im'; + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin index 2ebb7346..e28e0c5b 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.sci index 8971754d..67b81784 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.sci @@ -1,7 +1,7 @@ function typeout = FA_TP_INT16() // function typeout = FA_TP_INT16() // ----------------------------------------------------------------- -// Returns the "uint8" type specifier +// Returns the "int16" type specifier // for Function Annotations. // // Input data: diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib index b8b2d41c..b7b55207 100644 Binary files a/2.3-1/macros/FunctionAnnotation/lib and b/2.3-1/macros/FunctionAnnotation/lib differ diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names index 3db59cc6..d9ae572a 100644 --- a/2.3-1/macros/FunctionAnnotation/names +++ b/2.3-1/macros/FunctionAnnotation/names @@ -51,6 +51,7 @@ FA_SZ_SEL1 FA_SZ_SEL2 FA_TP_C FA_TP_COMPLEX +FA_TP_CVIMAGE FA_TP_D FA_TP_I FA_TP_INT16 -- cgit From cdd9bf519d594b87c07193d2770b81a07829a50c Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Tue, 18 Oct 2016 10:31:23 +0530 Subject: Suppressed declaration of not required variables and functions --- 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin | Bin 30680 -> 31780 bytes 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin index 3c2f9d4c..b38770ee 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin and b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci index 912d099a..d11e3cee 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci @@ -1,4 +1,4 @@ -function [FunTypeAnnot,FunSizeAnnot] = ... +function [FunTypeAnnot,FunSizeAnnot,NOutArg_mod] = ... FA_GetFunAnn(NInArg,NOutArg,FunName,FileInfo,SharedInfo) // function [FunTypeAnnot,FunSizeAnnot] = ... // FA_GetFunAnn(NInArg,NOutArg,FunName,FileInfo,SharedInfo) @@ -71,6 +71,7 @@ while ((meof(inclsfid) == 0) & (FoundNIn == 0) & (FoundNOut == 0)) // #RNU_RES_E if (SCI2Cstrncmps1size(SharedInfo.Annotations.FUNNIN,check_string)) FUNNINAnnot = part(check_string,length(SharedInfo.Annotations.FUNNIN)+1:length(check_string)); + // #RNU_RES_B // --- Check NIN value. --- // #RNU_RES_E @@ -89,7 +90,6 @@ while ((meof(inclsfid) == 0) & (FoundNIn == 0) & (FoundNOut == 0)) // #RNU_RES_E if (SCI2Cstrncmps1size(SharedInfo.Annotations.FUNNOUT,check_string)) FUNNOUTAnnot = part(check_string,length(SharedInfo.Annotations.FUNNOUT)+1:length(check_string)); - // #RNU_RES_B // --- Check NOUT value. --- // #RNU_RES_E @@ -99,6 +99,8 @@ while ((meof(inclsfid) == 0) & (FoundNIn == 0) & (FoundNOut == 0)) ReportFileName,'file','y'); // #RNU_RES_E FoundNOut = 1; + elseif(eval(FUNNOUTAnnot) == 0) + FoundNOut = 1 else FoundNIn = 0; end @@ -131,6 +133,15 @@ if (FoundNOut*FoundNIn == 0) PrintStringInfo(' ',ReportFileName,'both','y'); error(9999, 'SCI2CERROR: Incorrect function annotation.'); else + //This change has been made in order to supress the generation + //of output variables in case of functions which do not return + //anything. + if(eval(FUNNOUTAnnot) == 0) + NOutArg_mod = 0; + else + NOutArg_mod = NOutArg + end + // In case we are reading to much informations readNewLine = %t; -- cgit From 1fef9b1edc2d4400e8ba6bb6fafb648963d6817d Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Thu, 2 Feb 2017 16:02:41 +0530 Subject: Support for function 'schur' added q --- 2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin | Bin 0 -> 1004 bytes 2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.sci | 13 +++++++++++++ 2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin | Bin 0 -> 516 bytes 2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.sci | 10 ++++++++++ 2.3-1/macros/FunctionAnnotation/lib | Bin 2228 -> 2276 bytes 2.3-1/macros/FunctionAnnotation/names | 2 ++ 6 files changed, 25 insertions(+) create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.sci (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin new file mode 100644 index 00000000..9d77eae8 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.sci b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.sci new file mode 100644 index 00000000..6ae20305 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.sci @@ -0,0 +1,13 @@ +function out2sz = FA_SCHUR_SZ(in2tp,in1sz) + +in2type = string(in2tp); +in1sz = string(in1sz); +in1dim = eval(in1sz); + +if(in2type == 'g') + out2sz = '1' +else + out2sz = string(in1dim) +end + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin new file mode 100644 index 00000000..8b31a0c7 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.sci b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.sci new file mode 100644 index 00000000..a8b68b17 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.sci @@ -0,0 +1,10 @@ +function out2tp = FA_SCHUR_TP(in2tp) + +in2type = string(in2tp); + +if(in2type == 'g') + out2tp = 'd' +else + out2tp = in2type +end +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib index b7b55207..a1a11a90 100644 Binary files a/2.3-1/macros/FunctionAnnotation/lib and b/2.3-1/macros/FunctionAnnotation/lib differ diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names index d9ae572a..64cb2574 100644 --- a/2.3-1/macros/FunctionAnnotation/names +++ b/2.3-1/macros/FunctionAnnotation/names @@ -9,6 +9,8 @@ FA_MAX FA_MIN FA_MUL FA_REAL +FA_SCHUR_SZ +FA_SCHUR_TP FA_SUB FA_SZ_1 FA_SZ_2 -- cgit From e59107e6bb2695fc20fd0ab229e296b9bf739fc4 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Tue, 7 Feb 2017 16:16:31 +0530 Subject: Support for 'lqr' and 'lqe' added --- .../macros/FunctionAnnotation/FA_GetOutArgInfo.bin | Bin 16804 -> 17656 bytes .../macros/FunctionAnnotation/FA_GetOutArgInfo.sci | 14 ++++++++++---- 2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin | Bin 1004 -> 872 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin | Bin 0 -> 876 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.sci | 8 ++++++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin | Bin 0 -> 700 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.sci | 6 ++++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_LQR_K.bin | Bin 0 -> 920 bytes 2.3-1/macros/FunctionAnnotation/lib | Bin 2276 -> 2324 bytes 2.3-1/macros/FunctionAnnotation/names | 2 ++ 10 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_LQR_K.bin (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin index 2b75b7a3..e8048b72 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin and b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci index d9696c8b..a35281a8 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci @@ -1,5 +1,6 @@ function UpdatedOutArg = ... - FA_GetOutArgInfo(InArg,NInArg,OutArg,NOutArg,SharedInfo,FunPrecSpecifier,FunTypeAnnot,FunSizeAnnot,ReportFileName) + FA_GetOutArgInfo(InArg,NInArg,OutArg,NOutArg,SharedInfo,FunPrecSpecifier, ... + FunTypeAnnot,FunSizeAnnot,ReportFileName,ASTFunName) // function UpdatedOutArg = ... // FA_GetOutArgInfo(InArg,NInArg,OutArg,NOutArg,SharedInfo,FunPrecSpecifier,FunTypeAnnot,FunSizeAnnot,ReportFileName) // ----------------------------------------------------------------- @@ -23,7 +24,7 @@ function UpdatedOutArg = ... // ------------------------------ // --- Check input arguments. --- // ------------------------------ -SCI2CNInArgCheck(argn(2),9,9); +SCI2CNInArgCheck(argn(2),10,10); // ----------------------- // --- Initialization. --- // ----------------------- @@ -121,8 +122,13 @@ for counterout = 1:NOutArg UpdatedOutArg(counterout).Size(iterOutputPosition) = string(tmpeval); end end - - UpdatedOutArg(counterout).Value = %nan; + if(ASTFunName == 'syslin') + no_of_st = eval(InArg(2).Size(1)) + no_of_ip = eval(InArg(3).Size(2)) + UpdatedOutArg(counterout).Value = no_of_st+no_of_ip*0.1; + else + UpdatedOutArg(counterout).Value = %nan; + end UpdatedOutArg(counterout).Dimension = GetSymbolDimension(UpdatedOutArg(counterout).Size); UpdatedOutArg(counterout).Scope = 'Temp';//NUT anche su questo si puo' ragionare verifica anche la handleoperation. end diff --git a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin index 9d77eae8..d16f0292 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin and b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin new file mode 100644 index 00000000..2fb97727 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.sci new file mode 100644 index 00000000..e7aecf1c --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.sci @@ -0,0 +1,8 @@ +function outsize = FA_SZ_LQE(inval,insz) + + inval = eval(inval) + insz = eval(insz) + outsize(1) = string(int(inval)); + outsize(2) = string(insz-int(inval)); + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin new file mode 100644 index 00000000..2de9d568 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.sci new file mode 100644 index 00000000..2f199d0b --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.sci @@ -0,0 +1,6 @@ +function outsize = FA_SZ_LQR(inval) + + inval = eval(inval) + outsize(1) = string(int(inval)); + outsize(2) = string(modulo(inval*10,10)); + endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR_K.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR_K.bin new file mode 100644 index 00000000..a936e3be Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR_K.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib index a1a11a90..4053992e 100644 Binary files a/2.3-1/macros/FunctionAnnotation/lib and b/2.3-1/macros/FunctionAnnotation/lib differ diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names index 64cb2574..e072098d 100644 --- a/2.3-1/macros/FunctionAnnotation/names +++ b/2.3-1/macros/FunctionAnnotation/names @@ -19,6 +19,8 @@ FA_SZ_COL_DIAG_IN_EX FA_SZ_DIFF FA_SZ_FROM_VAL FA_SZ_LINSPACE_ROW +FA_SZ_LQE +FA_SZ_LQR FA_SZ_OPAPEX FA_SZ_OPBACKSLASH FA_SZ_OPCC -- cgit From 160eb350837f8cd3cdb0943b5929e11f44036826 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Thu, 13 Apr 2017 10:42:02 +0530 Subject: Functions added - balance,rcond,obscont --- 2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin | Bin 0 -> 2180 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.sci | 17 +++++++++++++++++ 2.3-1/macros/FunctionAnnotation/lib | Bin 2324 -> 2348 bytes 2.3-1/macros/FunctionAnnotation/names | 1 + 4 files changed, 18 insertions(+) create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.sci (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin new file mode 100644 index 00000000..70ce8df8 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.sci new file mode 100644 index 00000000..80c0f956 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.sci @@ -0,0 +1,17 @@ +function outsize = FA_SZ_OBSCNT(inval,insz1,insz2,nout) + + inval = eval(inval); + insz1 = eval(insz1); + insz2 = eval(insz2); + //nout = eval(nout); + no_of_st = int(inval); + no_of_in = insz2 - no_of_st; + no_of_op = insz1 - no_of_st; + if(nout == 1) + outsize(1) = string(no_of_st+no_of_op+2); + outsize(2) = string(no_of_st+no_of_in); + else + outsize(1) = string(no_of_st+no_of_in+no_of_op+2); + outsize(2) = string(no_of_st+no_of_in+no_of_op); + end +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib index 4053992e..b36e12c2 100644 Binary files a/2.3-1/macros/FunctionAnnotation/lib and b/2.3-1/macros/FunctionAnnotation/lib differ diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names index e072098d..3386d8e1 100644 --- a/2.3-1/macros/FunctionAnnotation/names +++ b/2.3-1/macros/FunctionAnnotation/names @@ -21,6 +21,7 @@ FA_SZ_FROM_VAL FA_SZ_LINSPACE_ROW FA_SZ_LQE FA_SZ_LQR +FA_SZ_OBSCNT FA_SZ_OPAPEX FA_SZ_OPBACKSLASH FA_SZ_OPCC -- cgit From 645c51daadc9a5c9374b0465ded05f84bca65183 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Wed, 19 Apr 2017 11:56:09 +0530 Subject: Copyright message updated in added files and libraries separated in 'thirdparty' folder --- 2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin | Bin 872 -> 4988 bytes 2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.sci | 29 ++++++++++++ 2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin | Bin 516 -> 4364 bytes 2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.sci | 28 +++++++++++ .../FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin | Bin 3116 -> 4612 bytes .../FunctionAnnotation/FA_SZ_COLUMN_DIAG.sci | 44 ++++++++++------- .../FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin | Bin 5068 -> 9196 bytes .../FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.sci | 39 ++++++++++++++-- 2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin | Bin 3876 -> 8288 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.sci | 25 ++++++++-- .../FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin | Bin 408 -> 4296 bytes .../FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci | 29 ++++++++++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin | Bin 876 -> 4928 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.sci | 29 ++++++++++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin | Bin 700 -> 4484 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.sci | 28 +++++++++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin | Bin 2180 -> 6828 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.sci | 31 ++++++++++++ .../FunctionAnnotation/FA_SZ_PERMUTE_ROW.bin | Bin 780 -> 592 bytes .../FunctionAnnotation/FA_SZ_PERMUTE_ROW.sci | 2 +- .../macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin | Bin 10920 -> 7900 bytes .../macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci | 52 +++++++-------------- .../FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin | Bin 2812 -> 6932 bytes .../FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci | 31 +++++++++++- 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin | Bin 3164 -> 4624 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.sci | 34 +++++++++----- .../FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin | Bin 16296 -> 19788 bytes .../FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.sci | 43 ++++++++++++++--- 2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin | Bin 2924 -> 4172 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.sci | 13 ++++-- 2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin | Bin 2888 -> 4136 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_INT16.sci | 13 ++++-- 2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin | Bin 2876 -> 4124 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_INT8.sci | 13 ++++-- 2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin | Bin 2896 -> 4144 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.sci | 13 ++++-- 2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin | Bin 2884 -> 4132 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.sci | 13 ++++-- 38 files changed, 415 insertions(+), 94 deletions(-) (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin index d16f0292..292a6193 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin and b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.sci b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.sci index 6ae20305..7b426e1c 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.sci @@ -1,4 +1,33 @@ function out2sz = FA_SCHUR_SZ(in2tp,in1sz) +//function out2sz = FA_SCHUR_SZ(in2tp,in1sz) +// ----------------------------------------------------------------- +// Get size of output for Schur function +// +// Input data: +// in2tp: string specifying the type of second input argument. +// in1sz: string specifying the size of first input argument. +// +// Output data: +// out2sz: string containing the size for second output argument. +// +// 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: Siddhesh Wani +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in +// + +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); in2type = string(in2tp); in1sz = string(in1sz); diff --git a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin index 8b31a0c7..4b0b438f 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin and b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.sci b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.sci index a8b68b17..828ea1e5 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.sci @@ -1,4 +1,32 @@ function out2tp = FA_SCHUR_TP(in2tp) +// function out2tp = FA_SCHUR_TP(in2tp) +// ----------------------------------------------------------------- +// Get type of output for Schur function +// +// Input data: +// in2tp: string specifying the type of second input argument. +// +// Output data: +// out2tp: string containing the type for second output argument. +// +// 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: Siddhesh Wani +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in +// + +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(1),1,1); in2type = string(in2tp); diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin index 68d6a37c..a3b34afc 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin and b/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.sci index df129f97..3aea8397 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.sci @@ -1,20 +1,32 @@ function outsize = FA_SZ_COLUMN_DIAG(insize) - // function outsize = FA_SZ_1(insize) - // ----------------------------------------------------------------- - // Returns the first element of the size array. - // - // Input data: - // insize: size of input argument. It is an array of 2 strings. - // The first string specifies the number of rows. - // The second string specifies the number of columns. - // - // Output data: - // outsize: first element of the insize array. - // - // Status: - // 08-Dec-2007 -- Raffaele Nutricato: Author. - // 08-Dec-2007 -- Alberto Morea: Test Ok. - // ----------------------------------------------------------------- +//function outsize = FA_SZ_COLUMN_DIAG(insize) +// ----------------------------------------------------------------- +// Get size of column of the output for diag function +// +// Input data: +// insize: string specifying the size of input argument. +// +// Output data: +// outsize: string containing the column size for output argument. +// +// 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: Mushir +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in +// + +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(1),1,1); if(insize(2)=='1') then outsize = insize(1); 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 index e39a0be3..76748237 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin and b/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.sci index 45d74c3a..8a313fee 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.sci @@ -1,6 +1,35 @@ function outsize =FA_SZ_COL_DIAG_IN_EX(insize,val) - -///////////////////////////////COLUMN SIZE FOR INSERT POSITION////////////////// +//function outsize =FA_SZ_COL_DIAG_IN_EX(insize,val) +// ----------------------------------------------------------------- +// Get size of column of the output for diag(insert) function +// +// Input data: +// insize: string specifying the size of input argument. +// val: string containing value of second input +// +// Output data: +// outsize: string containing the column size for output argument. +// +// 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: Mushir +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in +// + +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +///////////////////////////////COLUMN SIZE FOR INSERT POSITION//////////////// @@ -8,13 +37,15 @@ function outsize =FA_SZ_COL_DIAG_IN_EX(insize,val) if(val == '0') then //For Oth position outsize = insize(2); //COLUMN size is equal to COLUMN size else // For ...-2,-1,1,2... position - outsize = string(eval(insize(2))+abs(eval(val)));// COLUMN size is equal to COLUMN size + absolute value of position(for 1*3 matrix and 2nd postion COLUMN size is (3+2)=5 + outsize = string(eval(insize(2))+abs(eval(val))); + // COLUMN size is equal to COLUMN size + absolute value of position(for 1*3 matrix and 2nd postion COLUMN size is (3+2)=5 end elseif((insize(2) == '1')) // If COLUMN size is 1 if(val == '0') then //For Oth position outsize = insize(1); //COLUMNS size is equal to ROW size else // For ...-2,-1,1,2.... position - outsize = string(eval(insize(1))+abs(eval(val)));// COLUMN size is equal to ROW size + absolute value of position(for 3*1 matrix and 1st postion COLUMN size is (3+1)=4 + outsize = string(eval(insize(1))+abs(eval(val))); + // COLUMN size is equal to ROW size + absolute value of position(for 3*1 matrix and 1st postion COLUMN size is (3+1)=4 end //////////////////////////////////////////////////////////////////////////////// diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin index 5f169e6f..08d66c13 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin and b/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.sci index df183100..5639ce77 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.sci @@ -1,4 +1,17 @@ -// Copyright (C) 2016 - IIT Bombay - FOSSEE +function outsize = FA_SZ_DIFF(in1size, in2val, in3val) +//function outsize = FA_SZ_DIFF(in1size, in2val, in3val) +// ----------------------------------------------------------------- +// Get size of output for diff function +// +// Input data: +// in1size: string specifying the size of first input argument. +// in2val: string specifying the value of second input argument. +// in3val: string specifying the value of third input argument. +// +// Output data: +// outsize: string containing the size for output argument. +// +// 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 @@ -8,9 +21,15 @@ // Author: Siddhesh Wani // Organization: FOSSEE, IIT Bombay // Email: toolbox@scilab.in +// + +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(3),3,3); -//This fucntion calulates size of output depending upon input -function outsize = FA_SZ_DIFF(in1size, in2val, in3val) in1size = string(in1size); in1row = eval(in1size(1)); in1col = eval(in1size(2)); diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin index 0a5589ba..60cb9d4e 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin and b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci index 986b5291..69a816cc 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci @@ -1,4 +1,33 @@ function outsize = FA_SZ_LINSPACE_ROW(insize) +//function outsize = FA_SZ_LINSPACE_ROW(insize) +// ----------------------------------------------------------------- +// Get size of row for output for linspace function +// +// Input data: +// insize: string specifying the size of first input argument. +// +// Output data: +// outsize: string containing the row size of output argument. +// +// 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: Mushir +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in +// + +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(1),1,1); + in1num = string(eval(insize(1))); outsize = in1num; endfunction: diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin index 2fb97727..8abfa39b 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin and b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.sci index e7aecf1c..6ddd1988 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.sci @@ -1,4 +1,33 @@ function outsize = FA_SZ_LQE(inval,insz) +//function outsize = FA_SZ_LQE(inval,insz) +// ----------------------------------------------------------------- +// Get size of output for lqe function +// +// Input data: +// inval: string specifying the value of input argument. +// insz: string specifying the size of input argument. +// +// Output data: +// outsize: string containing the size for second output argument. +// +// 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: Siddhesh Wani +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in +// + +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); inval = eval(inval) insz = eval(insz) diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin index 2de9d568..843fb2ce 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin and b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.sci index 2f199d0b..cf1884aa 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.sci @@ -1,4 +1,32 @@ function outsize = FA_SZ_LQR(inval) +//function outsize = FA_SZ_LQR(inval) +// ----------------------------------------------------------------- +// Get size of output for lqr function +// +// Input data: +// inval: string specifying the value of input argument. +// +// Output data: +// outsize: string containing the size for output argument. +// +// 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: Siddhesh Wani +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in +// + +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(1),1,1); inval = eval(inval) outsize(1) = string(int(inval)); diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin index 70ce8df8..b936e29c 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.sci index 80c0f956..a7cb85b9 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.sci @@ -1,4 +1,35 @@ function outsize = FA_SZ_OBSCNT(inval,insz1,insz2,nout) +//function outsize = FA_SZ_OBSCNT(inval,insz1,insz2,nout) +// ----------------------------------------------------------------- +// Get size of output for obscont function +// +// Input data: +// inval: string specifying the value of first input argument. +// insz1: string specifying the row size of first input argument. +// insz2: string specifying the col size of first input argument. +// nout: string specifying number of output arguments +// +// Output data: +// outsize: string containing the size for output argument. +// +// 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: Siddhesh Wani +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in +// + +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(4),4,4); inval = eval(inval); insz1 = eval(insz1); diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.bin index 747a31d3..3ebb9512 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.bin and b/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.sci index 3dd4e604..35cf8acc 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.sci @@ -1,5 +1,5 @@ function outsize=FA_SZ_PERMUTE_ROW(insize, val) -disp(size(val)) + outsize = 3; //if((val(0) == '1') & (val(1) == '2')) // outsize = insize(1); diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin index edba674a..28b7fa59 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin and b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci index ca1d2627..11b245e2 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci @@ -1,47 +1,27 @@ function opoutsize = FA_SZ_ROW_COLUMN(in1size,in2size) -// function opoutsize = FA_SZ_OPPLUSA(in1size,in2size) +//function opoutsize = FA_SZ_ROW_COLUMN(in1size,in2size) // ----------------------------------------------------------------- -// Returns the size of the output computed by OPPLUS operator -// restricted to arithmetic operations (string operations not supported.) -// -// Assuming: -// size(in1) = [in1r,in1c] -// size(in2) = [in2r,in2c] -// size(out) = [outr,outc] -// -// we have the following combinations: -// in1 in2 outr outc -// ----------------------- -// S S in2r in2c -// S M in2r in2c -// M S in1r in1c -// M M in1r in1c -// -// Where S means that the input is a scalar -// and M means that the input is a matrix. -// There is also the case related to the string catenation! -// This is the main difference between - and + operators. +// Get size of output for Schur function // // Input data: -// in1size: size of input number 1. It is an array of 2 strings. -// The first string specifies the number of rows. -// The second string specifies the number of columns. -// -// in2size: size of input number 2. It is an array of 2 strings. -// The first string specifies the number of rows. -// The second string specifies the number of columns. +// in2tp: string specifying the type of second input argument. +// in1sz: string specifying the size of first input argument. // // Output data: -// opoutsize: size of output. It is an array of 2 strings. -// The first string specifies the number of rows. -// The second string specifies the number of columns. +// out2sz: string containing the size for second output argument. // -// Status: -// 18-Mar-2008 -- Raffaele Nutricato: Author. -// 18-Mar-2008 -- Alberto Morea: Test Ok. +// Copyright (C) 2017 - IIT Bombay - FOSSEE // -// Copyright 2008 Raffaele Nutricato & Alberto Morea. -// Contact: raffaele.nutricato@tiscali.it +// 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: Mushir +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in +// + // ----------------------------------------------------------------- // ------------------------------ 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 index 2373b813..5679bced 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin and b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci index 5ab0c649..aaca2868 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci @@ -1,8 +1,35 @@ function outsize = FA_SZ_ROW_COLUMN_CAT(inval,in1size,in2size) +//function outsize = FA_SZ_ROW_COLUMN_CAT(inval,in1size,in2size) +// ----------------------------------------------------------------- +// Get size of row (col) of the output for cat function +// +// Input data: +// inval: string specifying the value of input argument. +// in1size: string specifying the row (col) of second input +// in3size: string specifying the row (col) of third input +// Output data: +// outsize: string containing the column size for output argument. +// +// 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: Mushir +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in +// + +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(1),3,3); -//Check the input arguments -SCI2CNInArgCheck(argn(2),3,3); in1size = string(in1size); in2size = string(in2size); inval = string(inval); diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin index 7fc7dcc8..f5f1a236 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin and b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.sci index 687a89e4..1417b42b 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.sci @@ -1,21 +1,33 @@ function outsize = FA_SZ_ROW_DIAG(insize) -// function outsize = FA_SZ_1(insize) +//function outsize = FA_SZ_ROW_DIAG(insize) // ----------------------------------------------------------------- -// Returns the first element of the size array. -// +// Get size of row of the output for diag function +// // Input data: -// insize: size of input argument. It is an array of 2 strings. -// The first string specifies the number of rows. -// The second string specifies the number of columns. -// +// insize: string specifying the size of input argument. +// // Output data: -// outsize: first element of the insize array. +// outsize: string containing the row size for output argument. +// +// Copyright (C) 2017 - IIT Bombay - FOSSEE // -// Status: -// 08-Dec-2007 -- Raffaele Nutricato: Author. -// 08-Dec-2007 -- Alberto Morea: Test Ok. +// 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: Mushir +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in +// + // ----------------------------------------------------------------- +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(1),1,1); + if(insize(1)=='1') then outsize = insize(2); elseif(insize(1) == insize(2)) 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 index 046b4b78..e5d8e650 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin and b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.sci index 1ec720a9..1dddfb77 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.sci @@ -1,4 +1,33 @@ function outsize = FA_SZ_ROW_DIAG_INS_EXT(insize,val) +//function outsize = FA_SZ_ROW_DIAG_INS_EXT(insize,val) +// ----------------------------------------------------------------- +// Get row size of output for diag(insert) function +// +// Input data: +// insize: string specifying the size of first input argument. +// val: string specifying the value of second input argument. +// +// Output data: +// outsize: string containing the size for output argument. +// +// 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: Mushir +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in +// + +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); // val ==> Position value ...,-2,-1,0,1,2.... //insize ==> insize(1) will give ROW size and insize(2) will give COLUMN size. @@ -6,7 +35,7 @@ function outsize = FA_SZ_ROW_DIAG_INS_EXT(insize,val) row_num = eval(insize(1)); col_num = eval(insize(2)); val_num = eval(val); - /////////////////////////////////////////////// FOR INSERT CONDITION //////////////////////////////////////////// + ///////////////////// FOR INSERT CONDITION ////////////////////////////// @@ -15,7 +44,8 @@ function outsize = FA_SZ_ROW_DIAG_INS_EXT(insize,val) outsize = string(col_num);// ROW size is equal to COLUMN size else // For ....-2,-1,1,2... positions - outsize = string(col_num+abs(val_num)); //ROW is equal to COLUMN SIZE + position value (i.e for 1*4 matrix and insert position 1 then ROW size is 4+1 = 5 ) + outsize = string(col_num+abs(val_num)); + //ROW is equal to COLUMN SIZE + position value (i.e for 1*4 matrix and insert position 1 then ROW size is 4+1 = 5 ) end elseif(col_num == 1) // if Column size is one @@ -23,14 +53,15 @@ function outsize = FA_SZ_ROW_DIAG_INS_EXT(insize,val) outsize = string(row_num); // ROW size is equal to ROW size else // ....-2,-1,1,2... positions. - outsize = string(row_num + abs(val_num));//ROW is equal to ROW SIZE + position value (i.e for 4*1 matrix and insert position 1 then ROW size is 4+1 = 5 ) + outsize = string(row_num + abs(val_num)); + //ROW is equal to ROW SIZE + position value (i.e for 4*1 matrix and insert position 1 then ROW size is 4+1 = 5 ) end - /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////////////////// - ///////////////////////////////////////// FOR EXTRACT CONDITION ///////////////////////////////////////////////// + //////////////////////////// FOR EXTRACT CONDITION ///////////////////////// elseif(row_num == col_num) // For no. of rows equal to no. of column (R == C) if(val_num == 0) then //For 0th position @@ -66,7 +97,7 @@ function outsize = FA_SZ_ROW_DIAG_INS_EXT(insize,val) outsize = string(row_num-abs(val_num)); // row size is substraction of row size and absolute value of position values(-1,-2,-3) end - ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////////////////// end endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin index 1d824fb3..a7327099 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.sci index 1c0d1745..5e87ab81 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.sci @@ -10,10 +10,17 @@ function typeout = FA_TP_CVIMAGE() // Output data: // typeout: string containing the type specifier. // -// Status: +// 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: Siddhesh Wani +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in // -// Copyright 2007 Raffaele Nutricato & Alberto Morea. -// Contact: raffaele.nutricato@tiscali.it // ----------------------------------------------------------------- // ------------------------------ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin index e28e0c5b..fba4305a 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.sci index 67b81784..b7e25cad 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.sci @@ -10,10 +10,17 @@ function typeout = FA_TP_INT16() // Output data: // typeout: string containing the type specifier. // -// Status: +// 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: Siddhesh Wani +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in // -// Copyright 2007 Raffaele Nutricato & Alberto Morea. -// Contact: raffaele.nutricato@tiscali.it // ----------------------------------------------------------------- // ------------------------------ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin index 3f5055fb..f67d7485 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.sci index 49c752bb..f1e2bf26 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.sci @@ -10,10 +10,17 @@ function typeout = FA_TP_INT8() // Output data: // typeout: string containing the type specifier. // -// Status: +// 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: Siddhesh Wani +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in // -// Copyright 2007 Raffaele Nutricato & Alberto Morea. -// Contact: raffaele.nutricato@tiscali.it // ----------------------------------------------------------------- // ------------------------------ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin index 687024f6..dc455ca6 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.sci index 5f1c98f7..b77d7751 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.sci @@ -10,10 +10,17 @@ function typeout = FA_TP_UINT16() // Output data: // typeout: string containing the type specifier. // -// Status: +// 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: Siddhesh Wani +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in // -// Copyright 2007 Raffaele Nutricato & Alberto Morea. -// Contact: raffaele.nutricato@tiscali.it // ----------------------------------------------------------------- // ------------------------------ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin index 02e74047..508db417 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.sci b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.sci index 934f3540..f31cde0f 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.sci @@ -10,10 +10,17 @@ function typeout = FA_TP_UINT8() // Output data: // typeout: string containing the type specifier. // -// Status: +// 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: Siddhesh Wani +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in // -// Copyright 2007 Raffaele Nutricato & Alberto Morea. -// Contact: raffaele.nutricato@tiscali.it // ----------------------------------------------------------------- // ------------------------------ -- cgit From 586db6343e7b472d8dc3e63a82f4c73f99cdcbd7 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Wed, 19 Apr 2017 14:28:34 +0530 Subject: Merged Ashish's work --- 2.3-1/macros/FunctionAnnotation/lib | Bin 2348 -> 3562 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib index b36e12c2..9f0b8066 100644 Binary files a/2.3-1/macros/FunctionAnnotation/lib and b/2.3-1/macros/FunctionAnnotation/lib differ -- cgit From b9cfdca438347fe4d28f7caff3cb7b382e455d3a Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Wed, 19 Apr 2017 14:57:49 +0530 Subject: Merged Shamik's work --- .../macros/FunctionAnnotation/FA_GetOutArgInfo.sci | 2 -- .../macros/FunctionAnnotation/FA_SZ_DEC 2OCT.sci~ | 30 +++++++++++++++++++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin | Bin 0 -> 2944 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci | 30 +++++++++++++++++++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin | Bin 0 -> 1820 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci | 20 ++++++++++++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin | Bin 0 -> 1740 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci | 21 +++++++++++++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin | Bin 0 -> 1820 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci | 20 ++++++++++++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin | Bin 0 -> 1464 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci | 20 ++++++++++++++ 2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin | Bin 0 -> 1524 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci | 21 +++++++++++++++ .../FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci | 2 +- 2.3-1/macros/FunctionAnnotation/lib | Bin 3562 -> 3472 bytes 2.3-1/macros/FunctionAnnotation/names | 6 +++++ 17 files changed, 169 insertions(+), 3 deletions(-) create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC 2OCT.sci~ create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci index a35281a8..99eaaa5f 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci @@ -29,7 +29,6 @@ SCI2CNInArgCheck(argn(2),10,10); // --- Initialization. --- // ----------------------- - UpdatedOutArg = OutArg; for cntin = 1:NInArg IN(cntin).TP = InArg(cntin).Type; @@ -72,7 +71,6 @@ for counterin = 1:NInArg end for counterout = 1:NOutArg - if(FunTypeAnnot == 'FA_TP_USER') UpdatedOutArg(counterout).Type = FA_TP_USER(FunPrecSpecifier,DefaultPrecision); else diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC 2OCT.sci~ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC 2OCT.sci~ new file mode 100644 index 00000000..340dd2a5 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC 2OCT.sci~ @@ -0,0 +1,30 @@ +function opout1 = FA_SZ_DEC2OCT(inval1) + +// 07-Sep-2016 -- Author : Shamik Guha + + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +//SCI2CNInArgCheck(argn(2),2,2); +//insize=string(insize); + +inval1=string(inval1); +disp(inval1); + +if (isnum(inval1)) then + in_num1 = eval(inval1) ; + out1=dec2oct(in_num1); + disp(out1); + +else + error(36, "Wrong input argument '+inval1+'."); + +end + +out1=eval(out1); + +opout1=string(floor(log10(abs(out1)+1))+1); +out1=string(out1); +disp(opout1); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin new file mode 100644 index 00000000..879c5885 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci new file mode 100644 index 00000000..c5f39abd --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci @@ -0,0 +1,30 @@ +function opout = FA_SZ_DEC2BASE(in1val,in2val) + +// 07-Sep-2016 -- Author : Shamik Guha + + +in1val=string(in1val); +in2val=string(in2val); +if (isnum(in1val)) then + in1_num = eval(in1val) ; + in2_num = eval(in2val) ; + out=dec2base(in1_num,in2_num); + //disp(out); + +else + error(36, "Wrong input argument '+in1val+'."); + +end +if (in2_num>10) then + out=sci2exp(out); + opout=string(length(out)-2); + //disp(opout); + out=string(out); +else + out=eval(out); + //disp(out); + opout=string(floor(log10(abs(out)+1))+1); + //disp(opout); + out=string(out); +end +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin new file mode 100644 index 00000000..af9d1cb8 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci new file mode 100644 index 00000000..fc205254 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci @@ -0,0 +1,20 @@ +function opout = FA_SZ_DEC2BIN(inval) + +// 07-Sep-2016 -- Author : Shamik Guha + +inval=string(inval); +if (isnum(inval)) then + in_num = eval(inval) ; + out=dec2bin(in_num); + //disp(out); + +else + error(36, "Wrong input argument '+inval+'."); + +end + +out=eval(out); + +opout=string(floor(log10(abs(out)+1))+1); +out=string(out); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin new file mode 100644 index 00000000..ddabb108 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci new file mode 100644 index 00000000..688e1da4 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci @@ -0,0 +1,21 @@ +function opout = FA_SZ_DEC2HEX(inval) + +// 07-Sep-2016 -- Author : Shamik Guha + +inval=string(inval); +if (isnum(inval)) then + in_num = eval(inval) ; + out=dec2hex(in_num); + //disp(out); + +else + error(36, "Wrong input argument '+inval+'."); + +end + +out=sci2exp(out); + +opout=string(length(out)-2); +//disp(opout); +out=string(out); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin new file mode 100644 index 00000000..be386e03 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci new file mode 100644 index 00000000..44544ccc --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci @@ -0,0 +1,20 @@ +function opout = FA_SZ_DEC2OCT(inval) + +// 07-Sep-2016 -- Author : Shamik Guha + +inval=string(inval); +if (isnum(inval)) then + in_num = eval(inval) ; + out=dec2oct(in_num); + //disp(out); + +else + error(36, "Wrong input argument '+inval+'."); + +end + +out=eval(out); + +opout=string(floor(log10(abs(out)+1))+1); +out=string(out); +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin new file mode 100644 index 00000000..ee8f8991 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci new file mode 100644 index 00000000..e44f036a --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci @@ -0,0 +1,20 @@ +function opout = FA_SZ_FACTOR(inval) + +// 17-Dec-2016 -- Author : Shamik Guha + +inval=string(inval); +if (isnum(inval)) then + in_num = eval(inval) ; + out=factor(in_num); + //disp(out); + +else + error(36, "Wrong input argument '+inval+'."); + +end + + +out=(length(out)); +opout=string(out); + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin new file mode 100644 index 00000000..353edab7 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci new file mode 100644 index 00000000..7b945310 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci @@ -0,0 +1,21 @@ +function opout = FA_SZ_PRIMES(inval) + +// 17-Dec-2016 -- Author : Shamik Guha + +inval=string(inval); +if (isnum(inval)) then + in_num = eval(inval) ; + out=primes(in_num); + //disp(out); + +else + error(36, "Wrong input argument '+inval+'."); + +end + + +out=(length(out)); +opout=string(out); +//disp(opout); + +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci index aaca2868..f99d156e 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci @@ -40,7 +40,7 @@ if(inval == '1') then outsize(2) = string(in2num_r); elseif(inval == '2') then in1num_c = eval(in1size); - in2num_c = eval(in2size) + in2num_c = eval(in2size); outsize(1) = string(in1num_c); outsize(2) = string(in1num_c + in2num_c); else diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib index 9f0b8066..b965f2df 100644 Binary files a/2.3-1/macros/FunctionAnnotation/lib and b/2.3-1/macros/FunctionAnnotation/lib differ diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names index 3386d8e1..fd9f66bf 100644 --- a/2.3-1/macros/FunctionAnnotation/names +++ b/2.3-1/macros/FunctionAnnotation/names @@ -16,7 +16,12 @@ FA_SZ_1 FA_SZ_2 FA_SZ_COLUMN_DIAG FA_SZ_COL_DIAG_IN_EX +FA_SZ_DEC2BASE +FA_SZ_DEC2BIN +FA_SZ_DEC2HEX +FA_SZ_DEC2OCT FA_SZ_DIFF +FA_SZ_FACTOR FA_SZ_FROM_VAL FA_SZ_LINSPACE_ROW FA_SZ_LQE @@ -48,6 +53,7 @@ FA_SZ_OPSLASH FA_SZ_OPSTAR FA_SZ_PERMUTE_COL FA_SZ_PERMUTE_ROW +FA_SZ_PRIMES FA_SZ_ROW_COLUMN FA_SZ_ROW_COLUMN_CAT FA_SZ_ROW_DIAG -- cgit From 472b2e7ebbd2d8b3ecd00b228128aa8a0bd3f920 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Mon, 24 Apr 2017 14:08:37 +0530 Subject: Fixed float.h issue. OpenCV with built libraries working for linux x64 --- 2.3-1/macros/FunctionAnnotation/FA_ADD.bin | Bin 4856 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_DIV.bin | Bin 4904 -> 0 bytes .../FunctionAnnotation/FA_GetDefaultPrecision.bin | Bin 11384 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin | Bin 31780 -> 0 bytes .../macros/FunctionAnnotation/FA_GetOutArgInfo.bin | Bin 17656 -> 0 bytes .../FunctionAnnotation/FA_GetResizeApproach.bin | Bin 10484 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_INT.bin | Bin 4516 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_MAX.bin | Bin 5320 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_MIN.bin | Bin 4524 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_MUL.bin | Bin 4932 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_REAL.bin | Bin 4400 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin | Bin 4988 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin | Bin 4364 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SUB.bin | Bin 4916 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin | Bin 2608 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin | Bin 2616 -> 0 bytes .../FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin | Bin 4612 -> 0 bytes .../FA_SZ_COLUMN_DIAG_INS_EXT.bin | Bin 3364 -> 0 bytes .../FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin | Bin 9196 -> 0 bytes .../macros/FunctionAnnotation/FA_SZ_DEC 2OCT.sci~ | 30 -------- 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin | Bin 2944 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin | Bin 1820 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin | Bin 1740 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin | Bin 1820 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin | Bin 8288 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin | Bin 1464 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin | Bin 3448 -> 0 bytes .../FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin | Bin 4296 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin | Bin 4928 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin | Bin 4484 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_LQR_K.bin | Bin 920 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin | Bin 6828 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin | Bin 3224 -> 0 bytes .../FunctionAnnotation/FA_SZ_OPBACKSLASH.bin | Bin 4320 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin | Bin 5056 -> 0 bytes .../macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin | Bin 1960 -> 0 bytes .../FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin | Bin 2036 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin | Bin 5712 -> 0 bytes .../macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin | Bin 2020 -> 0 bytes .../macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin | Bin 3664 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin | Bin 5688 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin | Bin 2012 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin | Bin 2008 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin | Bin 2008 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin | Bin 2008 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin | Bin 2008 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin | Bin 2008 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin | Bin 2008 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin | Bin 1956 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin | Bin 2008 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin | Bin 6704 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin | Bin 14040 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin | Bin 8516 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin | Bin 5056 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin | Bin 3600 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin | Bin 8228 -> 0 bytes .../FunctionAnnotation/FA_SZ_PERMUTE_COL.bin | Bin 592 -> 0 bytes .../FunctionAnnotation/FA_SZ_PERMUTE_COL.sci | 9 --- .../FunctionAnnotation/FA_SZ_PERMUTE_ROW.bin | Bin 592 -> 0 bytes .../FunctionAnnotation/FA_SZ_PERMUTE_ROW.sci | 9 --- 2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin | Bin 1524 -> 0 bytes .../macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin | Bin 7900 -> 0 bytes .../macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci | 65 ----------------- .../FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin | Bin 6932 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin | Bin 4624 -> 0 bytes .../FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin | Bin 19788 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin | Bin 7028 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin | Bin 6920 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_C.bin | Bin 3252 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin | Bin 4520 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin | Bin 4172 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_D.bin | Bin 3220 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_I.bin | Bin 3208 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin | Bin 4136 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin | Bin 4124 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin | Bin 5028 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin | Bin 3512 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin | Bin 4036 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_S.bin | Bin 3216 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin | Bin 4144 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin | Bin 4132 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin | Bin 5172 -> 0 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin | Bin 3252 -> 0 bytes 2.3-1/macros/FunctionAnnotation/lib | Bin 3472 -> 0 bytes 2.3-1/macros/FunctionAnnotation/names | 77 --------------------- 85 files changed, 190 deletions(-) delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_ADD.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_DIV.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_INT.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_MAX.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_MIN.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_MUL.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_REAL.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SUB.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG_INS_EXT.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC 2OCT.sci~ delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_LQR_K.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.sci delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.sci delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_C.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_D.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_I.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_S.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin delete mode 100644 2.3-1/macros/FunctionAnnotation/lib delete mode 100644 2.3-1/macros/FunctionAnnotation/names (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_ADD.bin b/2.3-1/macros/FunctionAnnotation/FA_ADD.bin deleted file mode 100644 index 6c810828..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_ADD.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_DIV.bin b/2.3-1/macros/FunctionAnnotation/FA_DIV.bin deleted file mode 100644 index 6e6708fe..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_DIV.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin deleted file mode 100644 index fa48e833..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin deleted file mode 100644 index b38770ee..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin deleted file mode 100644 index e8048b72..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin b/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin deleted file mode 100644 index 77397e01..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_INT.bin b/2.3-1/macros/FunctionAnnotation/FA_INT.bin deleted file mode 100644 index edf9bb84..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_INT.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_MAX.bin b/2.3-1/macros/FunctionAnnotation/FA_MAX.bin deleted file mode 100644 index a9debbab..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_MAX.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_MIN.bin b/2.3-1/macros/FunctionAnnotation/FA_MIN.bin deleted file mode 100644 index cc9bd02e..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_MIN.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_MUL.bin b/2.3-1/macros/FunctionAnnotation/FA_MUL.bin deleted file mode 100644 index 8b674c21..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_MUL.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_REAL.bin deleted file mode 100644 index ed68eb74..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_REAL.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin deleted file mode 100644 index 292a6193..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin deleted file mode 100644 index 4b0b438f..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SUB.bin b/2.3-1/macros/FunctionAnnotation/FA_SUB.bin deleted file mode 100644 index fdc52b4d..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SUB.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin deleted file mode 100644 index c01ff59d..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin deleted file mode 100644 index 00834df4..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin deleted file mode 100644 index a3b34afc..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG_INS_EXT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG_INS_EXT.bin deleted file mode 100644 index 6d883096..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG_INS_EXT.bin and /dev/null differ 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 deleted file mode 100644 index 76748237..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC 2OCT.sci~ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC 2OCT.sci~ deleted file mode 100644 index 340dd2a5..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC 2OCT.sci~ +++ /dev/null @@ -1,30 +0,0 @@ -function opout1 = FA_SZ_DEC2OCT(inval1) - -// 07-Sep-2016 -- Author : Shamik Guha - - -// ------------------------------ -// --- Check input arguments. --- -// ------------------------------ -//SCI2CNInArgCheck(argn(2),2,2); -//insize=string(insize); - -inval1=string(inval1); -disp(inval1); - -if (isnum(inval1)) then - in_num1 = eval(inval1) ; - out1=dec2oct(in_num1); - disp(out1); - -else - error(36, "Wrong input argument '+inval1+'."); - -end - -out1=eval(out1); - -opout1=string(floor(log10(abs(out1)+1))+1); -out1=string(out1); -disp(opout1); -endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin deleted file mode 100644 index 879c5885..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin deleted file mode 100644 index af9d1cb8..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin deleted file mode 100644 index ddabb108..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin deleted file mode 100644 index be386e03..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin deleted file mode 100644 index 08d66c13..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin deleted file mode 100644 index ee8f8991..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin deleted file mode 100644 index a06f3b16..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin deleted file mode 100644 index 60cb9d4e..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin deleted file mode 100644 index 8abfa39b..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin deleted file mode 100644 index 843fb2ce..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR_K.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR_K.bin deleted file mode 100644 index a936e3be..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR_K.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin deleted file mode 100644 index b936e29c..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin deleted file mode 100644 index 90e50348..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin deleted file mode 100644 index be3e89ac..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin deleted file mode 100644 index 767385a3..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin deleted file mode 100644 index 822cb5e8..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin deleted file mode 100644 index 2af7e390..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin deleted file mode 100644 index 72d6e23d..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin deleted file mode 100644 index f060e87e..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin deleted file mode 100644 index 6be9a457..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin deleted file mode 100644 index feb8122d..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin deleted file mode 100644 index e4419128..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin deleted file mode 100644 index afe431b3..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin deleted file mode 100644 index 87d2d5bf..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin deleted file mode 100644 index c3a1d88c..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin deleted file mode 100644 index 80216050..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin deleted file mode 100644 index 417fe265..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin deleted file mode 100644 index 6c9f9bf0..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin deleted file mode 100644 index 417a9195..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin deleted file mode 100644 index af6c2a8e..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin deleted file mode 100644 index deac97df..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin deleted file mode 100644 index da84349d..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin deleted file mode 100644 index b45ac592..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin deleted file mode 100644 index 6d55e274..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin deleted file mode 100644 index 14bb17f9..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin deleted file mode 100644 index 2f28cb62..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.bin deleted file mode 100644 index c5a806a2..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.sci deleted file mode 100644 index de063e60..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_COL.sci +++ /dev/null @@ -1,9 +0,0 @@ -function outsize=FA_SZ_PERMUTE_COL(insize, val) - -outsize = 4; -//if((val(0) == '1') & (val(1) == '2')) -// outsize = insize(2); -//else -// outsize = insize(1); -//end -endfunction \ No newline at end of file diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.bin deleted file mode 100644 index 3ebb9512..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.sci deleted file mode 100644 index 35cf8acc..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_PERMUTE_ROW.sci +++ /dev/null @@ -1,9 +0,0 @@ -function outsize=FA_SZ_PERMUTE_ROW(insize, val) - -outsize = 3; -//if((val(0) == '1') & (val(1) == '2')) -// outsize = insize(1); -//else -// outsize = insize(2); -//end -endfunction \ No newline at end of file diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin deleted file mode 100644 index 353edab7..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin deleted file mode 100644 index 28b7fa59..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci deleted file mode 100644 index 11b245e2..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci +++ /dev/null @@ -1,65 +0,0 @@ -function opoutsize = FA_SZ_ROW_COLUMN(in1size,in2size) -//function opoutsize = FA_SZ_ROW_COLUMN(in1size,in2size) -// ----------------------------------------------------------------- -// Get size of output for Schur function -// -// Input data: -// in2tp: string specifying the type of second input argument. -// in1sz: string specifying the size of first input argument. -// -// Output data: -// out2sz: string containing the size for second output argument. -// -// 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: Mushir -// Organization: FOSSEE, IIT Bombay -// Email: toolbox@scilab.in -// - -// ----------------------------------------------------------------- - -// ------------------------------ -// --- Check input arguments. --- -// ------------------------------ -SCI2CNInArgCheck(argn(2),2,2); - -// ------------------------ -// --- Generate Output. --- -// ------------------------ -// --- Get dimensions of input arguments. --- -in1size = string(in1size); -in2size = string(in2size); -in1type = string(in1type); -in2type = string(in2type); -in1dim = GetSymbolDimension(in1size); -in2dim = GetSymbolDimension(in2size); -if (isnum(in2size(2))) then - if(in2size(2) == '3') then - in1num_c = eval(in1size(2)); - in1num_r = eval(in2size(1)); - opoutsize(1) = string(in1num_r); - opoutsize(2) = string(in1num_c); - else - - in2num_r = eval(in1size(1)); - in2num_c = eval(in2size(1)); - opoutsize(1) = string(in2num_r); - opoutsize(2) = string(in2num_c); - end -else - if(in2size(2) == 3) - opoutsize(2) = '('+string(in1size(2))+')'; - - else - opoutsize(1) = '('+string(in1size(1))+')'; - - end -end - -endfunction 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 deleted file mode 100644 index 5679bced..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin deleted file mode 100644 index f5f1a236..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin and /dev/null differ 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 deleted file mode 100644 index e5d8e650..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin deleted file mode 100644 index 1d68a2e6..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin deleted file mode 100644 index d3897f7d..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_C.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_C.bin deleted file mode 100644 index d13d92ca..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_C.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin deleted file mode 100644 index 3400b2af..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin deleted file mode 100644 index a7327099..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_D.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_D.bin deleted file mode 100644 index 12293dab..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_D.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_I.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_I.bin deleted file mode 100644 index 503be40b..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_I.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin deleted file mode 100644 index fba4305a..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin deleted file mode 100644 index f67d7485..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin deleted file mode 100644 index 099ea1ba..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin deleted file mode 100644 index 60293a1d..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin deleted file mode 100644 index 7e54122a..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_S.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_S.bin deleted file mode 100644 index 1419e461..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_S.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin deleted file mode 100644 index dc455ca6..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin deleted file mode 100644 index 508db417..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin deleted file mode 100644 index 87e18d54..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin deleted file mode 100644 index 6c371723..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib deleted file mode 100644 index b965f2df..00000000 Binary files a/2.3-1/macros/FunctionAnnotation/lib and /dev/null differ diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names deleted file mode 100644 index fd9f66bf..00000000 --- a/2.3-1/macros/FunctionAnnotation/names +++ /dev/null @@ -1,77 +0,0 @@ -FA_ADD -FA_DIV -FA_GetDefaultPrecision -FA_GetFunAnn -FA_GetOutArgInfo -FA_GetResizeApproach -FA_INT -FA_MAX -FA_MIN -FA_MUL -FA_REAL -FA_SCHUR_SZ -FA_SCHUR_TP -FA_SUB -FA_SZ_1 -FA_SZ_2 -FA_SZ_COLUMN_DIAG -FA_SZ_COL_DIAG_IN_EX -FA_SZ_DEC2BASE -FA_SZ_DEC2BIN -FA_SZ_DEC2HEX -FA_SZ_DEC2OCT -FA_SZ_DIFF -FA_SZ_FACTOR -FA_SZ_FROM_VAL -FA_SZ_LINSPACE_ROW -FA_SZ_LQE -FA_SZ_LQR -FA_SZ_OBSCNT -FA_SZ_OPAPEX -FA_SZ_OPBACKSLASH -FA_SZ_OPCC -FA_SZ_OPDOTAPEX -FA_SZ_OPDOTBACKSLASH -FA_SZ_OPDOTHAT -FA_SZ_OPDOTSLASH -FA_SZ_OPDOTSTAR -FA_SZ_OPHAT -FA_SZ_OPLOGAND -FA_SZ_OPLOGEQ -FA_SZ_OPLOGGE -FA_SZ_OPLOGGT -FA_SZ_OPLOGLE -FA_SZ_OPLOGLT -FA_SZ_OPLOGNE -FA_SZ_OPLOGNOT -FA_SZ_OPLOGOR -FA_SZ_OPMINUS -FA_SZ_OPPLUS -FA_SZ_OPPLUSA -FA_SZ_OPRC -FA_SZ_OPSLASH -FA_SZ_OPSTAR -FA_SZ_PERMUTE_COL -FA_SZ_PERMUTE_ROW -FA_SZ_PRIMES -FA_SZ_ROW_COLUMN -FA_SZ_ROW_COLUMN_CAT -FA_SZ_ROW_DIAG -FA_SZ_ROW_DIAG_INS_EXT -FA_SZ_SEL1 -FA_SZ_SEL2 -FA_TP_C -FA_TP_COMPLEX -FA_TP_CVIMAGE -FA_TP_D -FA_TP_I -FA_TP_INT16 -FA_TP_INT8 -FA_TP_MAX -FA_TP_MIN_REAL -FA_TP_REAL -FA_TP_S -FA_TP_UINT16 -FA_TP_UINT8 -FA_TP_USER -FA_TP_Z -- cgit From de82d12658979cd70439f977742f80fac9f6521f Mon Sep 17 00:00:00 2001 From: Siddhesh Wani Date: Thu, 4 May 2017 16:15:18 +0530 Subject: Basic functions and image processing working with MSVC on windows x64 --- 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci | 2 +- .../FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci | 2 +- .../FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci | 2 +- 2.3-1/macros/FunctionAnnotation/lib | Bin 0 -> 2256 bytes 2.3-1/macros/FunctionAnnotation/names | 74 +++++++++++++++++++++ 11 files changed, 83 insertions(+), 9 deletions(-) create mode 100644 2.3-1/macros/FunctionAnnotation/lib create mode 100644 2.3-1/macros/FunctionAnnotation/names (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci index c5f39abd..4cd6467d 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci @@ -12,7 +12,7 @@ if (isnum(in1val)) then //disp(out); else - error(36, "Wrong input argument '+in1val+'."); + error(36, "Wrong input argument "+in1val+"."); end if (in2_num>10) then diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci index fc205254..75d0cb07 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci @@ -9,7 +9,7 @@ if (isnum(inval)) then //disp(out); else - error(36, "Wrong input argument '+inval+'."); + error(36, "Wrong input argument "+inval+"."); end diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci index 688e1da4..c1e07773 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci @@ -9,7 +9,7 @@ if (isnum(inval)) then //disp(out); else - error(36, "Wrong input argument '+inval+'."); + error(36, "Wrong input argument "+inval+"."); end diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci index 44544ccc..056d333d 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci @@ -9,7 +9,7 @@ if (isnum(inval)) then //disp(out); else - error(36, "Wrong input argument '+inval+'."); + error(36, "Wrong input argument "+inval+"."); end diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci index e44f036a..d816ff75 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci @@ -9,7 +9,7 @@ if (isnum(inval)) then //disp(out); else - error(36, "Wrong input argument '+inval+'."); + error(36, "Wrong input argument "+inval+"."); end diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci index bb02b985..5ff03a60 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci @@ -33,4 +33,4 @@ else end -endfunction: +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci index 69a816cc..86f2aa7d 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci @@ -30,4 +30,4 @@ SCI2CNInArgCheck(argn(1),1,1); in1num = string(eval(insize(1))); outsize = in1num; -endfunction: +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci index 7b945310..5a450686 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci @@ -9,7 +9,7 @@ if (isnum(inval)) then //disp(out); else - error(36, "Wrong input argument '+inval+'."); + error(36, "Wrong input argument "+inval+"."); end diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci index f99d156e..50b897e0 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci @@ -44,7 +44,7 @@ elseif(inval == '2') then outsize(1) = string(in1num_c); outsize(2) = string(in1num_c + in2num_c); else - error(36, "Wrong input argument '+inval+'. Use 1 or 2 as first argument in cat command."); + error(36, "Wrong input argument "+inval+". Use 1 or 2 as first argument in cat command."); end endfunction diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib new file mode 100644 index 00000000..d9cc4762 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/lib differ diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names new file mode 100644 index 00000000..8962de09 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/names @@ -0,0 +1,74 @@ +FA_ADD +FA_DIV +FA_GetDefaultPrecision +FA_GetFunAnn +FA_GetOutArgInfo +FA_GetResizeApproach +FA_INT +FA_MAX +FA_MIN +FA_MUL +FA_REAL +FA_SCHUR_SZ +FA_SCHUR_TP +FA_SUB +FA_SZ_1 +FA_SZ_2 +FA_SZ_COLUMN_DIAG +FA_SZ_COL_DIAG_IN_EX +FA_SZ_DEC2BASE +FA_SZ_DEC2BIN +FA_SZ_DEC2HEX +FA_SZ_DEC2OCT +FA_SZ_DIFF +FA_SZ_FACTOR +FA_SZ_FROM_VAL +FA_SZ_LINSPACE_ROW +FA_SZ_LQE +FA_SZ_LQR +FA_SZ_OBSCNT +FA_SZ_OPAPEX +FA_SZ_OPBACKSLASH +FA_SZ_OPCC +FA_SZ_OPDOTAPEX +FA_SZ_OPDOTBACKSLASH +FA_SZ_OPDOTHAT +FA_SZ_OPDOTSLASH +FA_SZ_OPDOTSTAR +FA_SZ_OPHAT +FA_SZ_OPLOGAND +FA_SZ_OPLOGEQ +FA_SZ_OPLOGGE +FA_SZ_OPLOGGT +FA_SZ_OPLOGLE +FA_SZ_OPLOGLT +FA_SZ_OPLOGNE +FA_SZ_OPLOGNOT +FA_SZ_OPLOGOR +FA_SZ_OPMINUS +FA_SZ_OPPLUS +FA_SZ_OPPLUSA +FA_SZ_OPRC +FA_SZ_OPSLASH +FA_SZ_OPSTAR +FA_SZ_PRIMES +FA_SZ_ROW_COLUMN_CAT +FA_SZ_ROW_DIAG +FA_SZ_ROW_DIAG_INS_EXT +FA_SZ_SEL1 +FA_SZ_SEL2 +FA_TP_C +FA_TP_COMPLEX +FA_TP_CVIMAGE +FA_TP_D +FA_TP_I +FA_TP_INT16 +FA_TP_INT8 +FA_TP_MAX +FA_TP_MIN_REAL +FA_TP_REAL +FA_TP_S +FA_TP_UINT16 +FA_TP_UINT8 +FA_TP_USER +FA_TP_Z -- cgit From 5f17dffbfa6d84aee23f7946cfa95e9e5c9995b7 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Thu, 4 May 2017 20:07:20 +0530 Subject: Toolbox working with scilab 6.0 --- 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci | 2 +- .../FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci | 2 +- 2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci | 2 +- .../FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci | 2 +- 2.3-1/macros/FunctionAnnotation/lib | Bin 0 -> 2420 bytes 2.3-1/macros/FunctionAnnotation/names | 74 +++++++++++++++++++++ 11 files changed, 83 insertions(+), 9 deletions(-) create mode 100644 2.3-1/macros/FunctionAnnotation/lib create mode 100644 2.3-1/macros/FunctionAnnotation/names (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci index c5f39abd..8b54924d 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.sci @@ -12,7 +12,7 @@ if (isnum(in1val)) then //disp(out); else - error(36, "Wrong input argument '+in1val+'."); + error(36, 'Wrong input argument '+in1val+'.'); end if (in2_num>10) then diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci index fc205254..08a6bcff 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.sci @@ -9,7 +9,7 @@ if (isnum(inval)) then //disp(out); else - error(36, "Wrong input argument '+inval+'."); + error(36, 'Wrong input argument '+inval+'.'); end diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci index 688e1da4..ac77059d 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.sci @@ -9,7 +9,7 @@ if (isnum(inval)) then //disp(out); else - error(36, "Wrong input argument '+inval+'."); + error(36, 'Wrong input argument '+inval+'.'); end diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci index 44544ccc..bf9df19f 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.sci @@ -9,7 +9,7 @@ if (isnum(inval)) then //disp(out); else - error(36, "Wrong input argument '+inval+'."); + error(36, 'Wrong input argument '+inval+'.'); end diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci index e44f036a..5e13aee1 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.sci @@ -9,7 +9,7 @@ if (isnum(inval)) then //disp(out); else - error(36, "Wrong input argument '+inval+'."); + error(36, 'Wrong input argument '+inval+'.'); end diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci index bb02b985..5ff03a60 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci @@ -33,4 +33,4 @@ else end -endfunction: +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci index 69a816cc..86f2aa7d 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.sci @@ -30,4 +30,4 @@ SCI2CNInArgCheck(argn(1),1,1); in1num = string(eval(insize(1))); outsize = in1num; -endfunction: +endfunction diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci index 7b945310..70883f1c 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.sci @@ -9,7 +9,7 @@ if (isnum(inval)) then //disp(out); else - error(36, "Wrong input argument '+inval+'."); + error(36, 'Wrong input argument '+inval+'.'); end diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci index f99d156e..9e7540eb 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci @@ -44,7 +44,7 @@ elseif(inval == '2') then outsize(1) = string(in1num_c); outsize(2) = string(in1num_c + in2num_c); else - error(36, "Wrong input argument '+inval+'. Use 1 or 2 as first argument in cat command."); + error(36, 'Wrong input argument '+inval+'. Use 1 or 2 as first argument in cat command.'); end endfunction diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib new file mode 100644 index 00000000..3bcd6267 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/lib differ diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names new file mode 100644 index 00000000..8962de09 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/names @@ -0,0 +1,74 @@ +FA_ADD +FA_DIV +FA_GetDefaultPrecision +FA_GetFunAnn +FA_GetOutArgInfo +FA_GetResizeApproach +FA_INT +FA_MAX +FA_MIN +FA_MUL +FA_REAL +FA_SCHUR_SZ +FA_SCHUR_TP +FA_SUB +FA_SZ_1 +FA_SZ_2 +FA_SZ_COLUMN_DIAG +FA_SZ_COL_DIAG_IN_EX +FA_SZ_DEC2BASE +FA_SZ_DEC2BIN +FA_SZ_DEC2HEX +FA_SZ_DEC2OCT +FA_SZ_DIFF +FA_SZ_FACTOR +FA_SZ_FROM_VAL +FA_SZ_LINSPACE_ROW +FA_SZ_LQE +FA_SZ_LQR +FA_SZ_OBSCNT +FA_SZ_OPAPEX +FA_SZ_OPBACKSLASH +FA_SZ_OPCC +FA_SZ_OPDOTAPEX +FA_SZ_OPDOTBACKSLASH +FA_SZ_OPDOTHAT +FA_SZ_OPDOTSLASH +FA_SZ_OPDOTSTAR +FA_SZ_OPHAT +FA_SZ_OPLOGAND +FA_SZ_OPLOGEQ +FA_SZ_OPLOGGE +FA_SZ_OPLOGGT +FA_SZ_OPLOGLE +FA_SZ_OPLOGLT +FA_SZ_OPLOGNE +FA_SZ_OPLOGNOT +FA_SZ_OPLOGOR +FA_SZ_OPMINUS +FA_SZ_OPPLUS +FA_SZ_OPPLUSA +FA_SZ_OPRC +FA_SZ_OPSLASH +FA_SZ_OPSTAR +FA_SZ_PRIMES +FA_SZ_ROW_COLUMN_CAT +FA_SZ_ROW_DIAG +FA_SZ_ROW_DIAG_INS_EXT +FA_SZ_SEL1 +FA_SZ_SEL2 +FA_TP_C +FA_TP_COMPLEX +FA_TP_CVIMAGE +FA_TP_D +FA_TP_I +FA_TP_INT16 +FA_TP_INT8 +FA_TP_MAX +FA_TP_MIN_REAL +FA_TP_REAL +FA_TP_S +FA_TP_UINT16 +FA_TP_UINT8 +FA_TP_USER +FA_TP_Z -- cgit From 3121a1f5a8203bfd14d46f71930ac5cd22afdf7d Mon Sep 17 00:00:00 2001 From: yash1112 Date: Mon, 19 Jun 2017 05:40:46 +0530 Subject: 1.3 new scilab-arduino functions added2. all functions have been tested on hardware 3. 5 i2c library functions added 4. Now generates code for 27 Boards(arduino and lilypad). 5. New GUI --- 2.3-1/macros/FunctionAnnotation/FA_ADD.bin | Bin 0 -> 4856 bytes 2.3-1/macros/FunctionAnnotation/FA_DIV.bin | Bin 0 -> 4904 bytes .../FunctionAnnotation/FA_GetDefaultPrecision.bin | Bin 0 -> 11384 bytes 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin | Bin 0 -> 31780 bytes 2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin | Bin 0 -> 17648 bytes .../FunctionAnnotation/FA_GetResizeApproach.bin | Bin 0 -> 10484 bytes 2.3-1/macros/FunctionAnnotation/FA_INT.bin | Bin 0 -> 4516 bytes 2.3-1/macros/FunctionAnnotation/FA_MAX.bin | Bin 0 -> 5320 bytes 2.3-1/macros/FunctionAnnotation/FA_MIN.bin | Bin 0 -> 4524 bytes 2.3-1/macros/FunctionAnnotation/FA_MUL.bin | Bin 0 -> 4932 bytes 2.3-1/macros/FunctionAnnotation/FA_REAL.bin | Bin 0 -> 4400 bytes 2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin | Bin 0 -> 4988 bytes 2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin | Bin 0 -> 4364 bytes 2.3-1/macros/FunctionAnnotation/FA_SUB.bin | Bin 0 -> 4916 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin | Bin 0 -> 2608 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin | Bin 0 -> 2616 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin | Bin 0 -> 4612 bytes .../FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin | Bin 0 -> 9196 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin | Bin 0 -> 2944 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin | Bin 0 -> 1820 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin | Bin 0 -> 1740 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin | Bin 0 -> 1820 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin | Bin 0 -> 8288 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin | Bin 0 -> 1464 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin | Bin 0 -> 3448 bytes .../macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin | Bin 0 -> 4296 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin | Bin 0 -> 4928 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin | Bin 0 -> 4484 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin | Bin 0 -> 6828 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin | Bin 0 -> 3224 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin | Bin 0 -> 4320 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin | Bin 0 -> 5056 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin | Bin 0 -> 1960 bytes .../FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin | Bin 0 -> 2036 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin | Bin 0 -> 5712 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin | Bin 0 -> 2020 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin | Bin 0 -> 3664 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin | Bin 0 -> 5688 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin | Bin 0 -> 2012 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin | Bin 0 -> 2008 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin | Bin 0 -> 2008 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin | Bin 0 -> 2008 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin | Bin 0 -> 2008 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin | Bin 0 -> 2008 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin | Bin 0 -> 2008 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin | Bin 0 -> 1956 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin | Bin 0 -> 2008 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin | Bin 0 -> 6704 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin | Bin 0 -> 14040 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin | Bin 0 -> 8516 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin | Bin 0 -> 5056 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin | Bin 0 -> 3600 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin | Bin 0 -> 8228 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin | Bin 0 -> 1524 bytes .../FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin | Bin 0 -> 6932 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin | Bin 0 -> 4624 bytes .../FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin | Bin 0 -> 19788 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin | Bin 0 -> 7028 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin | Bin 0 -> 6920 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_C.bin | Bin 0 -> 3252 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin | Bin 0 -> 4520 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin | Bin 0 -> 4172 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_D.bin | Bin 0 -> 3220 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_I.bin | Bin 0 -> 3208 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin | Bin 0 -> 4136 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin | Bin 0 -> 4124 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin | Bin 0 -> 5028 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin | Bin 0 -> 3512 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin | Bin 0 -> 4036 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_S.bin | Bin 0 -> 3216 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin | Bin 0 -> 4144 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin | Bin 0 -> 4132 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin | Bin 0 -> 5172 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin | Bin 0 -> 3252 bytes 2.3-1/macros/FunctionAnnotation/lib | Bin 7053 -> 2280 bytes 75 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 2.3-1/macros/FunctionAnnotation/FA_ADD.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_DIV.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_INT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_MAX.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_MIN.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_MUL.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_REAL.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SUB.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_C.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_D.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_I.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_S.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin create mode 100644 2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin (limited to '2.3-1/macros/FunctionAnnotation') diff --git a/2.3-1/macros/FunctionAnnotation/FA_ADD.bin b/2.3-1/macros/FunctionAnnotation/FA_ADD.bin new file mode 100644 index 00000000..6c810828 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_ADD.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_DIV.bin b/2.3-1/macros/FunctionAnnotation/FA_DIV.bin new file mode 100644 index 00000000..6e6708fe Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_DIV.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin new file mode 100644 index 00000000..fa48e833 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin new file mode 100644 index 00000000..b38770ee Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin new file mode 100644 index 00000000..89c0d1d3 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin b/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin new file mode 100644 index 00000000..77397e01 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_INT.bin b/2.3-1/macros/FunctionAnnotation/FA_INT.bin new file mode 100644 index 00000000..edf9bb84 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_INT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_MAX.bin b/2.3-1/macros/FunctionAnnotation/FA_MAX.bin new file mode 100644 index 00000000..a9debbab Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_MAX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_MIN.bin b/2.3-1/macros/FunctionAnnotation/FA_MIN.bin new file mode 100644 index 00000000..cc9bd02e Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_MIN.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_MUL.bin b/2.3-1/macros/FunctionAnnotation/FA_MUL.bin new file mode 100644 index 00000000..8b674c21 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_MUL.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_REAL.bin new file mode 100644 index 00000000..ed68eb74 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_REAL.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin new file mode 100644 index 00000000..292a6193 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin new file mode 100644 index 00000000..4b0b438f Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SUB.bin b/2.3-1/macros/FunctionAnnotation/FA_SUB.bin new file mode 100644 index 00000000..fdc52b4d Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SUB.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin new file mode 100644 index 00000000..c01ff59d Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin new file mode 100644 index 00000000..00834df4 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin new file mode 100644 index 00000000..a3b34afc Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin differ 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 new file mode 100644 index 00000000..76748237 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin new file mode 100644 index 00000000..879c5885 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin new file mode 100644 index 00000000..af9d1cb8 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin new file mode 100644 index 00000000..ddabb108 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin new file mode 100644 index 00000000..be386e03 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin new file mode 100644 index 00000000..08d66c13 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin new file mode 100644 index 00000000..ee8f8991 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin new file mode 100644 index 00000000..a06f3b16 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin new file mode 100644 index 00000000..60cb9d4e Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin new file mode 100644 index 00000000..8abfa39b Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin new file mode 100644 index 00000000..843fb2ce Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin new file mode 100644 index 00000000..b936e29c Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin new file mode 100644 index 00000000..90e50348 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin new file mode 100644 index 00000000..be3e89ac Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin new file mode 100644 index 00000000..767385a3 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin new file mode 100644 index 00000000..822cb5e8 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin new file mode 100644 index 00000000..2af7e390 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin new file mode 100644 index 00000000..72d6e23d Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin new file mode 100644 index 00000000..f060e87e Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin new file mode 100644 index 00000000..6be9a457 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin new file mode 100644 index 00000000..feb8122d Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin new file mode 100644 index 00000000..e4419128 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin new file mode 100644 index 00000000..afe431b3 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin new file mode 100644 index 00000000..87d2d5bf Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin new file mode 100644 index 00000000..c3a1d88c Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin new file mode 100644 index 00000000..80216050 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin new file mode 100644 index 00000000..417fe265 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin new file mode 100644 index 00000000..6c9f9bf0 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin new file mode 100644 index 00000000..417a9195 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin new file mode 100644 index 00000000..af6c2a8e Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin new file mode 100644 index 00000000..deac97df Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin new file mode 100644 index 00000000..da84349d Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin new file mode 100644 index 00000000..b45ac592 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin new file mode 100644 index 00000000..6d55e274 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin new file mode 100644 index 00000000..14bb17f9 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin new file mode 100644 index 00000000..2f28cb62 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin new file mode 100644 index 00000000..353edab7 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin differ 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 new file mode 100644 index 00000000..3b0c0b78 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin new file mode 100644 index 00000000..f5f1a236 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin differ 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 new file mode 100644 index 00000000..e5d8e650 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin new file mode 100644 index 00000000..1d68a2e6 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin new file mode 100644 index 00000000..d3897f7d Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_C.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_C.bin new file mode 100644 index 00000000..d13d92ca Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_C.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin new file mode 100644 index 00000000..3400b2af Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin new file mode 100644 index 00000000..a7327099 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_D.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_D.bin new file mode 100644 index 00000000..12293dab Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_D.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_I.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_I.bin new file mode 100644 index 00000000..503be40b Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_I.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin new file mode 100644 index 00000000..fba4305a Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin new file mode 100644 index 00000000..f67d7485 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin new file mode 100644 index 00000000..099ea1ba Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin new file mode 100644 index 00000000..60293a1d Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin new file mode 100644 index 00000000..7e54122a Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_S.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_S.bin new file mode 100644 index 00000000..1419e461 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_S.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin new file mode 100644 index 00000000..dc455ca6 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin new file mode 100644 index 00000000..508db417 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin new file mode 100644 index 00000000..87e18d54 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin new file mode 100644 index 00000000..6c371723 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib index f02997b0..3608981c 100644 Binary files a/2.3-1/macros/FunctionAnnotation/lib and b/2.3-1/macros/FunctionAnnotation/lib differ -- cgit