add max function for arrays

4 files changed, 28 insertions, 35 deletions

diff --git a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
index 3f3822ea..7379e218 100644
--- a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
+++ b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
@@ -2,28 +2,20 @@
 
 function mainfunction()

 
-//test OpApex(transpose&conj) & OpDotApex(transpose)
+//test max && min
 
 //reals
 
-disp(3')
+disp(max(3,-2))
 
-disp(3.')
+disp(min(3,-2))
 
-a=[4 2 4 8;3 4 5 1;1 4 5 6; 7 4 5 3]
+a=[4 -2 4 8;-3 4 5 -1;1 -4 5 6; -7 -4 5 3]
+b=[2 7 1 4; 3 -5 4 8; 2 -6 9 7; 1 -2 3 -4]
 
-disp(a')
-disp(a.')
+disp(max(a,b))
 
-//complexes
+disp(min(a,b))
 
-disp((3+%i)')
-
-disp((3+%i).')
-
-b=2.5*a+a*%i;
-
-disp(b')
-disp(b.')
 
 endfunction
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
index 72881952..a5151ea7 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
@@ -6,14 +6,8 @@
 #include "constant.h"

 #include "notFound.h"

 #include "doubleComplex.h"

-#include "min.h"

-#include "max.h"

 #include "floatComplex.h"

 #include "RealToComplex.h"

-#include "ones.h"

-#include "zeros.h"

-#include "OpApex.h"

-#include "OpColon.h"

 #include "OpDotHat.h"

 #include "OpEqual.h"

 #include "OpIns.h"

@@ -26,12 +20,8 @@
 #include "OpLogEq.h"

 #include "OpLogOr.h"

 #include "OpLogAnd.h"

-#include "ConvertPrecision.h"

-#include "abs.h"

-#include "int_abs.h"

-#include "log10.h"

-#include "int_log10.h"

-#include "pythag.h"
+#include "ConvertPrecision.h"
+
 
 /* LIB */
 /* interfacing lapack */
@@ -41,16 +31,21 @@
 
 /* AUXILIARY FUNCTIONS */
 
+/* interfacing abs */
+#include "abs.h"
+#include "int_abs.h"
+/* interfacing conj */
+#include "conj.h"
+#include "int_conj.h"
+/* interfacing disp */
+#include "disp.h"
+#include "int_disp.h"
 /* interfacing find */
 #include "find.h"
 #include "find2d.h"
 #include "int_find.h"
-/* interfacing disp */
-#include "disp.h"
-#include "int_disp.h"
-/* interfacing conj */
-#include "conj.h"
-#include "int_conj.h"
+/* interfacing frexp */
+#include "frexp.h"
 /* interfacing isempty */
 #include "isempty.h"
 #include "int_isempty.h"
@@ -60,10 +55,14 @@
 /* interfacing length */

 #include "length.h"

 #include "int_length.h"
+/* interfacing max */

+#include "max.h"

+#include "int_max.h"
+/* interfacing min */

+#include "min.h"

+#include "int_min.h"
 /* interfacing pythag */
 #include "pythag.h"
-/* interfacing frexp */
-#include "frexp.h"
 /* interfacing sign */
 #include "sign.h"
 #include "int_sign.h"
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_max.h b/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_max.h
new file mode 120000
index 00000000..42598690
--- /dev/null
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_max.h
@@ -0,0 +1 @@
+../../../../auxiliaryFunctions/interfaces/int_max.h
\ No newline at end of file
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_min.h b/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_min.h
new file mode 120000
index 00000000..0ac089e9
--- /dev/null
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_min.h
@@ -0,0 +1 @@
+../../../../auxiliaryFunctions/interfaces/int_min.h
\ No newline at end of file