Add conv and conv2d linked files

14 files changed, 75 insertions, 6 deletions

diff --git a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
index cc9c4b8a..ab93bded 100644
--- a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
+++ b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
@@ -40,7 +40,6 @@ SWSRCS	=	\
 	$(CSRCDIR)/OpLogEq.c \
 	$(CSRCDIR)/OpLogOr.c \
 	$(CSRCDIR)/OpLogAnd.c \
-	$(CSRCDIR)/Find.c \
 	$(CSRCDIR)/ConvertPrecision.c \
 	$(CSRCDIR)/ssqrts.c \
 	$(CSRCDIR)/dsqrts.c \
@@ -70,6 +69,10 @@ SWSRCS	=	\
 	$(CSRCDIR)/sfinda.c \
 	$(CSRCDIR)/cfinda.c \
 	$(CSRCDIR)/zfinda.c\
+	$(CSRCDIR)/dfind2da.c \
+	$(CSRCDIR)/sfind2da.c \
+	$(CSRCDIR)/cfind2da.c \
+	$(CSRCDIR)/zfind2da.c\
 	$(CSRCDIR)/scats.c \
 	$(CSRCDIR)/scata.c \
 	$(CSRCDIR)/dcats.c \
@@ -370,7 +373,27 @@ SWSRCS	=	\
 	$(CSRCDIR)/sisnans.c \
 	$(CSRCDIR)/sisnana.c \
 	$(CSRCDIR)/zisnans.c \
-	$(CSRCDIR)/zisnana.c 
+	$(CSRCDIR)/zisnana.c \
+	$(CSRCDIR)/cconva.c \
+	$(CSRCDIR)/dconva.c \
+	$(CSRCDIR)/sconva.c \
+	$(CSRCDIR)/zconva.c \
+	$(CSRCDIR)/cconv2da.c \
+	$(CSRCDIR)/dconv2da.c \
+	$(CSRCDIR)/sconv2da.c \
+	$(CSRCDIR)/zconv2da.c 
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 #	$(CSRCDIR)/clog1ps.c \
 #	$(CSRCDIR)/zlog1ps.c \
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2ccode/cconv2da.c b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/cconv2da.c
new file mode 120000
index 00000000..992d0f57
--- /dev/null
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/cconv2da.c
@@ -0,0 +1 @@
+../../../../signalProcessing/conv2d/cconv2da.c
\ No newline at end of file
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2ccode/cconva.c b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/cconva.c
new file mode 120000
index 00000000..00381230
--- /dev/null
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/cconva.c
@@ -0,0 +1 @@
+../../../../signalProcessing/conv/cconva.c
\ No newline at end of file
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2ccode/dconv2da.c b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/dconv2da.c
new file mode 120000
index 00000000..8a755708
--- /dev/null
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/dconv2da.c
@@ -0,0 +1 @@
+../../../../signalProcessing/conv2d/dconv2da.c
\ No newline at end of file
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2ccode/dconva.c b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/dconva.c
new file mode 120000
index 00000000..57f0f8cb
--- /dev/null
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/dconva.c
@@ -0,0 +1 @@
+../../../../signalProcessing/conv/dconva.c
\ No newline at end of file
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2ccode/sconv2da.c b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/sconv2da.c
new file mode 120000
index 00000000..b003858e
--- /dev/null
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/sconv2da.c
@@ -0,0 +1 @@
+../../../../signalProcessing/conv2d/sconv2da.c
\ No newline at end of file
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2ccode/sconva.c b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/sconva.c
new file mode 120000
index 00000000..633c413f
--- /dev/null
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/sconva.c
@@ -0,0 +1 @@
+../../../../signalProcessing/conv/sconva.c
\ No newline at end of file
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2ccode/zconv2da.c b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/zconv2da.c
new file mode 120000
index 00000000..4b2ed527
--- /dev/null
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/zconv2da.c
@@ -0,0 +1 @@
+../../../../signalProcessing/conv2d/zconv2da.c
\ No newline at end of file
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2ccode/zconva.c b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/zconva.c
new file mode 120000
index 00000000..24d799db
--- /dev/null
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/zconva.c
@@ -0,0 +1 @@
+../../../../signalProcessing/conv/zconva.c
\ No newline at end of file
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/conv.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/conv.h
new file mode 120000
index 00000000..d323a3e6
--- /dev/null
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/conv.h
@@ -0,0 +1 @@
+../../../../signalProcessing/includes/conv.h
\ No newline at end of file
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/conv2d.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/conv2d.h
new file mode 120000
index 00000000..f3e01eb8
--- /dev/null
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/conv2d.h
@@ -0,0 +1 @@
+../../../../signalProcessing/includes/conv2d.h
\ No newline at end of file
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
index 6b3a3d6e..33bf218f 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
@@ -43,6 +43,7 @@
 
 /* interfacing find */
 #include "find.h"
