summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/lapack.h9
-rw-r--r--includes/sci2clib.h35
2 files changed, 34 insertions, 10 deletions
diff --git a/includes/lapack.h b/includes/lapack.h
index 9731026e..c5e4e680 100644
--- a/includes/lapack.h
+++ b/includes/lapack.h
@@ -196,8 +196,13 @@ extern doubleComplex zgesvd_( char* , char* , int* , int* ,doubleComplex *,\
int* , double* ,doubleComplex* , int* ,doubleComplex* , int* ,\
doubleComplex* , int* , double* , int* );
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+/*USed in QR decompsition*/
+extern double dgeqrf_(int *,int *,double *,int *,double *,double *,int *,int *);
+extern double dgeqpf_(int *,int *,double *,int *,int *,double *,double *,int *);
+extern double dorgqr_(int *,int *,int *,double *,int *,double *,double *,int *,int *);
+extern void dlaset_(char *,int *,int *,double *,double *,double *,int *);
+
+
#ifdef __cplusplus
} /* extern "C" */
#endif
diff --git a/includes/sci2clib.h b/includes/sci2clib.h
index 34380bd5..80af0fe3 100644
--- a/includes/sci2clib.h
+++ b/includes/sci2clib.h
@@ -329,7 +329,7 @@ extern "C" {
#include "int_secd.h"
/*interfacing float*/
-#include "float.h"
+#include "get_float.h"
#include "int_float.h"
/*interfacing factorial*/
@@ -467,6 +467,11 @@ extern "C" {
#include "int_norm.h"
#include "norm.h"
+/*interface Toeplitz */
+#include "toeplitz.h"
+#include "int_toeplitz.h"
+
+
/* SIGNAL PROCESSING */
<<<<<<< HEAD
@@ -689,12 +694,27 @@ extern "C" {
#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
+#include "sva.h" /* Linear Algebra - SVA function */
+#include "int_sva.h"
+
+#include "sqroot.h" /* Linear Algebra - Sqroot function */
+#include "int_sqroot.h"
+
+#include "givens.h" /* Linear Algebra - Givens Function */
+#include "int_givens.h"
+
+#include "householder.h" /* Linear Algebra - Householder function */
+#include "int_householder.h"
+
+#include "fullrf.h" /* Linear Algebra - Full rank factoziation */
+#include "int_fullrf.h"
+
+#include "rowcomp.h" /* Linear Algebra - row compression, range */
+#include "int_rowcomp.h"
+
+
+#include "qr.h" /* Linear Algebra - QR decomposition */
+#include "int_qr.h"
/*Functions related to opencv*/
/*#include "cvcore.hpp"
@@ -761,7 +781,6 @@ extern "C" {
/*RPi*/
#ifdef RPi1
#include "wiringPi.h"
-<<<<<<< HEAD
#include "RPIPeripheralDigital.h"
#include "int_RPIPeripheralDigital.h"
#include "RPIPeripheralGertboard.h"