From a6d6a9c1e88b75668868af691c9731075a514ffb Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Wed, 18 May 2016 09:44:43 +0530 Subject: Support added for kron, flipdim --- .../ToolInitialization/INIT_FillSCI2LibCDirs.bin | Bin 1102440 -> 1119708 bytes .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 128 +++++++++++++++++++++ macros/findDeps/getAllHeaders.bin | Bin 29200 -> 29572 bytes macros/findDeps/getAllHeaders.sci | 2 + macros/findDeps/getAllInterfaces.bin | Bin 30388 -> 30808 bytes macros/findDeps/getAllInterfaces.sci | 2 + macros/findDeps/getAllSources.bin | Bin 181184 -> 182728 bytes macros/findDeps/getAllSources.sci | 8 ++ 8 files changed, 140 insertions(+) (limited to 'macros') diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin index 42ad0ab..6a319d9 100644 Binary files a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin and b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin differ diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 20db53f..caf9e32 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -4990,6 +4990,134 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); +//------------------------------------ +//---- Class KRON -------------------- +//------------------------------------ +ClassName = 'KRON'; + +// --- Class Annotation. --- +PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); +ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); + +//Arguements specified: initial value, start time, time vector, ode function +PrintStringInfo('NIN= 2',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= FA_MUL(IN(1).SZ(1),IN(2).SZ(1))',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= FA_MUL(IN(1).SZ(2),IN(2).SZ(2))',ClassFileName,'file','y'); + +ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); +PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('s0s0'+ArgSeparator+'s0',ClassFileName,'file','y'); + +PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y'); + +PrintStringInfo('d0d2'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('s0s2'+ArgSeparator+'s2',ClassFileName,'file','y'); + +PrintStringInfo('d2d2'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('s2s2'+ArgSeparator+'s2',ClassFileName,'file','y'); + +// --- Annotation Function And Function List Function. --- +FunctionName = 'kron'; +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + +//------------------------------------ +//---- Class FLIPDIM ----------------- +//------------------------------------ +ClassName = 'FLIPDIM'; + +// --- Class Annotation. --- +PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); +ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); + +//Arguements specified: initial value, start time, time vector, ode function +PrintStringInfo('NIN= 2',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'); + +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('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('s0s0'+ArgSeparator+'s0',ClassFileName,'file','y'); +PrintStringInfo('u80u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('i80i80'+ArgSeparator+'i80',ClassFileName,'file','y'); +PrintStringInfo('u160u160'+ArgSeparator+'u160',ClassFileName,'file','y'); +PrintStringInfo('i160i160'+ArgSeparator+'i160',ClassFileName,'file','y'); + +PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('u82u80'+ArgSeparator+'u82',ClassFileName,'file','y'); +PrintStringInfo('i82i80'+ArgSeparator+'i82',ClassFileName,'file','y'); +PrintStringInfo('u162u160'+ArgSeparator+'u162',ClassFileName,'file','y'); +PrintStringInfo('i162i160'+ArgSeparator+'i162',ClassFileName,'file','y'); +PrintStringInfo('u82d0'+ArgSeparator+'u82',ClassFileName,'file','y'); +PrintStringInfo('i82d0'+ArgSeparator+'i82',ClassFileName,'file','y'); +PrintStringInfo('u162d0'+ArgSeparator+'u162',ClassFileName,'file','y'); +PrintStringInfo('i162d0'+ArgSeparator+'i162',ClassFileName,'file','y'); + +PrintStringInfo('d2d0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('s2s0d0'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('u82u80u80'+ArgSeparator+'u82',ClassFileName,'file','y'); +PrintStringInfo('i82i80u80'+ArgSeparator+'i82',ClassFileName,'file','y'); +PrintStringInfo('u162u160u160'+ArgSeparator+'u162',ClassFileName,'file','y'); +PrintStringInfo('i162i160i160'+ArgSeparator+'i162',ClassFileName,'file','y'); +PrintStringInfo('u82d0d0'+ArgSeparator+'u82',ClassFileName,'file','y'); +PrintStringInfo('i82d0d0'+ArgSeparator+'i82',ClassFileName,'file','y'); +PrintStringInfo('u162d0d0'+ArgSeparator+'u162',ClassFileName,'file','y'); +PrintStringInfo('i162d0d0'+ArgSeparator+'i162',ClassFileName,'file','y'); + +// --- Annotation Function And Function List Function. --- +FunctionName = 'flipdim'; +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + +//------------------------------------ +//---- Class PERMUTE ----------------- +//------------------------------------ +ClassName = 'PERMUTE'; + +// --- Class Annotation. --- +PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); +ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); + +//Arguements specified: initial value, start time, time vector, ode function +PrintStringInfo('NIN= 2',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('d2d2'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('s0s2'+ArgSeparator+'s0',ClassFileName,'file','y'); +PrintStringInfo('u80u82'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('i80i82'+ArgSeparator+'i80',ClassFileName,'file','y'); +PrintStringInfo('u160u162'+ArgSeparator+'u160',ClassFileName,'file','y'); +PrintStringInfo('i160i162'+ArgSeparator+'i160',ClassFileName,'file','y'); +PrintStringInfo('s0d2'+ArgSeparator+'s0',ClassFileName,'file','y'); +PrintStringInfo('u80d2'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('i80d2'+ArgSeparator+'i80',ClassFileName,'file','y'); +PrintStringInfo('u160d2'+ArgSeparator+'u160',ClassFileName,'file','y'); +PrintStringInfo('i160d2'+ArgSeparator+'i160',ClassFileName,'file','y'); + +// --- Annotation Function And Function List Function. --- +FunctionName = 'permute'; +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + // //////////////////////////////////////////// // /////PARTE INTRODOTTA DA ALBERTO MOREA // ///////////////////////////////////////////// diff --git a/macros/findDeps/getAllHeaders.bin b/macros/findDeps/getAllHeaders.bin index c130ae7..9f0ca08 100644 Binary files a/macros/findDeps/getAllHeaders.bin and b/macros/findDeps/getAllHeaders.bin differ diff --git a/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci index 373549e..a8c23a1 100644 --- a/macros/findDeps/getAllHeaders.sci +++ b/macros/findDeps/getAllHeaders.sci @@ -68,6 +68,8 @@ function allHeaders = getAllHeaders(Target) "src/c/matrixOperations/includes/cumprod.h" "src/c/matrixOperations/includes/triu.h" "src/c/matrixOperations/includes/tril.h" + "src/c/matrixOperations/includes/kron.h" + "src/c/matrixOperations/includes/flipdim.h" "src/c/elementaryFunctions/includes/cos.h" "src/c/elementaryFunctions/includes/fix.h" "src/c/elementaryFunctions/includes/exp.h" diff --git a/macros/findDeps/getAllInterfaces.bin b/macros/findDeps/getAllInterfaces.bin index 65bccb1..0b9ed8c 100644 Binary files a/macros/findDeps/getAllInterfaces.bin and b/macros/findDeps/getAllInterfaces.bin differ diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci index 436eb86..7574cc7 100644 --- a/macros/findDeps/getAllInterfaces.sci +++ b/macros/findDeps/getAllInterfaces.sci @@ -56,6 +56,8 @@ function allInterfaces = getAllInterfaces(Target) "src/c/matrixOperations/interfaces/int_cumprod.h" "src/c/matrixOperations/interfaces/int_triu.h" "src/c/matrixOperations/interfaces/int_tril.h" + "src/c/matrixOperations/interfaces/int_kron.h" + "src/c/matrixOperations/interfaces/int_flipdim.h" "src/c/elementaryFunctions/interfaces/int_asinh.h" "src/c/elementaryFunctions/interfaces/int_atanh.h" "src/c/elementaryFunctions/interfaces/int_sinh.h" diff --git a/macros/findDeps/getAllSources.bin b/macros/findDeps/getAllSources.bin index c014aaa..75c2b57 100644 Binary files a/macros/findDeps/getAllSources.bin and b/macros/findDeps/getAllSources.bin differ diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci index 5a88eb3..d873078 100644 --- a/macros/findDeps/getAllSources.sci +++ b/macros/findDeps/getAllSources.sci @@ -316,12 +316,20 @@ function allSources = getAllSources(Target) "src/c/matrixOperations/triu/i8triua.c" "src/c/matrixOperations/triu/u16triua.c" "src/c/matrixOperations/triu/i16triua.c" + "src/c/matrixOperations/flipdim/dflipdima.c" + "src/c/matrixOperations/flipdim/sflipdima.c" + "src/c/matrixOperations/flipdim/u8flipdima.c" + "src/c/matrixOperations/flipdim/i8flipdima.c" + "src/c/matrixOperations/flipdim/u16flipdima.c" + "src/c/matrixOperations/flipdim/i16flipdima.c" "src/c/matrixOperations/tril/dtrila.c" "src/c/matrixOperations/tril/strila.c" "src/c/matrixOperations/tril/u8trila.c" "src/c/matrixOperations/tril/i8trila.c" "src/c/matrixOperations/tril/u16trila.c" "src/c/matrixOperations/tril/i16trila.c" + "src/c/matrixOperations/kron/dkrona.c" + "src/c/matrixOperations/kron/skrona.c" "src/c/elementaryFunctions/cos/dcosa.c" "src/c/elementaryFunctions/cos/dcoss.c" "src/c/elementaryFunctions/cos/scosa.c" -- cgit