From e7dba33a909e158dffc6ddb3361df10d427db631 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 ++++++++++---- macros/FunctionAnnotation/FA_SCHUR_SZ.bin | Bin 1004 -> 872 bytes macros/FunctionAnnotation/FA_SZ_LQE.bin | Bin 0 -> 876 bytes macros/FunctionAnnotation/FA_SZ_LQE.sci | 8 ++++++++ macros/FunctionAnnotation/FA_SZ_LQR.bin | Bin 0 -> 700 bytes macros/FunctionAnnotation/FA_SZ_LQR.sci | 6 ++++++ macros/FunctionAnnotation/FA_SZ_LQR_K.bin | Bin 0 -> 920 bytes macros/FunctionAnnotation/lib | Bin 2276 -> 2324 bytes macros/FunctionAnnotation/names | 2 ++ 10 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 macros/FunctionAnnotation/FA_SZ_LQE.bin create mode 100644 macros/FunctionAnnotation/FA_SZ_LQE.sci create mode 100644 macros/FunctionAnnotation/FA_SZ_LQR.bin create mode 100644 macros/FunctionAnnotation/FA_SZ_LQR.sci create mode 100644 macros/FunctionAnnotation/FA_SZ_LQR_K.bin (limited to 'macros/FunctionAnnotation') diff --git a/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/macros/FunctionAnnotation/FA_GetOutArgInfo.bin index 2b75b7a3..e8048b72 100644 Binary files a/macros/FunctionAnnotation/FA_GetOutArgInfo.bin and b/macros/FunctionAnnotation/FA_GetOutArgInfo.bin differ diff --git a/macros/FunctionAnnotation/FA_GetOutArgInfo.sci b/macros/FunctionAnnotation/FA_GetOutArgInfo.sci index d9696c8b..a35281a8 100644 --- a/macros/FunctionAnnotation/FA_GetOutArgInfo.sci +++ b/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/macros/FunctionAnnotation/FA_SCHUR_SZ.bin b/macros/FunctionAnnotation/FA_SCHUR_SZ.bin index 9d77eae8..d16f0292 100644 Binary files a/macros/FunctionAnnotation/FA_SCHUR_SZ.bin and b/macros/FunctionAnnotation/FA_SCHUR_SZ.bin differ diff --git a/macros/FunctionAnnotation/FA_SZ_LQE.bin b/macros/FunctionAnnotation/FA_SZ_LQE.bin new file mode 100644 index 00000000..2fb97727 Binary files /dev/null and b/macros/FunctionAnnotation/FA_SZ_LQE.bin differ diff --git a/macros/FunctionAnnotation/FA_SZ_LQE.sci b/macros/FunctionAnnotation/FA_SZ_LQE.sci new file mode 100644 index 00000000..e7aecf1c --- /dev/null +++ b/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/macros/FunctionAnnotation/FA_SZ_LQR.bin b/macros/FunctionAnnotation/FA_SZ_LQR.bin new file mode 100644 index 00000000..2de9d568 Binary files /dev/null and b/macros/FunctionAnnotation/FA_SZ_LQR.bin differ diff --git a/macros/FunctionAnnotation/FA_SZ_LQR.sci b/macros/FunctionAnnotation/FA_SZ_LQR.sci new file mode 100644 index 00000000..2f199d0b --- /dev/null +++ b/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/macros/FunctionAnnotation/FA_SZ_LQR_K.bin b/macros/FunctionAnnotation/FA_SZ_LQR_K.bin new file mode 100644 index 00000000..a936e3be Binary files /dev/null and b/macros/FunctionAnnotation/FA_SZ_LQR_K.bin differ diff --git a/macros/FunctionAnnotation/lib b/macros/FunctionAnnotation/lib index a1a11a90..4053992e 100644 Binary files a/macros/FunctionAnnotation/lib and b/macros/FunctionAnnotation/lib differ diff --git a/macros/FunctionAnnotation/names b/macros/FunctionAnnotation/names index 64cb2574..e072098d 100644 --- a/macros/FunctionAnnotation/names +++ b/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