From 56d929da6683ca38ab07870173dba5aadb451403 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 --- macros/FunctionAnnotation/FA_GetFunAnn.bin | Bin 30676 -> 30676 bytes macros/FunctionAnnotation/FA_GetOutArgInfo.bin | Bin 16712 -> 16712 bytes macros/FunctionAnnotation/FA_GetResizeApproach.bin | Bin 10484 -> 10484 bytes macros/FunctionAnnotation/FA_MAX.bin | Bin 5320 -> 5320 bytes macros/FunctionAnnotation/FA_MIN.bin | Bin 4524 -> 4524 bytes macros/FunctionAnnotation/FA_SZ_OPPLUS.bin | Bin 14040 -> 14040 bytes macros/FunctionAnnotation/FA_SZ_OPPLUS.sci | 73 +-------------------- macros/FunctionAnnotation/FA_TP_INT16.bin | Bin 9600 -> 2888 bytes macros/FunctionAnnotation/FA_TP_INT8.bin | Bin 9600 -> 2876 bytes macros/FunctionAnnotation/FA_TP_MAX.bin | Bin 5028 -> 5028 bytes macros/FunctionAnnotation/FA_TP_MIN_REAL.bin | Bin 3512 -> 3512 bytes macros/FunctionAnnotation/FA_TP_REAL.bin | Bin 4036 -> 4036 bytes macros/FunctionAnnotation/FA_TP_UINT16.bin | Bin 9600 -> 2896 bytes macros/FunctionAnnotation/FA_TP_UINT8.bin | Bin 9600 -> 2884 bytes macros/FunctionAnnotation/lib | Bin 1928 -> 1964 bytes 15 files changed, 2 insertions(+), 71 deletions(-) (limited to 'macros/FunctionAnnotation') diff --git a/macros/FunctionAnnotation/FA_GetFunAnn.bin b/macros/FunctionAnnotation/FA_GetFunAnn.bin index 7bb2f2bd..d3ca8c04 100644 Binary files a/macros/FunctionAnnotation/FA_GetFunAnn.bin and b/macros/FunctionAnnotation/FA_GetFunAnn.bin differ diff --git a/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/macros/FunctionAnnotation/FA_GetOutArgInfo.bin index 177df55a..1deaff60 100644 Binary files a/macros/FunctionAnnotation/FA_GetOutArgInfo.bin and b/macros/FunctionAnnotation/FA_GetOutArgInfo.bin differ diff --git a/macros/FunctionAnnotation/FA_GetResizeApproach.bin b/macros/FunctionAnnotation/FA_GetResizeApproach.bin index 6ebef2c9..77397e01 100644 Binary files a/macros/FunctionAnnotation/FA_GetResizeApproach.bin and b/macros/FunctionAnnotation/FA_GetResizeApproach.bin differ diff --git a/macros/FunctionAnnotation/FA_MAX.bin b/macros/FunctionAnnotation/FA_MAX.bin index b69cd8fc..a9debbab 100644 Binary files a/macros/FunctionAnnotation/FA_MAX.bin and b/macros/FunctionAnnotation/FA_MAX.bin differ diff --git a/macros/FunctionAnnotation/FA_MIN.bin b/macros/FunctionAnnotation/FA_MIN.bin index 6010c4bf..cc9bd02e 100644 Binary files a/macros/FunctionAnnotation/FA_MIN.bin and b/macros/FunctionAnnotation/FA_MIN.bin differ diff --git a/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin b/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin index a0fa5424..da84349d 100644 Binary files a/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin and b/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin differ diff --git a/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci b/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci index 4ad282ff..f439e23e 100644 --- a/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci +++ b/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/macros/FunctionAnnotation/FA_TP_INT16.bin b/macros/FunctionAnnotation/FA_TP_INT16.bin index 2ffc10e5..2ebb7346 100644 Binary files a/macros/FunctionAnnotation/FA_TP_INT16.bin and b/macros/FunctionAnnotation/FA_TP_INT16.bin differ diff --git a/macros/FunctionAnnotation/FA_TP_INT8.bin b/macros/FunctionAnnotation/FA_TP_INT8.bin index 3455174f..3f5055fb 100644 Binary files a/macros/FunctionAnnotation/FA_TP_INT8.bin and b/macros/FunctionAnnotation/FA_TP_INT8.bin differ diff --git a/macros/FunctionAnnotation/FA_TP_MAX.bin b/macros/FunctionAnnotation/FA_TP_MAX.bin index fabb6d28..099ea1ba 100644 Binary files a/macros/FunctionAnnotation/FA_TP_MAX.bin and b/macros/FunctionAnnotation/FA_TP_MAX.bin differ diff --git a/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin b/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin index fa2d4c3d..60293a1d 100644 Binary files a/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin and b/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin differ diff --git a/macros/FunctionAnnotation/FA_TP_REAL.bin b/macros/FunctionAnnotation/FA_TP_REAL.bin index 14f31012..7e54122a 100644 Binary files a/macros/FunctionAnnotation/FA_TP_REAL.bin and b/macros/FunctionAnnotation/FA_TP_REAL.bin differ diff --git a/macros/FunctionAnnotation/FA_TP_UINT16.bin b/macros/FunctionAnnotation/FA_TP_UINT16.bin index 5c0ec30c..687024f6 100644 Binary files a/macros/FunctionAnnotation/FA_TP_UINT16.bin and b/macros/FunctionAnnotation/FA_TP_UINT16.bin differ diff --git a/macros/FunctionAnnotation/FA_TP_UINT8.bin b/macros/FunctionAnnotation/FA_TP_UINT8.bin index 69661391..02e74047 100644 Binary files a/macros/FunctionAnnotation/FA_TP_UINT8.bin and b/macros/FunctionAnnotation/FA_TP_UINT8.bin differ diff --git a/macros/FunctionAnnotation/lib b/macros/FunctionAnnotation/lib index 50f6251b..c2025c87 100644 Binary files a/macros/FunctionAnnotation/lib and b/macros/FunctionAnnotation/lib differ -- cgit