Merge and functions added

3 files changed, 77 insertions, 0 deletions

diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index ff737db0..e4d7133e 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -76,6 +76,7 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/matrixOperations/includes/norm.h"
       "src/c/matrixOperations/includes/toeplitz.h"
       "src/c/matrixOperations/includes/cross.h"
+      "src/c/matrixOperations/includes/ndgrid.h"
       "src/c/interpolation/includes/interp1.h"
       "src/c/elementaryFunctions/includes/nextpow2.h"
       "src/c/elementaryFunctions/includes/gcd.h"
@@ -101,6 +102,7 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/elementaryFunctions/includes/dynlib_elementaryfunctions.h"
       "src/c/elementaryFunctions/includes/acosh.h"
       "src/c/elementaryFunctions/includes/sinh.h"
+      "src/c/elementaryFunctions/includes/sind.h"
       "src/c/elementaryFunctions/includes/lnp1m1.h"
       "src/c/elementaryFunctions/includes/tanh.h"
       "src/c/elementaryFunctions/includes/sqrt.h"
@@ -115,6 +117,7 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/elementaryFunctions/includes/asinh.h"
       "src/c/elementaryFunctions/includes/atan2.h"
       "src/c/elementaryFunctions/includes/atanh.h"
+      "src/c/elementaryFunctions/includes/tand.h"
       "src/c/elementaryFunctions/includes/uint8.h"
       "src/c/elementaryFunctions/includes/int8.h"
       "src/c/elementaryFunctions/includes/uint16.h"
@@ -147,6 +150,7 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/elementaryFunctions/includes/asind.h"
       "src/c/elementaryFunctions/includes/atand.h"
       "src/c/elementaryFunctions/includes/isequal.h"
+      "src/c/elementaryFunctions/includes/isinf.h"
       "src/c/statisticsFunctions/includes/variance.h"
       "src/c/statisticsFunctions/includes/sum.h"
       "src/c/statisticsFunctions/includes/mean.h"
@@ -163,6 +167,10 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/statisticsFunctions/includes/statMax.h"
       "src/c/statisticsFunctions/includes/statMin.h"
       "src/c/statisticsFunctions/includes/moment.h"
+      "src/c/statisticsFunctions/includes/wcenter.h"
+      "src/c/statisticsFunctions/includes/center.h"
+      "src/c/statisticsFunctions/includes/correl.h"
+      "src/c/statisticsFunctions/includes/covar.h"
       "src/c/operations/includes/subtraction.h"
       "src/c/operations/includes/addition.h"
       "src/c/operations/includes/dynlib_operations.h"
@@ -247,6 +255,9 @@ function allHeaders = getAllHeaders(SharedInfo)
 	"src/c/specialFunctions/includes/erfcx.h"
 	"src/c/specialFunctions/includes/erfinv.h"
 	"src/c/specialFunctions/includes/calerf.h"
+	"src/c/specialFunctions/includes/gamma.h"
+	"src/c/specialFunctions/includes/gammaln.h"
+	"src/c/specialFunctions/includes/beta.h"
       "src/c/CACSD/includes/syslin.h"
       "src/c/CACSD/includes/lqr.h"
       "src/c/CACSD/includes/lqe.h"
@@ -262,6 +273,7 @@ function allHeaders = getAllHeaders(SharedInfo)
 	  "src/c/linearAlgebra/includes/householder.h"
 	  "src/c/linearAlgebra/includes/fullrf.h"
 	  "src/c/linearAlgebra/includes/rowcomp.h"
+	  "src/c/linearAlgebra/includes/range.h"
       "src/c/linearAlgebra/includes/rcond.h"
 	  "src/c/linearAlgebra/includes/qr.h"
 	  "src/c/linearAlgebra/includes/spec.h"];
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci
index 45ac7683..48028745 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/macros/findDeps/getAllInterfaces.sci
@@ -65,6 +65,7 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/matrixOperations/interfaces/int_norm.h"
       "src/c/matrixOperations/interfaces/int_toeplitz.h"
       "src/c/matrixOperations/interfaces/int_cross.h"
+      "src/c/matrixOperations/interfaces/int_ndgrid.h"
       "src/c/interpolation/interfaces/int_interp1.h"
       "src/c/elementaryFunctions/interfaces/int_nextpow2.h"
       "src/c/elementaryFunctions/interfaces/int_gcd.h"
@@ -89,7 +90,9 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/elementaryFunctions/interfaces/int_log.h"
       "src/c/elementaryFunctions/interfaces/int_pow.h"
       "src/c/elementaryFunctions/interfaces/int_sin.h"
