summaryrefslogtreecommitdiff
path: root/src/auxiliaryFunctions/interfaces/int_min.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/auxiliaryFunctions/interfaces/int_min.h')
-rw-r--r--src/auxiliaryFunctions/interfaces/int_min.h33
1 files changed, 30 insertions, 3 deletions
diff --git a/src/auxiliaryFunctions/interfaces/int_min.h b/src/auxiliaryFunctions/interfaces/int_min.h
index d7c59c0c..d7bd5669 100644
--- a/src/auxiliaryFunctions/interfaces/int_min.h
+++ b/src/auxiliaryFunctions/interfaces/int_min.h
@@ -1,6 +1,6 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET
+ * Copyright (C) 2008-2008 - INRIA - Arnaud Torset
*
* This file must be used under the terms of the CeCILL.
* This source file is licensed as described in the file COPYING, which
@@ -15,12 +15,39 @@
#ifndef __INT_MIN_H__
#define __INT_MIN_H__
+#define s0mins0(in) in
+
+#define d0mind0(in) in
+
+#define s2mins0(in,size) smina(in,size[0]*size[1]);
+
+#define d2mind0(in,size) dmina(in,size[0]*size[1]);
+
+
+
#define s0s0mins0(in1,in2) min(in1,in2)
#define d0d0mind0(in1,in2) min(in1,in2)
-#define s2s2mins2(in,size,out) mina(in1, size[0]*size[1], in2, size[0]*size[1], out)
+#define s2s2mins2(in1,size1,in2,size2,out) mina(in1, size1[0]*size1[1], in2, size2[0]*size2[1], out)
+
+#define d2d2mind2(in1,size1,in2,size2,out) mina(in1, size1[0]*size1[1], in2, size2[0]*size2[1], out)
+
-#define d2d2mind2(in,size,out) mina(in1, size[0]*size[1], in2, size[0]*size[1], out)
+#define s2s0mins2(in1,size,in2,out) {int i;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=min(in1[i],in2);\
+ }
+#define d2d0mind2(in1,size,in2,out) {int i;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=min(in1[i],in2);\
+ }
+
+#define s0s2mins2(in1,in2,size,out) {int i;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=min(in1,in2[i]);\
+ }
+
+#define d0d2mind2(in1,in2,size,out) {int i;\
+ for (i=0;i<size[0]*size[1];i++) out[i]=min(in1,in2[i]);\
+ }
+
#endif /* !__INT_MIN_H__ */