+#include "find2d.h"
 #include "int_find.h"
 /* interfacing disp */
 #include "disp.h"
@@ -109,7 +110,8 @@
 #include "int_log1p.h"
 /* interfacing pow */
 #include "pow.h"
-#include "int_pow.h"
+#include "int_OpHat.h"
+#include "int_OpDotHat.h"
 /* interfacing sin */
 #include "sin.h"
 #include "int_sin.h"
@@ -177,6 +179,13 @@
 #include "determ.h"
 #include "int_det.h"
 
+
+/* STATISTICS FUNCTIONS */
+/* interefacing convol */
+#include "conv.h"
+#include "conv2d.h"
+#include "int_convol.h"
+
 /* STATISTICS FUNCTIONS */
 
 /* interfacing mean */
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_convol.h b/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_convol.h
new file mode 120000
index 00000000..836535ba
--- /dev/null
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_convol.h
@@ -0,0 +1 @@
+../../../../signalProcessing/interfaces/int_convol.h
\ No newline at end of file
diff --git a/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 1fdf4cf5..d20b9ca4 100644
--- a/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -724,6 +724,11 @@ PrintStringInfo('d0z2'+ArgSeparator+'d2',ClassFileName,'file','y');
 PrintStringInfo('c0s2'+ArgSeparator+'c2',ClassFileName,'file','y');
 PrintStringInfo('z0d2'+ArgSeparator+'z2',ClassFileName,'file','y');
 
+PrintStringInfo('s0c0'+ArgSeparator+'c0',ClassFileName,'file','y');
+PrintStringInfo('d0z0'+ArgSeparator+'z0',ClassFileName,'file','y');
+PrintStringInfo('c0s0'+ArgSeparator+'c0',ClassFileName,'file','y');
+PrintStringInfo('z0d0'+ArgSeparator+'z0',ClassFileName,'file','y');
+
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'OpDotHat';
 PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'both','y');
@@ -817,6 +822,10 @@ PrintStringInfo('g2g2'+ArgSeparator+'d2',ClassFileName,'file','y');
 
 PrintStringInfo('c2s0'+ArgSeparator+'s2',ClassFileName,'file','y');
 PrintStringInfo('z2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('z0d0'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('c0s0'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('d2z0'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('s2cF0'+ArgSeparator+'s2',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'OpLogEq';
@@ -1212,7 +1221,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
 
 
 // -------------------
-// --- Class Find. ---
+// --- Class FOpFind. ---
 // -------------------
 ClassName = 'Find';
 
@@ -1996,8 +2005,25 @@ PrintStringInfo('d2d2d2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
 PrintStringInfo('c2c2c2'+ArgSeparator+'c2c2',ClassFileName,'file','y');
 PrintStringInfo('z2z2z2'+ArgSeparator+'z2z2',ClassFileName,'file','y');
 
-//NUT non metto tutte le combinazioni ma prima cerco di capire cosa mi offre INRIA
-//NUT come libreria a disposizione.
+PrintStringInfo('s0c0'+ArgSeparator+'c0',ClassFileName,'file','y');
+PrintStringInfo('d0z0'+ArgSeparator+'z0',ClassFileName,'file','y');
+PrintStringInfo('c0s0'+ArgSeparator+'c0',ClassFileName,'file','y');
+PrintStringInfo('z0d0'+ArgSeparator+'z0',ClassFileName,'file','y');
+
+PrintStringInfo('s2c2'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('d2z2'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('c2s2'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('z2d2'+ArgSeparator+'z2',ClassFileName,'file','y');
+
+PrintStringInfo('s0c2'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('d0z2'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('c0s2'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('z0d2'+ArgSeparator+'z2',ClassFileName,'file','y');
+
+PrintStringInfo('s2c0'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('d2z0'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('c2s0'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('z2d0'+ArgSeparator+'z2',ClassFileName,'file','y');
 
 
 // --- Annotation Function And Function List Function. ---