From 362bd2337910fec57d854ebb179772efe552f929 Mon Sep 17 00:00:00 2001 From: Sandeep Gupta Date: Mon, 19 Jun 2017 17:02:45 +0530 Subject: 19-June-2017 --- macros/FunctionAnnotation/FA_SZ_U_SVA.bin | Bin 4860 -> 4692 bytes macros/FunctionAnnotation/FA_SZ_U_SVA.sci | 20 ++++++++++---------- .../ToolInitialization/INIT_FillSCI2LibCDirs.bin | Bin 1628292 -> 1628308 bytes .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 2 +- macros/findDeps/getAllHeaders.bin | Bin 41936 -> 42108 bytes macros/findDeps/getAllHeaders.sci | 2 +- macros/findDeps/getAllInterfaces.bin | Bin 44412 -> 44400 bytes macros/findDeps/getAllInterfaces.sci | 2 +- macros/findDeps/getAllSources.bin | Bin 249092 -> 248996 bytes macros/findDeps/getAllSources.sci | 16 ++++++++-------- 10 files changed, 21 insertions(+), 21 deletions(-) (limited to 'macros') diff --git a/macros/FunctionAnnotation/FA_SZ_U_SVA.bin b/macros/FunctionAnnotation/FA_SZ_U_SVA.bin index 68894599..1bf8b165 100644 Binary files a/macros/FunctionAnnotation/FA_SZ_U_SVA.bin and b/macros/FunctionAnnotation/FA_SZ_U_SVA.bin differ diff --git a/macros/FunctionAnnotation/FA_SZ_U_SVA.sci b/macros/FunctionAnnotation/FA_SZ_U_SVA.sci index 258d9870..695bef02 100644 --- a/macros/FunctionAnnotation/FA_SZ_U_SVA.sci +++ b/macros/FunctionAnnotation/FA_SZ_U_SVA.sci @@ -25,15 +25,15 @@ function opout = FA_SZ_U_SVA(in1,in2) // // ----------------------------------------------------------------- -in1 = string(in1); -in1 = eval(in1); -in2 = string(in2); -in2 = eval(in2); - -[U,S,V] = sva(in1,in2); -outsize = size(U) - -opout = outsize(2) -opout = string(opout) +//in1 = string(in1); +disp(in1) +disp(in2) +//in1 = eval(in1); +//in2 = string(in2); +//in2 = eval(in2); +//[U,S,V] = sva(in1,in2); +//outsize = size(U) +//opout = outsize(2) +opout = string(in2) endfunction diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin index 813bf4a7..55269e36 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 821da17d..008d7b3c 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -6748,7 +6748,7 @@ PrintStringInfo('NIN= 2',ClassFileName,'file','y'); PrintStringInfo('NOUT= 3',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)= FA_SZ_U_SVA(IN(1),IN(2))',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= FA_SZ_U_SVA(IN(1),IN(2).VAL)',ClassFileName,'file','y'); PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y'); PrintStringInfo('OUT(2).SZ(1)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y'); PrintStringInfo('OUT(2).SZ(2)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y'); diff --git a/macros/findDeps/getAllHeaders.bin b/macros/findDeps/getAllHeaders.bin index 3e24e2d6..6142deb2 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 d5c1c99d..01439b23 100644 --- a/macros/findDeps/getAllHeaders.sci +++ b/macros/findDeps/getAllHeaders.sci @@ -60,7 +60,7 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/matrixOperations/includes/logm.h" "src/c/matrixOperations/includes/ones.h" "src/c/matrixOperations/includes/matrixSquaredMagnitude.h" - "src/c/matrixOperations/includes/spec.h" + "src/c/linearAlgebra/includes/spec.h" // moved from matrixOperation to linearAlgebra "src/c/matrixOperations/includes/matrixTranspose.h" "src/c/matrixOperations/includes/determ.h" "src/c/matrixOperations/includes/matrixMultiplication.h" diff --git a/macros/findDeps/getAllInterfaces.bin b/macros/findDeps/getAllInterfaces.bin index 3f243741..17139ce1 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 c9852122..08171a5b 100644 --- a/macros/findDeps/getAllInterfaces.sci +++ b/macros/findDeps/getAllInterfaces.sci @@ -32,7 +32,7 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/type/int_real.h" "src/c/matrixOperations/interfaces/int_vmagn.h" "src/c/matrixOperations/interfaces/int_ones.h" - "src/c/matrixOperations/interfaces/int_spec.h" + "src/c/linearAlgebra/interfaces/int_spec.h" "src/c/matrixOperations/interfaces/int_cat.h" "src/c/matrixOperations/interfaces/int_zeros.h" "src/c/matrixOperations/interfaces/int_OpBackSlash.h" diff --git a/macros/findDeps/getAllSources.bin b/macros/findDeps/getAllSources.bin index a346fb7b..401fb991 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 e296aa14..5dced783 100644 --- a/macros/findDeps/getAllSources.sci +++ b/macros/findDeps/getAllSources.sci @@ -155,18 +155,18 @@ function allSources = getAllSources(SharedInfo) "src/c/matrixOperations/powm/spowma.c" "src/c/matrixOperations/powm/zpowma.c" "src/c/matrixOperations/powm/cpowma.c" - "src/c/matrixOperations/spec/cspeca.c" - "src/c/matrixOperations/spec/dspeca.c" - "src/c/matrixOperations/spec/sspeca.c" - "src/c/matrixOperations/spec/zspeca.c" + "src/c/linearAlgebra/spec/cspeca.c" + "src/c/linearAlgebra/spec/dspeca.c" + "src/c/linearAlgebra/spec/sspeca.c" + "src/c/linearAlgebra/spec/zspeca.c" "src/c/matrixOperations/transpose/ztransposea.c" "src/c/matrixOperations/transpose/stransposea.c" "src/c/matrixOperations/transpose/ctransposea.c" "src/c/matrixOperations/transpose/dtransposea.c" - "src/c/matrixOperations/spec2/zspec2a.c" - "src/c/matrixOperations/spec2/sspec2a.c" - "src/c/matrixOperations/spec2/dspec2a.c" - "src/c/matrixOperations/spec2/cspec2a.c" + "src/c/linearAlgebra/spec2/zspec2a.c" + "src/c/linearAlgebra/spec2/sspec2a.c" + "src/c/linearAlgebra/spec2/dspec2a.c" + "src/c/linearAlgebra/spec2/cspec2a.c" "src/c/matrixOperations/trace/stracea.c" "src/c/matrixOperations/trace/dtracea.c" "src/c/matrixOperations/trace/ctracea.c" -- cgit