summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortorset2008-12-22 09:07:41 +0000
committertorset2008-12-22 09:07:41 +0000
commit3e4e743b2d1cb50bc442bc8fc568e29d48c7580a (patch)
tree498f24b69f21745bb9cd80fdd90be1837ff560ab
parentf078539597de7a54d982984635ee6cdbe36fe138 (diff)
downloadscilab2c-3e4e743b2d1cb50bc442bc8fc568e29d48c7580a.tar.gz
scilab2c-3e4e743b2d1cb50bc442bc8fc568e29d48c7580a.tar.bz2
scilab2c-3e4e743b2d1cb50bc442bc8fc568e29d48c7580a.zip
Little changes made
-rw-r--r--src/signalProcessing/Makefile.am3
-rw-r--r--src/signalProcessing/Makefile.in3
-rw-r--r--src/signalProcessing/conv/dconva.c16
-rw-r--r--src/signalProcessing/conv/zconva.c17
-rw-r--r--src/signalProcessing/fft/dfftmx.c12
-rw-r--r--src/signalProcessing/includes/conv.h2
-rw-r--r--src/signalProcessing/includes/conv2d.h3
7 files changed, 48 insertions, 8 deletions
diff --git a/src/signalProcessing/Makefile.am b/src/signalProcessing/Makefile.am
index 9efcfb4f..30d8b7e7 100644
--- a/src/signalProcessing/Makefile.am
+++ b/src/signalProcessing/Makefile.am
@@ -14,4 +14,5 @@ SUBDIRS= fft \
ifft \
levin \
conv \
- conv2d
+ conv2d \
+ hilbert
diff --git a/src/signalProcessing/Makefile.in b/src/signalProcessing/Makefile.in
index 3ef4f110..ab0fee69 100644
--- a/src/signalProcessing/Makefile.in
+++ b/src/signalProcessing/Makefile.in
@@ -169,7 +169,8 @@ SUBDIRS = fft \
ifft \
levin \
conv \
- conv2d
+ conv2d \
+ hilbert
all: all-recursive
diff --git a/src/signalProcessing/conv/dconva.c b/src/signalProcessing/conv/dconva.c
index 95d02de6..dc4294d0 100644
--- a/src/signalProcessing/conv/dconva.c
+++ b/src/signalProcessing/conv/dconva.c
@@ -1,3 +1,16 @@
+
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Arnaud TORSET
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
#include "conv.h"
void dconva(double *in1, int size1, double *in2,int size2, double *out){
@@ -18,6 +31,9 @@ void dconva(double *in1, int size1, double *in2,int size2, double *out){
zreala(result,size1+size2-1,out);
free(result);
+ free(in2Cpx);
+ free(in1Cpx);
+
}
diff --git a/src/signalProcessing/conv/zconva.c b/src/signalProcessing/conv/zconva.c
index 688023a7..83c791ec 100644
--- a/src/signalProcessing/conv/zconva.c
+++ b/src/signalProcessing/conv/zconva.c
@@ -1,3 +1,16 @@
+
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Arnaud TORSET
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
#include "conv.h"
void zconva(doubleComplex *in1, int size1, doubleComplex *in2,int size2, doubleComplex *out){
@@ -31,4 +44,8 @@ void zconva(doubleComplex *in1, int size1, doubleComplex *in2,int size2, doubleC
for (i=0;i<size1+size2-1;i++){
out[i]=result[i];
}
+
+ free(result);
+ free(in2b);
+ free(in1b);
}
diff --git a/src/signalProcessing/fft/dfftmx.c b/src/signalProcessing/fft/dfftmx.c
index 74cfcb4a..bc8faa3c 100644
--- a/src/signalProcessing/fft/dfftmx.c
+++ b/src/signalProcessing/fft/dfftmx.c
@@ -194,7 +194,7 @@ int factorTransform (void)
switch ( nfac[i-1] )
{
- case 2 :printf("passge en 2\n");
+ case 2 :
/*transform for factor of 2 (including rotation factor)*/
retVal = pre_fOf2Trans() ;
@@ -202,7 +202,7 @@ switch ( nfac[i-1] )
break ;
- case 4 :printf("passge en 4\n");
+ case 4 :
/*transform for factor of 4 */
kspnn = kspan ;
kspan = kspan >> 2 ; /*kspan /= 4 */
@@ -210,8 +210,8 @@ switch ( nfac[i-1] )
retVal = factorOf4Transform () ;
break ;
- case 3 :printf("passge en 3\n");
-printf("valeurs init : %d and %d and %d\n",nfac[i-1],kspan,nn);
+ case 3 :
+
k = nfac[i-1] ;
kspnn = kspan ;
kspan = kspan / k ;
@@ -219,7 +219,7 @@ printf("valeurs init : %d and %d and %d\n",nfac[i-1],kspan,nn);
factorOf3Transform ( ) ;
break ;
- case 5 :printf("passge en 5\n");
+ case 5 :
k = nfac[i-1] ;
kspnn = kspan ;
@@ -228,7 +228,7 @@ printf("valeurs init : %d and %d and %d\n",nfac[i-1],kspan,nn);
factorOf5Transform ( ) ;
break ;
- default :printf("passge en autre\n");
+ default :
k = nfac[i-1] ;
kspnn = kspan ;
diff --git a/src/signalProcessing/includes/conv.h b/src/signalProcessing/includes/conv.h
index e23c15d9..90b23450 100644
--- a/src/signalProcessing/includes/conv.h
+++ b/src/signalProcessing/includes/conv.h
@@ -22,6 +22,8 @@
#include "fft.h"
+/* Computes the convolution between VECTORS */
+
void sconva(float *in1, int size1, float *in2,int size2, float *out);
void dconva(double *in1, int size1, double *in2,int size2, double *out);
diff --git a/src/signalProcessing/includes/conv2d.h b/src/signalProcessing/includes/conv2d.h
index e4eac021..7c7fc7a6 100644
--- a/src/signalProcessing/includes/conv2d.h
+++ b/src/signalProcessing/includes/conv2d.h
@@ -16,6 +16,9 @@
#include "floatComplex.h"
#include "doubleComplex.h"
+
+/* Computes the convolution between MATRICES */
+
void sconv2da(float *in1, int lines1, int columns1, float *in2, int lines2, int columns2, float *out);
void dconv2da(double *in1, int lines1, int columns1, double *in2, int lines2, int columns2, double *out);