mvcorrel and strange functions added

6 files changed, 118 insertions, 4 deletions

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 d1cfeff2..a67a5581 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);

@@ -2372,6 +2377,11 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

+FunctionName = 'strange'; // 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 = 'st_deviation'; // BJ : Not implemented

 PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

@@ -9317,6 +9327,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);

+

 

 

 //------------------------------------

@@ -11158,6 +11229,13 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'wiener'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

 //------------------------------------

 //---- Class MVCORREL --------------------

 //------------------------------------

@@ -11172,11 +11250,15 @@ PrintStringInfo('NIN=         1',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(2)',ClassFileName,'file','y');

-PrintStringInfo('OUT(1).SZ(2)= IN(2).SZ(2)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

 

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

-PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');

+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+PrintStringInfo('s2'+ArgSeparator+'s0',ClassFileName,'file','y');

 

 

 // --- Annotation Function And Function List Function. ---

diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index 2135dced..d564c5b0 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -91,6 +91,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"
@@ -151,12 +152,14 @@ 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"
       "src/c/statisticsFunctions/includes/median.h"
       "src/c/statisticsFunctions/includes/mvcorrel.h"
       "src/c/statisticsFunctions/includes/nanmedian.h"
+      "src/c/statisticsFunctions/includes/strange.h"
       "src/c/statisticsFunctions/includes/gsort.h"
       "src/c/statisticsFunctions/includes/nanstdev.h"
       "src/c/statisticsFunctions/includes/mad.h"
@@ -203,6 +206,7 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/signalProcessing/includes/zpch2.h"
       "src/c/signalProcessing/includes/buttmag.h"
       "src/c/signalProcessing/includes/kalm.h"
+      "src/c/signalProcessing/includes/wiener.h"
       "src/c/signalProcessing/includes/faurre.h"
       "src/c/signalProcessing/includes/cheb1mag.h"
       "src/c/signalProcessing/includes/cheb2mag.h"
@@ -268,6 +272,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/rank.h"
 	  "src/c/linearAlgebra/includes/hess.h"
 	  "src/c/linearAlgebra/includes/sva.h"	
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci
index 601d5255..4ede91ee 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/macros/findDeps/getAllInterfaces.sci
@@ -80,6 +80,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"
@@ -142,10 +143,12 @@ 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_mvcorrel.h"
       "src/c/statisticsFunctions/interfaces/int_nanmedian.h"
+      "src/c/statisticsFunctions/interfaces/int_strange.h"
       "src/c/statisticsFunctions/interfaces/int_gsort.h"
       "src/c/statisticsFunctions/interfaces/int_nanstdev.h"
       "src/c/statisticsFunctions/interfaces/int_mad.h"
@@ -201,6 +204,7 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/signalProcessing/interfaces/int_zpch2.h"
       "src/c/signalProcessing/interfaces/int_buttmag.h"
       "src/c/signalProcessing/interfaces/int_kalm.h"
+      "src/c/signalProcessing/interfaces/int_wiener.h"
       "src/c/signalProcessing/interfaces/int_faurre.h"
       "src/c/signalProcessing/interfaces/int_cheb1mag.h"
       "src/c/signalProcessing/interfaces/int_cheb2mag.h"
@@ -264,6 +268,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_rank.h"
 	  "src/c/linearAlgebra/interfaces/int_sqroot.h"
 	  "src/c/linearAlgebra/interfaces/int_hess.h"
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index 6594a2e1..0adf0e40 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -634,6 +634,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"
@@ -953,6 +959,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"
@@ -1018,6 +1027,9 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/statisticsFunctions/median/zmediancola.c"
       "src/c/statisticsFunctions/median/zmedianrowa.c"
       "src/c/statisticsFunctions/mvcorrel/dmvcorrela.c"
+      "src/c/statisticsFunctions/mvcorrel/dmvcorrel1a.c"
+      "src/c/statisticsFunctions/mvcorrel/smvcorrela.c"
+      "src/c/statisticsFunctions/mvcorrel/smvcorrel1a.c"
       "src/c/statisticsFunctions/stdev/dstdeva.c"
       "src/c/statisticsFunctions/stdev/dstdevrowa.c"
       "src/c/statisticsFunctions/stdev/dstdevcola.c"
@@ -1033,6 +1045,15 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/statisticsFunctions/nanmedian/znanmediana.c"
       "src/c/statisticsFunctions/nanmedian/znanmediancola.c"
       "src/c/statisticsFunctions/nanmedian/znanmedianrowa.c"
+      "src/c/statisticsFunctions/strange/dstrangea.c"
+      "src/c/statisticsFunctions/strange/dstrangerowa.c"
+      "src/c/statisticsFunctions/strange/dstrangecola.c"
+      "src/c/statisticsFunctions/strange/sstrangea.c"
+      "src/c/statisticsFunctions/strange/sstrangerowa.c"
+      "src/c/statisticsFunctions/strange/sstrangecola.c"
+      "src/c/statisticsFunctions/strange/u16strangea.c"
+      "src/c/statisticsFunctions/strange/u16strangerowa.c"
+      "src/c/statisticsFunctions/strange/u16strangecola.c"
       "src/c/statisticsFunctions/gsort/dgsorta.c"
       "src/c/statisticsFunctions/gsort/dgsortrowa.c"
       "src/c/statisticsFunctions/gsort/dgsortcola.c"
@@ -1332,7 +1353,7 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/signalProcessing/zpch2/dzpch2s.c"
       "src/c/signalProcessing/buttmag/dbuttmags.c"
       "src/c/signalProcessing/kalm/dkalma.c"
-      "src/c/signalProcessing/kalm/zkalma.c"
+      //"src/c/signalProcessing/wiener/dwienera.c"
       "src/c/signalProcessing/faurre/dfaurrea.c"
       "src/c/signalProcessing/cheb1mag/dcheb1mags.c"
       "src/c/signalProcessing/cheb2mag/dcheb2mags.c"
@@ -1564,6 +1585,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/rank/dranka.c"
           "src/c/linearAlgebra/rank/zranka.c"