+      "src/c/elementaryFunctions/interfaces/int_sind.h"
       "src/c/elementaryFunctions/interfaces/int_tan.h"
+      "src/c/elementaryFunctions/interfaces/int_tand.h"
       "src/c/elementaryFunctions/interfaces/int_acosh.h"
       "src/c/elementaryFunctions/interfaces/int_acos.h"
       "src/c/elementaryFunctions/interfaces/int_asin.h"
@@ -138,6 +141,7 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/elementaryFunctions/interfaces/int_gcd.h"
       "src/c/elementaryFunctions/interfaces/int_lcm.h"
       "src/c/elementaryFunctions/interfaces/int_isequal.h"
+      "src/c/elementaryFunctions/interfaces/int_isinf.h"
       "src/c/statisticsFunctions/interfaces/int_mean.h"
       "src/c/statisticsFunctions/interfaces/int_median.h"
       "src/c/statisticsFunctions/interfaces/int_nanmedian.h"
@@ -151,6 +155,10 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/statisticsFunctions/interfaces/int_variance.h"
       "src/c/statisticsFunctions/interfaces/int_sum.h"
       "src/c/statisticsFunctions/interfaces/int_moment.h"
+      "src/c/statisticsFunctions/interfaces/int_wcenter.h"
+      "src/c/statisticsFunctions/interfaces/int_center.h"
+      "src/c/statisticsFunctions/interfaces/int_correl.h"
+      "src/c/statisticsFunctions/interfaces/int_covar.h"
       "src/c/operations/interfaces/int_OpEqual.h"
       "src/c/operations/interfaces/int_OpLogNot.h"
       "src/c/operations/interfaces/int_OpLogEq.h"
@@ -242,6 +250,9 @@ function allInterfaces = getAllInterfaces(SharedInfo)
 	"src/c/specialFunctions/interfaces/int_erfcx.h"
 	"src/c/specialFunctions/interfaces/int_erfinv.h"
 	"src/c/specialFunctions/interfaces/int_calerf.h"
+	"src/c/specialFunctions/interfaces/int_gamma.h"
+	"src/c/specialFunctions/interfaces/int_gammaln.h"
+	"src/c/specialFunctions/interfaces/int_beta.h"
       "src/c/CACSD/interfaces/int_syslin.h"
       "src/c/CACSD/interfaces/int_lqr.h"
       "src/c/CACSD/interfaces/int_lqe.h"
@@ -258,6 +269,7 @@ function allInterfaces = getAllInterfaces(SharedInfo)
 	  "src/c/linearAlgebra/interfaces/int_householder.h"
 	  "src/c/linearAlgebra/interfaces/int_fullrf.h"	
 	  "src/c/linearAlgebra/interfaces/int_rowcomp.h"	
+	  "src/c/linearAlgebra/interfaces/int_range.h"	
 	  "src/c/linearAlgebra/interfaces/int_qr.h";
       "src/c/linearAlgebra/interfaces/int_rcond.h"];
 
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index 9b36b5e5..606139a7 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -360,6 +360,9 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/matrixOperations/cross/i8crossa.c"
       "src/c/matrixOperations/cross/u16crossa.c"
       "src/c/matrixOperations/cross/i16crossa.c"
+      "src/c/matrixOperations/ndgrid/dndgrida.c"
+      "src/c/matrixOperations/ndgrid/sndgrida.c"
+      "src/c/matrixOperations/ndgrid/zndgrida.c"
       "src/c/elementaryFunctions/nextpow2/dnextpow2a.c"
       "src/c/elementaryFunctions/isreal/sisreals.c"
       "src/c/elementaryFunctions/isreal/disreals.c"
@@ -475,6 +478,14 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/elementaryFunctions/acos/dacoss.c"
       "src/c/elementaryFunctions/acos/sacosa.c"
       "src/c/elementaryFunctions/acos/sacoss.c"
+      "src/c/elementaryFunctions/tand/dtands.c"
+      "src/c/elementaryFunctions/tand/stands.c"
+      "src/c/elementaryFunctions/tand/dtanda.c"
+      "src/c/elementaryFunctions/tand/standa.c"
+      "src/c/elementaryFunctions/sind/dsinds.c"
+      "src/c/elementaryFunctions/sind/ssinds.c"
+      "src/c/elementaryFunctions/sind/dsinda.c"
+      "src/c/elementaryFunctions/sind/ssinda.c"
       "src/c/elementaryFunctions/asin/dasina.c"
       "src/c/elementaryFunctions/asin/dasins.c"
       "src/c/elementaryFunctions/asin/sasina.c"
