Support added for diff, norm functions

15 files changed, 178 insertions, 2 deletions

diff --git a/macros/ASTManagement/AST_ExtractNameAndScope.bin b/macros/ASTManagement/AST_ExtractNameAndScope.bin
index cd93132b..260f69a5 100644
--- a/macros/ASTManagement/AST_ExtractNameAndScope.bin
+++ b/macros/ASTManagement/AST_ExtractNameAndScope.bin
diff --git a/macros/ASTManagement/AST_ExtractNameAndScope.sci b/macros/ASTManagement/AST_ExtractNameAndScope.sci
index 53830cfc..fe5dc05a 100644
--- a/macros/ASTManagement/AST_ExtractNameAndScope.sci
+++ b/macros/ASTManagement/AST_ExtractNameAndScope.sci
@@ -57,6 +57,7 @@ taglength(cnttag) = length(tagname(cnttag));
 
 fieldlength  = length(ASTField);
 
+
 //NUT: il seguente codice e' poco elegante.
 if (SCI2Cstrncmps1size(tagname(1),ASTField))
    // Here we can have:
@@ -65,24 +66,36 @@ if (SCI2Cstrncmps1size(tagname(1),ASTField))
    // Number_d: it means double real type.
    // Number_c: it means float complex type.
    // Number_z: it means double complex type.
-   ArgName = stripblanks(part(ASTField,taglength(1)+3:fieldlength));
-   ArgScope = stripblanks(part(ASTField,1:taglength(1)+1));
+  
+   // If ArgName is i, make it string
+   if(mtlb_strcmp(ASTField,"Number_x: i") == %T)
+      ArgName = stripblanks(part(ASTField,taglength(1)+3:fieldlength));
+      ArgScope = 'String';
+   else   
+      ArgName = stripblanks(part(ASTField,taglength(1)+3:fieldlength));
+      ArgScope = stripblanks(part(ASTField,1:taglength(1)+1));
+   end
 elseif (SCI2Cstrncmps1size(tagname(2),ASTField))
    ArgName = stripblanks(part(ASTField,taglength(2)+1:fieldlength));
    ArgName = part(ArgName,2:length(ArgName)-1); // I remove also the first and the last " 
    ArgScope = 'String';
+  
 elseif (SCI2Cstrncmps1size(tagname(3),ASTField))
    ArgName  = stripblanks(part(ASTField,taglength(3)+1:fieldlength));
    ArgScope = 'Variable';
+   
 elseif (SCI2Cstrncmps1size(tagname(4),ASTField))
    ArgName  = stripblanks(part(ASTField,taglength(4)+1:fieldlength));
    ArgScope = 'Global';
+   
 elseif (SCI2Cstrncmps1size(tagname(5),ASTField))
    ArgName  = stripblanks(part(ASTField,taglength(5)+1:fieldlength));
    ArgScope = 'Local';
+   
 elseif (SCI2Cstrncmps1size(tagname(6),ASTField))
    ArgName  = stripblanks(part(ASTField,taglength(6)+1:fieldlength));
    ArgScope = 'Temp';
+   
 elseif (SCI2Cstrncmps1size(tagname(7),ASTField))
    ArgName  = '<empty>';
    ArgScope = 'None';
diff --git a/macros/ASTManagement/AST_HandleEndGenFun.sci b/macros/ASTManagement/AST_HandleEndGenFun.sci
index 0bc12992..eb1d1f42 100644
--- a/macros/ASTManagement/AST_HandleEndGenFun.sci
+++ b/macros/ASTManagement/AST_HandleEndGenFun.sci
@@ -1,3 +1,4 @@
+
 function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,ASTFunType)
 // function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,ASTFunType)
 // -----------------------------------------------------------------
