From 857169357d49e44275e589c42653c1a00d4b0c82 Mon Sep 17 00:00:00 2001 From: Brijeshcr Date: Fri, 18 Aug 2017 16:29:50 +0530 Subject: Scaling and Log2 added --- 2.3-1/macros/ASTManagement/AST_HandleFunCC.sci | 1 + 2.3-1/macros/ASTManagement/AST_HandleFuncArray.sci | 1 - .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 66 ++++++++++++++++++++++ 2.3-1/macros/findDeps/getAllHeaders.sci | 3 + 2.3-1/macros/findDeps/getAllInterfaces.sci | 3 + 2.3-1/macros/findDeps/getAllSources.sci | 10 ++++ 6 files changed, 83 insertions(+), 1 deletion(-) (limited to '2.3-1/macros') diff --git a/2.3-1/macros/ASTManagement/AST_HandleFunCC.sci b/2.3-1/macros/ASTManagement/AST_HandleFunCC.sci index 8669ad1f..395a01df 100644 --- a/2.3-1/macros/ASTManagement/AST_HandleFunCC.sci +++ b/2.3-1/macros/ASTManagement/AST_HandleFunCC.sci @@ -101,6 +101,7 @@ end PrintStringInfo('N Input Arguments: '+string(NInArg),ReportFileName,'file','y','n'); PrintStringInfo('N Output Arguments: '+string(NOutArg),ReportFileName,'file','y'); + //#RNU_RES_E for counterinputargs = 1:NInArg //#RNU_RES_B diff --git a/2.3-1/macros/ASTManagement/AST_HandleFuncArray.sci b/2.3-1/macros/ASTManagement/AST_HandleFuncArray.sci index 364e305e..b9ca3c38 100644 --- a/2.3-1/macros/ASTManagement/AST_HandleFuncArray.sci +++ b/2.3-1/macros/ASTManagement/AST_HandleFuncArray.sci @@ -59,5 +59,4 @@ for cntpush = cntpop:-1:1 end - endfunction diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 0025e819..3e634030 100644 --- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -1944,6 +1944,11 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); +FunctionName = 'log2'; // BJ : Done AS : Float_Done +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + FunctionName = 'log10'; // BJ : Done AS : Float_Done PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); @@ -9233,6 +9238,67 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); +//------------------------------------ +//---- Class LU --------------------- +//------------------------------------ +ClassName = 'lu'; + +// --- Class Annotation. --- +PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); +ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); + +PrintStringInfo('NIN= 1',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 2',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y'); +PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); +PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y'); + + +ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); +PrintStringInfo('d2'+ArgSeparator+'d2d2',ClassFileName,'file','y'); + +// --- Annotation Function And Function List Function. --- +FunctionName = 'lu'; +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + + + +//------------------------------------ +//---- Class SCALING --------------------- +//------------------------------------ +ClassName = 'scaling'; + +// --- Class Annotation. --- +PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); +ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); + +PrintStringInfo('NIN= 3',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y'); + + +ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); +PrintStringInfo('d2d0d2'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('s2s0s2'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('s2d0s2'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('z2z0z2'+ArgSeparator+'z2',ClassFileName,'file','y'); +PrintStringInfo('z2d0d2'+ArgSeparator+'z2',ClassFileName,'file','y'); +PrintStringInfo('z2d0z2'+ArgSeparator+'z2',ClassFileName,'file','y'); +PrintStringInfo('z2z0d2'+ArgSeparator+'z2',ClassFileName,'file','y'); + +// --- Annotation Function And Function List Function. --- +FunctionName = 'scaling'; +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + //------------------------------------ diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci index 4ee9eafb..aba0ec08 100644 --- a/2.3-1/macros/findDeps/getAllHeaders.sci +++ b/2.3-1/macros/findDeps/getAllHeaders.sci @@ -90,6 +90,7 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/elementaryFunctions/includes/tan.h" "src/c/elementaryFunctions/includes/round.h" "src/c/elementaryFunctions/includes/log10.h" + "src/c/elementaryFunctions/includes/log2.h" "src/c/elementaryFunctions/includes/log1p.h" "src/c/elementaryFunctions/includes/acos.h" "src/c/elementaryFunctions/includes/asin.h" @@ -150,6 +151,7 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/elementaryFunctions/includes/atand.h" "src/c/elementaryFunctions/includes/isequal.h" "src/c/elementaryFunctions/includes/isinf.h" + "src/c/graphics/transforms/includes/scaling.h" "src/c/statisticsFunctions/includes/variance.h" "src/c/statisticsFunctions/includes/sum.h" "src/c/statisticsFunctions/includes/mean.h" @@ -263,6 +265,7 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/linearAlgebra/includes/schur.h" "src/c/linearAlgebra/includes/balanc.h" "src/c/linearAlgebra/includes/svd.h" + "src/c/linearAlgebra/includes/lu.h" "src/c/linearAlgebra/includes/hess.h" "src/c/linearAlgebra/includes/sva.h" "src/c/linearAlgebra/includes/sqroot.h" diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci index 9a4353b4..f57f33b1 100644 --- a/2.3-1/macros/findDeps/getAllInterfaces.sci +++ b/2.3-1/macros/findDeps/getAllInterfaces.sci @@ -79,6 +79,7 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/elementaryFunctions/interfaces/int_lnp1m1.h" "src/c/elementaryFunctions/interfaces/int_round.h" "src/c/elementaryFunctions/interfaces/int_log10.h" + "src/c/elementaryFunctions/interfaces/int_log2.h" "src/c/elementaryFunctions/interfaces/int_log1p.h" "src/c/elementaryFunctions/interfaces/int_floor.h" "src/c/elementaryFunctions/interfaces/int_exp10.h" @@ -141,6 +142,7 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/elementaryFunctions/interfaces/int_lcm.h" "src/c/elementaryFunctions/interfaces/int_isequal.h" "src/c/elementaryFunctions/interfaces/int_isinf.h" + "src/c/graphics/transforms/interfaces/int_scaling.h" "src/c/statisticsFunctions/interfaces/int_mean.h" "src/c/statisticsFunctions/interfaces/int_median.h" "src/c/statisticsFunctions/interfaces/int_nanmedian.h" @@ -259,6 +261,7 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/linearAlgebra/interfaces/int_schur.h" "src/c/linearAlgebra/interfaces/int_balanc.h" "src/c/linearAlgebra/interfaces/int_svd.h" + "src/c/linearAlgebra/interfaces/int_lu.h" "src/c/linearAlgebra/interfaces/int_sqroot.h" "src/c/linearAlgebra/interfaces/int_hess.h" "src/c/linearAlgebra/interfaces/int_sva.h" diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci index 4b75c2e1..effb893a 100644 --- a/2.3-1/macros/findDeps/getAllSources.sci +++ b/2.3-1/macros/findDeps/getAllSources.sci @@ -627,6 +627,12 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/elementaryFunctions/log10/zlog10s.c" "src/c/elementaryFunctions/log10/slog10a.c" "src/c/elementaryFunctions/log10/slog10s.c" + "src/c/elementaryFunctions/log2/dlog2s.c" + "src/c/elementaryFunctions/log2/dlog2a.c" + "src/c/elementaryFunctions/log2/slog2s.c" + "src/c/elementaryFunctions/log2/slog2a.c" + "src/c/elementaryFunctions/log2/zlog2s.c" + "src/c/elementaryFunctions/log2/zlog2a.c" "src/c/elementaryFunctions/log1p/dlog1pa.c" "src/c/elementaryFunctions/log1p/dlog1ps.c" "src/c/elementaryFunctions/log1p/clog1pa.c" @@ -946,6 +952,9 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/elementaryFunctions/isequal/u16isequala.c" "src/c/elementaryFunctions/isinf/disinfs.c" "src/c/elementaryFunctions/isinf/sisinfs.c" + "src/c/graphics/transforms/scaling/dscalinga.c" + "src/c/graphics/transforms/scaling/sscalinga.c" + "src/c/graphics/transforms/scaling/zscalinga.c" "src/c/statisticsFunctions/max/dmaxa.c" "src/c/statisticsFunctions/max/smaxa.c" "src/c/statisticsFunctions/max/srowmaxa.c" @@ -1541,6 +1550,7 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/linearAlgebra/schur/dgschura.c" "src/c/linearAlgebra/balanc/dbalanca.c" "src/c/linearAlgebra/svd/dsvda.c" + "src/c/linearAlgebra/lu/dlua.c" "src/c/linearAlgebra/svd/zsvda.c" "src/c/linearAlgebra/sqroot/dsqroota.c" "src/c/linearAlgebra/hess/dhessa.c" -- cgit