diff options
author | siddhu8990 | 2017-02-07 16:16:31 +0530 |
---|---|---|
committer | siddhu8990 | 2017-02-07 16:16:31 +0530 |
commit | e59107e6bb2695fc20fd0ab229e296b9bf739fc4 (patch) | |
tree | 5bedc90e7bc88bb86b10a33839887eeb3e2f39cf /2.3-1/macros/FunctionAnnotation | |
parent | 1fef9b1edc2d4400e8ba6bb6fafb648963d6817d (diff) | |
download | Scilab2C-e59107e6bb2695fc20fd0ab229e296b9bf739fc4.tar.gz Scilab2C-e59107e6bb2695fc20fd0ab229e296b9bf739fc4.tar.bz2 Scilab2C-e59107e6bb2695fc20fd0ab229e296b9bf739fc4.zip |
Support for 'lqr' and 'lqe' added
Diffstat (limited to '2.3-1/macros/FunctionAnnotation')
-rw-r--r-- | 2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin | bin | 16804 -> 17656 bytes | |||
-rw-r--r-- | 2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.sci | 14 | ||||
-rw-r--r-- | 2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin | bin | 1004 -> 872 bytes | |||
-rw-r--r-- | 2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin | bin | 0 -> 876 bytes | |||
-rw-r--r-- | 2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.sci | 8 | ||||
-rw-r--r-- | 2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin | bin | 0 -> 700 bytes | |||
-rw-r--r-- | 2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.sci | 6 | ||||
-rw-r--r-- | 2.3-1/macros/FunctionAnnotation/FA_SZ_LQR_K.bin | bin | 0 -> 920 bytes | |||
-rw-r--r-- | 2.3-1/macros/FunctionAnnotation/lib | bin | 2276 -> 2324 bytes | |||
-rw-r--r-- | 2.3-1/macros/FunctionAnnotation/names | 2 |
10 files changed, 26 insertions, 4 deletions
diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin Binary files differindex 2b75b7a3..e8048b72 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin +++ b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin 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 Binary files differindex 9d77eae8..d16f0292 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin +++ b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin Binary files differnew file mode 100644 index 00000000..2fb97727 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin 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 Binary files differnew file mode 100644 index 00000000..2de9d568 --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin 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 Binary files differnew file mode 100644 index 00000000..a936e3be --- /dev/null +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR_K.bin diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib Binary files differindex a1a11a90..4053992e 100644 --- a/2.3-1/macros/FunctionAnnotation/lib +++ b/2.3-1/macros/FunctionAnnotation/lib diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names index 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 |