summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/lapack.h12
-rw-r--r--includes/sci2clib.h205
2 files changed, 217 insertions, 0 deletions
diff --git a/includes/lapack.h b/includes/lapack.h
index ba568ce..9731026 100644
--- a/includes/lapack.h
+++ b/includes/lapack.h
@@ -186,6 +186,18 @@ extern int dggbal_(char*,int*,double*,int*,double*,int*,int*,int*,double*, \
double*,double*,int*);
extern int dgebak_(char*,char*,int*,int*,int*,double*,int*,double*,int*,int*);
+<<<<<<< HEAD
+/*Used in SVD */
+extern double dgesvd_(char*,char*,int*,int*,double*,int*,double*,double*,int*,\
+ double*,int*,double *,int*,int*);
+
+/* Used in svd complex */
+extern doubleComplex zgesvd_( char* , char* , int* , int* ,doubleComplex *,\
+ int* , double* ,doubleComplex* , int* ,doubleComplex* , int* ,\
+ doubleComplex* , int* , double* , int* );
+
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
#ifdef __cplusplus
} /* extern "C" */
#endif
diff --git a/includes/sci2clib.h b/includes/sci2clib.h
index 55b6a34..34380bd 100644
--- a/includes/sci2clib.h
+++ b/includes/sci2clib.h
@@ -18,6 +18,18 @@ extern "C" {
/* interfacing lapack */
#include "lapack.h"
+<<<<<<< HEAD
+
+#include "sva.h"
+#include "int_sva.h"
+
+
+#include "svd.h"
+#include "int_svd.h"
+
+
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
/* AUXILIARY FUNCTIONS */
/* interfacing abs */
@@ -65,8 +77,27 @@ extern "C" {
#include "rand.h"
#include "int_rand.h"
+<<<<<<< HEAD
+/* INTERPOLATION FUNCTIONS*/
+
+/*interfacing interp1*/
+#include "interp1.h"
+#include "int_interp1.h"
+
+/* ELEMENTARY FUNCTIONS */
+
+#include "nextpow2.h"
+#include "int_nextpow2.h"
+/*interfacing gcd*/
+#include "gcd.h"
+#include "int_gcd.h"
+/* interfacing isreal*/
+#include "isreal.h"
+#include "int_isreal.h"
+=======
/* ELEMENTARY FUNCTIONS */
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
/* interfacing atand */
#include "atand.h"
#include "int_atand.h"
@@ -189,6 +220,15 @@ extern "C" {
/* interfacing int16 */
#include "int16.h"
#include "int_int16.h"
+<<<<<<< HEAD
+/* interfacing uint32 */
+#include "uint32.h"
+#include "int_uint32.h"
+/* interfacing int32 */
+#include "int32.h"
+#include "int_int32.h"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
/*interfacing bitand */
#include "bitand.h"
@@ -304,6 +344,18 @@ extern "C" {
#include "factor.h"
#include "int_factor.h"
+<<<<<<< HEAD
+/*interfacing gcd*/
+#include "gcd.h"
+#include "int_gcd.h"
+
+/*interfacing lcm*/
+#include "lcm.h"
+#include "int_lcm.h"
+
+
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
/* IMPLICIT LISTS */
/* interfacing implicitList/OpColon */
#include "implicitList.h"
@@ -373,7 +425,11 @@ extern "C" {
/* interfacing ones */
#include "ones.h"
#include "int_ones.h"
+<<<<<<< HEAD
+/* Linear Algebra - spec */
+=======
/* interfacing spec */
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
#include "spec.h"
#include "int_spec.h"
/* interfacing trace */
@@ -412,6 +468,21 @@ extern "C" {
#include "norm.h"
/* SIGNAL PROCESSING */
+<<<<<<< HEAD
+
+
+#include "modk.h"
+#include "int_modk.h"
+/* interfacing idct */
+//#include "idct.h"
+//#include "int_idct.h"
+
+/* interfacing dct */
+//#include "dct.h"
+//#include "int_dct.h"
+
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
/* interfacing convol */
#include "conv.h"
#include "conv2d.h"
@@ -431,7 +502,69 @@ extern "C" {
#include "lev.h"
#include "int_lev.h"
+<<<<<<< HEAD
+/* interfacing zpbutt */
+#include "zpbutt.h"
+#include "int_zpbutt.h"
+
+/*interfacing zpch1 */
+#include "zpch1.h"
+#include "int_zpch1.h"
+
+/*interfacing zpch2 */
+#include "zpch2.h"
+#include "int_zpch2.h"
+
+/*interfacing buttmag */
+#include "buttmag.h"
+#include "int_buttmag.h"
+
+/*interfacing cheb1mag */
+#include "cheb1mag.h"
+#include "int_cheb1mag.h"
+
+/*interfacing cheb2mag */
+#include "cheb2mag.h"
+#include "int_cheb2mag.h"
+
+/*interfacing sinc */
+#include "sinc.h"
+#include "int_sinc.h"
+
+/*interfacing sincd */
+#include "sincd.h"
+#include "int_sincd.h"
+
+/*interfacing fsfirlin */
+#include "fsfirlin.h"
+#include "int_fsfirlin.h"
+/*interfacing %k */
+#include "modk.h"
+#include "int_modk.h"
+
+/*interfacing filt_sinc */
+#include "filt_sinc.h"
+#include "int_filt_sinc.h"
+
+/*interfacing ffilt */
+#include "ffilt.h"
+#include "int_ffilt.h"
+
+/*interfacing %sn */
+#include "modsn.h"
+#include "int_modsn.h"
+
+/*interfacing ell1mag */
+#include "ell1mag.h"
+#include "int_ell1mag.h"
+
+/* interfacing amell */
+#include "amell.h"
+#include "int_amell.h"
+=======
+
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
/* STATISTICS FUNCTIONS */
@@ -500,6 +633,29 @@ extern "C" {
#include "strrchr.h"
#include "int_strrchr.h"
+<<<<<<< HEAD
+/*interfacing strchr*/
+#include "strchr.h"
+#include "int_strchr.h"
+
+/*interfacing ascii*/
+#include "ascii.h"
+#include "int_ascii.h"
+
+/*interfacing strspn*/
+#include "strspn.h"
+#include "int_strspn.h"
+
+/*interfacing strcspn*/
+#include "strcspn.h"
+#include "int_strcspn.h"
+
+/*interfacing strncpy*/
+#include "strncpy.h"
+#include "int_strncpy.h"
+
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
/*Functions related to strings*/
#include "convstr.h"
#include "int_convstr.h"
@@ -523,8 +679,22 @@ extern "C" {
#include "balanc.h"
#include "int_balanc.h"
+<<<<<<< HEAD
+#include "svd.h" /*Linear Alegbra - Singular value decompostion */
+#include "int_svd.h"
+
#include "rcond.h"
#include "int_rcond.h"
+
+#include "hess.h" /* Linear Algebra - Hess function */
+#include "int_hess.h"
+
+#include "sva.h"
+#include "int_sva.h" /*Linear Algebra - SVA function */
+=======
+#include "rcond.h"
+#include "int_rcond.h"
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
/*Functions related to opencv*/
/*#include "cvcore.hpp"
@@ -591,6 +761,40 @@ extern "C" {
/*RPi*/
#ifdef RPi1
#include "wiringPi.h"
+<<<<<<< HEAD
+#include "RPIPeripheralDigital.h"
+#include "int_RPIPeripheralDigital.h"
+#include "RPIPeripheralGertboard.h"
+#include "int_RPIPeripheralGertboard.h"
+#include "RPIPeripheralI2C.h"
+#include "int_RPIPeripheralI2C.h"
+#include "RPIPeripheralInterrupt.h"
+#include "int_RPIPeripheralInterrupt.h"
+#include "RPIPeripheralLCD.h"
+#include "int_RPIPeripheralLCD.h"
+#include "RPIPeripheralMcp.h"
+#include "int_RPIPeripheralMcp.h"
+#include "RPIPeripheralMisc.h"
+#include "int_RPIPeripheralMisc.h"
+#include "RPIPeripheralPcf.h"
+#include "int_RPIPeripheralPcf.h"
+#include "RPIPeripheralPiGlow.h"
+#include "int_RPIPeripheralPiGlow.h"
+#include "RPIPeripheralPinMap.h"
+#include "int_RPIPeripheralPinMap.h"
+#include "RPIPeripheralPWM.h"
+#include "int_RPIPeripheralPWM.h"
+#include "RPIPeripheralSerial.h"
+#include "int_RPIPeripheralSerial.h"
+#include "RPIPeripheralSetup.h"
+#include "int_RPIPeripheralSetup.h"
+#include "RPIPeripheralShift.h"
+#include "int_RPIPeripheralShift.h"
+#include "RPIPeripheralSoft.h"
+#include "int_RPIPeripheralSoft.h"
+#include "RPIPeripheralTiming.h"
+#include "int_RPIPeripheralTiming.h"
+=======
#include "int_RPIPeripheralDigital.h"
#include "RPIPeripheralDigital.h"
#include "int_RPIPeripheralTiming.h"
@@ -603,6 +807,7 @@ extern "C" {
#include "RPIPeripheralPinISR.h"
#include "int_RPIPeripheralPWM.h"
#include "RPIPeripheralPWM.h"
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
#endif
#ifdef __cplusplus