2 files changed, 127 insertions, 3 deletions
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index b2bd775d..c6d1ec7c 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -1528,7 +1528,7 @@ PrintStringInfo(ArgSeparator,ClassFileName,'file','y');
 //NUT anche se metto Return funziona bene comunque! cerca di capire il motivo.
 //NUT limited use to zero in and out args only.
 // --- Annotation Function And Function List Function. ---
-FunctionName = 'return';//
+FunctionName = 'return'; 
 PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'both','y');
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
@@ -1694,7 +1694,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
 
 //NUT det is a little bit complex but for the moment we assume that
 //NUT that det works as trace function.
-FunctionName = 'det'; //
+FunctionName = 'det'; 
 PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'both','y');
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
@@ -2253,7 +2253,7 @@ PrintStringInfo('d2z0'+ArgSeparator+'z0z2',ClassFileName,'file','y');
 
 
 // --- Annotation Function And Function List Function. ---
-FunctionName = 'convol';
+FunctionName = 'convol'; // AS : done except 2 ouputs cases and 3 inputs cases
 PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'both','y');
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
diff --git a/tests/unit_tests/test_double_Convol.sci b/tests/unit_tests/test_double_Convol.sci
new file mode 100644
index 00000000..c872935e
--- /dev/null
+++ b/tests/unit_tests/test_double_Convol.sci
@@ -0,0 +1,124 @@
+function test_double_Convol()
+
+
+ disp(convol(4,4.5)); //d0d0Convold0
+ disp(convol(%i + 3 ,2*%i + 4)); // z0z0Convolz0
+
+
+ a = [1 2 3 4 5 %e %pi];
+ b = [1 7 8 5 1 6 ];
+
+ disp(convol(a,b));
+ disp(convol(b,b)); // d2d2Convold2
+
+
+ disp(convol(4,a)); //d0d2Convold2
+ disp(convol(a,4)); // d2d0Convold2
+
+
+ c = [1 2 3 4 5 %e %pi] * %i;
+ d = [1 7 8 5 1 6 ] * %i;
+
+ disp(convol(c,d));
+ disp(convol(d,d)); // z2z2Convolz2
+
+
+ disp(convol(%i + 3 ,c)); // z0z2Convolz2
+ disp(convol(d ,2*%i + 4)); // z2z0Convolz2
+	
+// with 2 outputs
+
+
+// [zz yy] = convol(4,4.5); //d0d0Convold0d0
+// disp( zz );
+ //disp( yy );
+
+// [xx ww ] = convol(%i + 3 ,2*%i + 4); // z0z0Convolz0z0
+// disp( xx);
+// disp( ww );
+
+// [vv uu]  =convol(a,b);
+// disp( vv); // d2d2Convold2d2
+// disp( uu );
+
+
+// [tt ss] = convol(4,a); //d0d2Convold2d2
+// disp( tt);
+// disp( ss );
+
+
+
+// [rr qq] = convol(a,4); // d2d0Convold2d2
+// disp( rr );
+// disp( qq );
+
+
+
+// with 2 outputs
+
+// [pp oo]  =convol(c,d);
+// disp( pp); // z2z2Convolz2z2
+// disp( oo );
+
+
+// [mm nn] = convol(4,c); //z0z2Convolz2z2
+// disp( mm);
+// disp( nn );
+
+
+
+// [ll kk] = convol(c,4); // z2z0Convolz2z2
+// disp( ll );
+ //disp( kk);
+ 
+
+// three input i
+
+// with 2 outputs
+
+
+ //[zzz yyy] = convol(4,4.5,18); //d0d0d0Convold0d0
+ //disp( zzz );
+ //disp( yyy );
+
+ //[xxx www ] = convol(%i + 3 ,2*%i + 4,%i); // z0z0z0Convolz0z0
+ //disp( xxx);
+ //disp( www );
+
+// bbis = [4 7 9 10];
+
+ //[vvv uuu]  =convol(a,b,bbis);
+// disp( vvv); // d2d2d2Convold2d2
+// disp( uuu );
+//
+
+ //[ttt sss] = convol(4,a, 8); //d0d2d0Convold2d0
+ //disp( ttt);
+ //disp( sss );
+
+// with 2 outputs
+//dbis = [10 13 14] *%i;
+// [ppp ooo]  =convol(c,d, dbis);
+// disp( ppp); // z2z2z2Convolz2z2
+// disp( ooo );
+
+
+// [mmm nnn] = convol(4 * %i ,c , %i); //z0z2z0Convolz2z0
+// disp( mmm);
+// disp( nnn);
+
+//mixed up
+
+// disp(convol(a,c)); //d2z2Convolz2
+// disp(convol(c,a)); // z2d2Convolz2
+// disp(convol(4,c)); //d0z2Convolz2
+// disp(convol(%i + 3 ,a)); // z0d2Convolz2
+
+// disp(convol(a, %i)); //d2z0Convolz2
+// disp(convol(c , 4)); // z2d0Convolz2
+
+
+
+
+
+endfunction