diff --git a/macros/FunctionAnnotation/FA_SZ_DIFF.bin b/macros/FunctionAnnotation/FA_SZ_DIFF.bin
new file mode 100644
index 00000000..5f169e6f
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_DIFF.bin
diff --git a/macros/FunctionAnnotation/FA_SZ_DIFF.sci b/macros/FunctionAnnotation/FA_SZ_DIFF.sci
new file mode 100644
index 00000000..df183100
--- /dev/null
+++ b/macros/FunctionAnnotation/FA_SZ_DIFF.sci
@@ -0,0 +1,39 @@
+// Copyright (C) 2016 - IIT Bombay - FOSSEE
+//
+// 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
+// Author: Siddhesh Wani
+// Organization: FOSSEE, IIT Bombay
+// Email: toolbox@scilab.in
+
+//This fucntion calulates size of output depending upon input
+function outsize = FA_SZ_DIFF(in1size, in2val, in3val)
+	in1size = string(in1size);
+	in1row = eval(in1size(1));
+	in1col = eval(in1size(2));
+	in2val = string(in2val);
+	in2num = eval(in2val);
+	in3num = eval(in3val);
+
+if(in3num == 0)
+	if((in1row == 1) & (in1col <> 1))  //input is row vector
+		outsize(1) = '1';
+		outsize(2) = string (in1col - in2num);
+	elseif((in1col == 1) & (in1row <> 1)) //input is column vector
+		outsize(1) = string(in1row - in2num);
+		outsize(2) = '1';
+	else // input is matrix. output is a column matrix
+		outsize(1) = string((in1row * in1col)- in2num);
+		outsize(2) = '1';
+	end
+elseif (in3num == 1) //Difference along rows
+	outsize(1) = string(in1row - in2num);
+	outsize(2) = string(in1col);
+elseif (in3num == 2) //Difference along columns
+	outsize(1) = string(in1row);
+	outsize(2) = string(in1col - in2num);
+end
+endfunction
\ No newline at end of file
diff --git a/macros/FunctionAnnotation/lib b/macros/FunctionAnnotation/lib
index 81fa5d45..b8b2d41c 100644
--- a/macros/FunctionAnnotation/lib
+++ b/macros/FunctionAnnotation/lib
diff --git a/macros/FunctionAnnotation/names b/macros/FunctionAnnotation/names
index 5658291f..3db59cc6 100644
--- a/macros/FunctionAnnotation/names
+++ b/macros/FunctionAnnotation/names
@@ -14,6 +14,7 @@ FA_SZ_1
 FA_SZ_2
 FA_SZ_COLUMN_DIAG
 FA_SZ_COL_DIAG_IN_EX
+FA_SZ_DIFF
 FA_SZ_FROM_VAL
 FA_SZ_LINSPACE_ROW
 FA_SZ_OPAPEX
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin
index 8a5a3264..4cc5184f 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin
+++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 6507e615..c67e9662 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -873,6 +873,11 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

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

 

+FunctionName = 'acot'; // BJ : Done AS : Float_Done

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

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

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

+

 FunctionName = 'sqrt'; // BJ : Done AS : Float_Done

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

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

@@ -5153,6 +5158,114 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
 //INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

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

 

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

+//---- Class DIFF -----------------

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

+ClassName = 'DIFF';

+

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

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

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

+

+//Arguements specified: initial value, start time, time vector, ode function

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

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

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

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

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

+

+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)= FA_SZ_1(FA_SZ_DIFF(IN(1).SZ,IN(2).VAL,''0''))',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_DIFF(IN(1).SZ,IN(2).VAL,''0''))',ClassFileName,'file','y');

+

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

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

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

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

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

+

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

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

+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');

+PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');

+PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y');

+

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

+PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y');

+PrintStringInfo('s2d0'+ArgSeparator+'s2',ClassFileName,'file','y');

