New function and rpi issues resolved

10 files changed, 77 insertions, 1 deletions

diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_AMELL.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_AMELL.sci
new file mode 100644
index 00000000..6cf27b0d
--- /dev/null
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_AMELL.sci
@@ -0,0 +1,9 @@
+function outp=FA_SZ_AMELL(in1sz)
+	in1sz=string(in1sz);
+	insz=eval(in1sz);
+	if(insz>1) then
+		outp=string(insz);
+	else
+		outp="1";
+	end
+endfunction
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci
index 50b897e0..527217a5 100644
--- a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci
@@ -27,7 +27,7 @@ function outsize = FA_SZ_ROW_COLUMN_CAT(inval,in1size,in2size)
 // ------------------------------

 // --- Check input arguments. ---

 // ------------------------------

-SCI2CNInArgCheck(argn(1),3,3);

+SCI2CNInArgCheck(argn(2),3,3);

 

 

 in1size = string(in1size);

diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib
index fe171a59..62d9138a 100644
--- a/2.3-1/macros/FunctionAnnotation/lib
+++ b/2.3-1/macros/FunctionAnnotation/lib
diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names
index 1d83afa1..097ba5cc 100644
--- a/2.3-1/macros/FunctionAnnotation/names
+++ b/2.3-1/macros/FunctionAnnotation/names
@@ -15,6 +15,7 @@ FA_SCHUR_TP
 FA_SUB
 FA_SZ_1
 FA_SZ_2
+FA_SZ_AMELL
 FA_SZ_COLUMN_DIAG
 FA_SZ_COL_DIAG_IN_EX
 FA_SZ_DEC2BASE
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 52bc10c2..c874416e 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -8200,6 +8200,64 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

 

+

+

+//------------------------------------

+//---- Class ELL1MAG --------------------

+//------------------------------------

+ClassName = 'ell1mag';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+PrintStringInfo('NIN=         3',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(3).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(3).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y');

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0d0z2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('d0d0d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'ell1mag'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+//------------------------------------

+//---- Class AMELL --------------------

+//------------------------------------

+ClassName = 'amell';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+PrintStringInfo('NIN=         2',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= FA_SZ_AMELL(IN(1).SZ(2))',ClassFileName,'file','y');

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'amell'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+

+

+

+

 // ////////////////////////////////////////////

 // /////PARTE INTRODOTTA DA ALBERTO MOREA

 // /////////////////////////////////////////////

diff --git a/2.3-1/macros/ToolInitialization/lib b/2.3-1/macros/ToolInitialization/lib
index 8fc6062d..dd481d10 100644
--- a/2.3-1/macros/ToolInitialization/lib
+++ b/2.3-1/macros/ToolInitialization/lib
diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index 872e24cd..d144f896 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -166,6 +166,8 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/signalProcessing/includes/filt_sinc.h"
       "src/c/signalProcessing/includes/ffilt.h"
       "src/c/signalProcessing/includes/modsn.h"
+      "src/c/signalProcessing/includes/ell1mag.h"
+      "src/c/signalProcessing/includes/amell.h"
       "src/c/implicitList/dynlib_implicitlist.h"
       "src/c/implicitList/implicitList.h"
       "src/c/differential_calculus/includes/ode.h"
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci
index 3befda80..86f1bf56 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/macros/findDeps/getAllInterfaces.sci
@@ -164,6 +164,8 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/signalProcessing/interfaces/int_filt_sinc.h"
       "src/c/signalProcessing/interfaces/int_ffilt.h"
       "src/c/signalProcessing/interfaces/int_modsn.h"
+      "src/c/signalProcessing/interfaces/int_ell1mag.h"
+      "src/c/signalProcessing/interfaces/int_amell.h"
       "src/c/implicitList/int_OpColon.h"
       "src/c/differential_calculus/interfaces/int_ode.h"
       "src/c/differential_calculus/interfaces/int_diffc.h"
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index 90dc0143..c8fa7ae6 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -1047,6 +1047,10 @@ function allSources = getAllSources(SharedInfo)
       "src/c/signalProcessing/%sn/zmodsns.c"
       "src/c/signalProcessing/%sn/dmodsna.c"
       "src/c/signalProcessing/%sn/zmodsna.c"
+      "src/c/signalProcessing/ell1mag/zell1maga.c"
+      "src/c/signalProcessing/ell1mag/dell1maga.c"
+      "src/c/signalProcessing/amell/damells.c"
+      "src/c/signalProcessing/amell/damella.c"
       "src/c/implicitList/zimplicitLists.c"
       "src/c/implicitList/dimplicitLists.c"
       "src/c/implicitList/cimplicitLists.c"
diff --git a/2.3-1/macros/findDeps/lib b/2.3-1/macros/findDeps/lib
index 4f7fa99b..12d73687 100644
--- a/2.3-1/macros/findDeps/lib
+++ b/2.3-1/macros/findDeps/lib