summaryrefslogtreecommitdiff
path: root/src/statisticsFunctions
diff options
context:
space:
mode:
Diffstat (limited to 'src/statisticsFunctions')
-rw-r--r--src/statisticsFunctions/interfaces/int_statMax.h37
-rw-r--r--src/statisticsFunctions/interfaces/int_statMin.h37
-rw-r--r--src/statisticsFunctions/min/testFloatMin.c4
3 files changed, 2 insertions, 76 deletions
diff --git a/src/statisticsFunctions/interfaces/int_statMax.h b/src/statisticsFunctions/interfaces/int_statMax.h
deleted file mode 100644
index 8605911e..00000000
--- a/src/statisticsFunctions/interfaces/int_statMax.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET
- *
- * 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
- *
- */
-
-/* THIS IS AN AUTOMATICALLY GENERATED FILE : DO NOT EDIT BY HAND. */
-
-#ifndef __INT_STATMAX_H__
-#define __INT_STATMAX_H__
-
-#define s0maxs0(in) smaxs(in)
-
-#define d0maxd0(in) dmaxs(in)
-
-#define s2maxs0(in,size) smaxa(in, size[0]*size[1])
-
-#define d2maxd0(in,size) dmaxa(in, size[0]*size[1])
-
-
-
-#define s0s0maxs0(in1,in2) smaxs(in1)
-
-#define d0d0maxd0(in1,in2) dmaxs(in1)
-
-#define s2s0maxs2(in1,size,in2,out) (in2==2) ? scolumnmaxa(in1, size[0], size[1], out) : srowmaxa(in1, size[0], size[1], out)
-
-#define d2d0maxd2(in1,size,in2,out) (in2==2) ? dcolumnmaxa(in1, size[0], size[1], out) : drowmaxa(in1, size[0], size[1], out)
-
-
-#endif /* !__INT_STATMAX_H__ */
diff --git a/src/statisticsFunctions/interfaces/int_statMin.h b/src/statisticsFunctions/interfaces/int_statMin.h
deleted file mode 100644
index 3a8e97d8..00000000
--- a/src/statisticsFunctions/interfaces/int_statMin.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET
- *
- * 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
- *
- */
-
-/* THIS IS AN AUTOMATICALLY GENERATED FILE : DO NOT EDIT BY HAND. */
-
-#ifndef __INT_STATMIN_H__
-#define __INT_STATMIN_H__
-
-#define s0mins0(in) smins(in)
-
-#define d0mind0(in) dmins(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) smins(in1)
-
-#define d0d0mind0(in1,in2) dmins(in1)
-
-#define s2s0mins2(in1,size,in2,out) (in2==2) ? scolumnmina(in1, size[0], size[1], out) : srowmina(in1, size[0], size[1], out)
-
-#define d2d0mind2(in1,size,in2,out) (in2==2) ? dcolumnmina(in1, size[0], size[1], out) : drowmina(in1, size[0], size[1], out)
-
-
-#endif /* !__INT_STATMIN_H__ */
diff --git a/src/statisticsFunctions/min/testFloatMin.c b/src/statisticsFunctions/min/testFloatMin.c
index 28540d64..70022a6d 100644
--- a/src/statisticsFunctions/min/testFloatMin.c
+++ b/src/statisticsFunctions/min/testFloatMin.c
@@ -55,9 +55,9 @@ static void srowminaTest(void){
static void scolumnminaTest(void){
float in[12]={4,5,7,1,2,6,4,1,2,5,4,3};
float out1[1],out2[2],out3[3],out4[4],out6[6],out12[12];
- float result2[2]={1,1};
+ float result2[2]={2,1};
float result3[3]={1,1,2};
- float result4[4]={4,1,1,3};
+ float result4[4]={2,5,4,1};
float result6[6]={4,1,2,1,2,3};
int i;