@@ -940,6 +951,8 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/elementaryFunctions/isequal/zisequala.c"
       "src/c/elementaryFunctions/isequal/u16isequals.c"
       "src/c/elementaryFunctions/isequal/u16isequala.c"
+      "src/c/elementaryFunctions/isinf/disinfs.c"
+      "src/c/elementaryFunctions/isinf/sisinfs.c"
       "src/c/statisticsFunctions/max/dmaxa.c"
       "src/c/statisticsFunctions/max/smaxa.c"
       "src/c/statisticsFunctions/max/srowmaxa.c"
@@ -1095,6 +1108,33 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/statisticsFunctions/moment/zmoments.c"
       "src/c/statisticsFunctions/moment/zmomentrowa.c"
       "src/c/statisticsFunctions/moment/zmomentcola.c"
+      "src/c/statisticsFunctions/wcenter/dwcentera.c"
+      "src/c/statisticsFunctions/wcenter/dwcenterrowa.c"
+      "src/c/statisticsFunctions/wcenter/dwcentercola.c"
+      "src/c/statisticsFunctions/wcenter/swcentera.c"
+      "src/c/statisticsFunctions/wcenter/swcenterrowa.c"
+      "src/c/statisticsFunctions/wcenter/swcentercola.c"
+      "src/c/statisticsFunctions/wcenter/zwcentera.c"
+      "src/c/statisticsFunctions/wcenter/zwcenterrowa.c"
+      "src/c/statisticsFunctions/wcenter/zwcentercola.c"
+      "src/c/statisticsFunctions/center/dcentera.c"
+      "src/c/statisticsFunctions/center/dcenterrowa.c"
+      "src/c/statisticsFunctions/center/dcentercola.c"
+      "src/c/statisticsFunctions/center/scentera.c"
+      "src/c/statisticsFunctions/center/scenterrowa.c"
+      "src/c/statisticsFunctions/center/scentercola.c"
+      "src/c/statisticsFunctions/center/zcentera.c"
+      "src/c/statisticsFunctions/center/zcenterrowa.c"
+      "src/c/statisticsFunctions/center/zcentercola.c"
+      "src/c/statisticsFunctions/correl/dcorrels.c"
+      "src/c/statisticsFunctions/correl/dcorrelfres.c"
+      "src/c/statisticsFunctions/correl/scorrels.c"
+      "src/c/statisticsFunctions/correl/scorrelfres.c"
+      "src/c/statisticsFunctions/correl/zcorrels.c"
+      "src/c/statisticsFunctions/correl/zcorrelfres.c"
+      "src/c/statisticsFunctions/covar/dcovars.c"
+      "src/c/statisticsFunctions/covar/scovars.c"
+      "src/c/statisticsFunctions/covar/zcovars.c"
       "src/c/operations/multiplication/cmula.c"
       "src/c/operations/multiplication/cmuls.c"
       "src/c/operations/multiplication/cmulv.c"
@@ -1492,6 +1532,18 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/specialFunctions/calerf/dcalerfa.c"
       "src/c/specialFunctions/calerf/scalerfs.c"
       "src/c/specialFunctions/calerf/scalerfa.c"
+      "src/c/specialFunctions/gamma/dgammas.c"
+      "src/c/specialFunctions/gamma/dgammaa.c"
+      "src/c/specialFunctions/gamma/sgammas.c"
+      "src/c/specialFunctions/gamma/sgammaa.c"
+      "src/c/specialFunctions/gammaln/dgammalns.c"
+      "src/c/specialFunctions/gammaln/dgammalna.c"
+      "src/c/specialFunctions/gammaln/sgammalns.c"
+      "src/c/specialFunctions/gammaln/sgammalna.c"
+      "src/c/specialFunctions/beta/dbetas.c"
+      "src/c/specialFunctions/beta/dbetaa.c"
+      "src/c/specialFunctions/beta/sbetas.c"
+      "src/c/specialFunctions/beta/sbetaa.c"
       "src/c/CACSD/syslin/dsyslina.c"
       "src/c/CACSD/lqr/dlqra.c"
       "src/c/CACSD/lqe/dlqea.c"
@@ -1519,6 +1571,7 @@ function allSources = getAllSources(SharedInfo,BuildTool)
 	  "src/c/linearAlgebra/spec/dspec1a.c"
 	  "src/c/linearAlgebra/fullrf/dfullrfa.c"
 	  "src/c/linearAlgebra/rowcomp/drowcompa.c"
+	  "src/c/linearAlgebra/range/drangea.c"
 	  "src/c/linearAlgebra/qr/dqra.c"
       "src/c/linearAlgebra/rcond/drconda.c"];