+PrintStringInfo('u82u80'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('u82d0'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('i82u80'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('i82d0'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('u162u160'+ArgSeparator+'u162',ClassFileName,'file','y');

+PrintStringInfo('u162d0'+ArgSeparator+'u162',ClassFileName,'file','y');

+PrintStringInfo('i162u160'+ArgSeparator+'i162',ClassFileName,'file','y');

+PrintStringInfo('i162d0'+ArgSeparator+'i162',ClassFileName,'file','y');

+

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

+PrintStringInfo('s2d0d0'+ArgSeparator+'s2',ClassFileName,'file','y');

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

+PrintStringInfo('u82d0d0'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('u82u80d0'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('i82d0d0'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('i82u80d0'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('u162d0d0'+ArgSeparator+'u162',ClassFileName,'file','y');

+PrintStringInfo('u162u160d0'+ArgSeparator+'u162',ClassFileName,'file','y');

+PrintStringInfo('i162d0d0'+ArgSeparator+'i162',ClassFileName,'file','y');

+PrintStringInfo('i162u160d0'+ArgSeparator+'i162',ClassFileName,'file','y');

+

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

+FunctionName = 'diff'; 

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

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

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

+

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

+//---- Class NORM --------------------

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

+ClassName = 'NORM';

+

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

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

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

+

+//Arguements specified: initial value, start time, time vector, ode function

+PrintStringInfo('NIN=         1',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)= ''1''',ClassFileName,'file','y');

+

+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)= ''1''',ClassFileName,'file','y');

+

+

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

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

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

+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+PrintStringInfo('s2'+ArgSeparator+'s0',ClassFileName,'file','y');

+

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

+PrintStringInfo('s2s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+PrintStringInfo('s2d0'+ArgSeparator+'s0',ClassFileName,'file','y');

+

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

+PrintStringInfo('s2g2'+ArgSeparator+'s0',ClassFileName,'file','y');

+

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

+FunctionName = 'norm'; 

+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/macros/findDeps/getAllHeaders.bin b/macros/findDeps/getAllHeaders.bin
index 34ef825a..2d5581b9 100644
--- a/macros/findDeps/getAllHeaders.bin
+++ b/macros/findDeps/getAllHeaders.bin
diff --git a/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci
index b5ab4910..3fa1d4ee 100644
--- a/macros/findDeps/getAllHeaders.sci
+++ b/macros/findDeps/getAllHeaders.sci
@@ -70,6 +70,7 @@ function allHeaders = getAllHeaders(Target)
       "src/c/matrixOperations/includes/tril.h"
       "src/c/matrixOperations/includes/kron.h"
       "src/c/matrixOperations/includes/flipdim.h"
+      "src/c/matrixOperations/includes/norm.h"
       "src/c/elementaryFunctions/includes/cos.h"
       "src/c/elementaryFunctions/includes/fix.h"
       "src/c/elementaryFunctions/includes/exp.h"
@@ -143,6 +144,7 @@ function allHeaders = getAllHeaders(Target)
       "src/c/implicitList/dynlib_implicitlist.h"
       "src/c/implicitList/implicitList.h"
       "src/c/differential_calculus/includes/ode.h"
+      "src/c/differential_calculus/includes/diffc.h"
       "src/c/Files/includes/files.h"];
 
   //Header files required for "Arduino" output
diff --git a/macros/findDeps/getAllInterfaces.bin b/macros/findDeps/getAllInterfaces.bin
index d641e330..66ca5ee0 100644
--- a/macros/findDeps/getAllInterfaces.bin
+++ b/macros/findDeps/getAllInterfaces.bin
diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci
index d1da472f..37d43017 100644
--- a/macros/findDeps/getAllInterfaces.sci
+++ b/macros/findDeps/getAllInterfaces.sci
@@ -59,6 +59,7 @@ function allInterfaces = getAllInterfaces(Target)
       "src/c/matrixOperations/interfaces/int_kron.h"
       "src/c/matrixOperations/interfaces/int_flipdim.h"
       "src/c/matrixOperations/interfaces/int_permute.h"
+      "src/c/matrixOperations/interfaces/int_norm.h"
       "src/c/elementaryFunctions/interfaces/int_asinh.h"
       "src/c/elementaryFunctions/interfaces/int_atanh.h"
       "src/c/elementaryFunctions/interfaces/int_sinh.h"
@@ -138,6 +139,7 @@ function allInterfaces = getAllInterfaces(Target)
       "src/c/signalProcessing/interfaces/int_lev.h"
       "src/c/implicitList/int_OpColon.h"
       "src/c/differential_calculus/interfaces/int_ode.h"
+      "src/c/differential_calculus/interfaces/int_diffc.h"
       "src/c/Files/interfaces/int_files.h"];
 
   //Interface files required for "Arduino" output
diff --git a/macros/findDeps/getAllSources.bin b/macros/findDeps/getAllSources.bin
index 9dfae6f9..89de1afb 100644
--- a/macros/findDeps/getAllSources.bin
+++ b/macros/findDeps/getAllSources.bin
diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci
index 726d5ec7..4ef2f165 100644
--- a/macros/findDeps/getAllSources.sci
+++ b/macros/findDeps/getAllSources.sci
@@ -330,6 +330,8 @@ function allSources = getAllSources(Target)
       "src/c/matrixOperations/tril/i16trila.c"
       "src/c/matrixOperations/kron/dkrona.c"
       "src/c/matrixOperations/kron/skrona.c"
+      "src/c/matrixOperations/norm/dnormv.c"
+      "src/c/matrixOperations/norm/dnorma.c"
       "src/c/elementaryFunctions/cos/dcosa.c"
       "src/c/elementaryFunctions/cos/dcoss.c"
       "src/c/elementaryFunctions/cos/scosa.c"
@@ -956,6 +958,9 @@ function allSources = getAllSources(Target)
       "src/c/implicitList/simplicitLists.c"
       "src/c/differential_calculus/ode/dodes.c"
       "src/c/differential_calculus/ode/dodea.c"
+      "src/c/differential_calculus/diff/ddiffca.c"
+      "src/c/differential_calculus/diff/sdiffca.c"
+      "src/c/differential_calculus/diff/u8diffca.c"
       "src/c/Files/mopen/mopen.c"
       "src/c/Files/mclose/mclose.c"
       "src/c/Files/mput/dmputs.c"