From b0df4c8bb591d5df8a2401b15ea36c6402161c53 Mon Sep 17 00:00:00 2001
From: Abhinav Dronamraju
Date: Thu, 20 Jul 2017 21:38:57 +0530
Subject: Pmodulo and nanmax started

---
 .../ToolInitialization/INIT_FillSCI2LibCDirs.sci   | 66 ++++++++++++++++++++++
 2.3-1/macros/findDeps/getAllHeaders.sci            |  2 +
 2.3-1/macros/findDeps/getAllInterfaces.sci         |  2 +
 2.3-1/macros/findDeps/getAllSources.sci            | 26 +++++++--
 4 files changed, 90 insertions(+), 6 deletions(-)

(limited to '2.3-1/macros')

diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index aacc909a..2c5740cc 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -982,6 +982,70 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
 
+
+// -------------------
+// --- Class Pmodulo. ---
+// -------------------
+ClassName = 'Pmodulo';
+
+// --- 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');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP=   IN(1).TP',ClassFileName,'file','y'); 
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+//---Function list class. ----
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('d2d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('s0s0'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('s2s2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('i160i160'+ArgSeparator+'i160',ClassFileName,'file','y');
+PrintStringInfo('i162i162'+ArgSeparator+'i162',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'pmodulo';
+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+// -------------------
+// --- Class Nanmax. ---
+// -------------------
+ClassName = 'Nanmax';
+
+// --- Class Annotation. ---
+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+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)= FA_SZ_SEL1(IN(1).SZ(1),IN(2).VAL)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName,'file','y');
+//---Function list class. ----
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('d2g2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('s2'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('s2g2'+ArgSeparator+'s2',ClassFileName,'file','y');
+
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'nanmax';
+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
 // -------------------
 // --- Class Issquare. ---
 // -------------------
@@ -1139,6 +1203,8 @@ PrintStringInfo('g2'+ArgSeparator+'g0',ClassFileName,'file','y');
 PrintStringInfo('g0'+ArgSeparator+'g0',ClassFileName,'file','y');
 PrintStringInfo('z2'+ArgSeparator+'g0',ClassFileName,'file','y');
 PrintStringInfo('z0'+ArgSeparator+'g0',ClassFileName,'file','y');
+PrintStringInfo('u162'+ArgSeparator+'g0',ClassFileName,'file','y');
+PrintStringInfo('u160'+ArgSeparator+'g0',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'ismatrix';
diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index 6f9a272e..82f07fd2 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -132,6 +132,8 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/elementaryFunctions/includes/asech.h"
       "src/c/elementaryFunctions/includes/isrow.h"
       "src/c/elementaryFunctions/includes/nthroot.h"
+      "src/c/elementaryFunctions/includes/pmodulo.h"
+      "src/c/elementaryFunctions/includes/nanmax.h"
       "src/c/elementaryFunctions/includes/issquare.h"
       "src/c/elementaryFunctions/includes/isscalar.h"
       "src/c/elementaryFunctions/includes/isvector.h"
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci
index b826bb03..8bc347dd 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/macros/findDeps/getAllInterfaces.sci
@@ -103,6 +103,8 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/elementaryFunctions/interfaces/int_linspace.h"
       "src/c/elementaryFunctions/interfaces/int_isrow.h" 
       "src/c/elementaryFunctions/interfaces/int_nthroot.h"
+      "src/c/elementaryFunctions/interfaces/int_pmodulo.h"
+      "src/c/elementaryFunctions/interfaces/int_nanmax.h"
       "src/c/elementaryFunctions/interfaces/int_issquare.h"
       "src/c/elementaryFunctions/interfaces/int_isscalar.h"
       "src/c/elementaryFunctions/interfaces/int_isvector.h"
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index 79bfd2bd..bdd6400b 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -804,6 +804,18 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/elementaryFunctions/nthroot/snthroota.c"
       "src/c/elementaryFunctions/nthroot/snthroot1a.c"
       "src/c/elementaryFunctions/nthroot/snthroots.c"
+      "src/c/elementaryFunctions/pmodulo/dpmodulos.c"
+      "src/c/elementaryFunctions/pmodulo/dpmoduloa.c"
+      "src/c/elementaryFunctions/pmodulo/spmodulos.c"
+      "src/c/elementaryFunctions/pmodulo/spmoduloa.c"
+      "src/c/elementaryFunctions/pmodulo/i16pmodulos.c"
+      "src/c/elementaryFunctions/pmodulo/i16pmoduloa.c"
+"src/c/elementaryFunctions/nanmax/dnanmaxa.c"
+"src/c/elementaryFunctions/nanmax/dnanmaxcola.c"
+"src/c/elementaryFunctions/nanmax/dnanmaxrowa.c"
+"src/c/elementaryFunctions/nanmax/snanmaxa.c"
+"src/c/elementaryFunctions/nanmax/snanmaxcola.c"
+"src/c/elementaryFunctions/nanmax/snanmaxrowa.c"
       "src/c/elementaryFunctions/isscalar/disscalara.c"
       "src/c/elementaryFunctions/isscalar/disscalars.c"
       "src/c/elementaryFunctions/isscalar/gisscalars.c"
@@ -832,12 +844,14 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/elementaryFunctions/isvector/zisvectors.c"
       "src/c/elementaryFunctions/ismatrix/dismatrixa.c"
       "src/c/elementaryFunctions/ismatrix/dismatrixs.c"
-      //"src/c/elementaryFunctions/ismatrix/gismatrixs.c"
-      //"src/c/elementaryFunctions/ismatrix/gismatrixa.c"
-      //"src/c/elementaryFunctions/ismatrix/sismatrixs.c" 
-      //"src/c/elementaryFunctions/ismatrix/sismatrixa.c"
-      //"src/c/elementaryFunctions/ismatrix/zismatrixa.c"
-      //"src/c/elementaryFunctions/ismatrix/zismatrixs.c"  
+      "src/c/elementaryFunctions/ismatrix/gismatrixs.c"
+      "src/c/elementaryFunctions/ismatrix/gismatrixa.c"
+      "src/c/elementaryFunctions/ismatrix/sismatrixs.c" 
+      "src/c/elementaryFunctions/ismatrix/sismatrixa.c"
+      "src/c/elementaryFunctions/ismatrix/zismatrixa.c"
+      "src/c/elementaryFunctions/ismatrix/zismatrixs.c"  
+      "src/c/elementaryFunctions/ismatrix/u16ismatrixa.c"
+      "src/c/elementaryFunctions/ismatrix/u16ismatrixs.c" 
       "src/c/elementaryFunctions/acscd/dacscda.c"
       "src/c/elementaryFunctions/acscd/dacscds.c"
       "src/c/elementaryFunctions/acscd/sacscda.c"
-- 
cgit