summaryrefslogtreecommitdiff
path: root/src/statisticsFunctions/max
diff options
context:
space:
mode:
Diffstat (limited to 'src/statisticsFunctions/max')
-rw-r--r--src/statisticsFunctions/max/dcolumnmaxa.c4
-rw-r--r--src/statisticsFunctions/max/scolumnmaxa.c4
-rw-r--r--src/statisticsFunctions/max/testDoubleMax.c8
-rw-r--r--src/statisticsFunctions/max/testFloatMax.c8
4 files changed, 12 insertions, 12 deletions
diff --git a/src/statisticsFunctions/max/dcolumnmaxa.c b/src/statisticsFunctions/max/dcolumnmaxa.c
index 7b60f737..ae0bbd47 100644
--- a/src/statisticsFunctions/max/dcolumnmaxa.c
+++ b/src/statisticsFunctions/max/dcolumnmaxa.c
@@ -16,9 +16,9 @@ void dcolumnmaxa(double *in, int rows, int columns, double* out) {
int i = 0, j = 0;
for (i = 0; i < rows; i++) {
- out[i]=in[i*columns];
+ out[i]=in[i];
for (j=0;j<columns;j++)
- if (in[i*columns+j]>out[i]) out[i] = in[i*columns+j];
+ if (in[i+j*rows]>out[i]) out[i] = in[i+j*rows];
}
}
diff --git a/src/statisticsFunctions/max/scolumnmaxa.c b/src/statisticsFunctions/max/scolumnmaxa.c
index 9b8b7326..71af8460 100644
--- a/src/statisticsFunctions/max/scolumnmaxa.c
+++ b/src/statisticsFunctions/max/scolumnmaxa.c
@@ -16,9 +16,9 @@ void scolumnmaxa(float *in, int rows, int columns, float* out) {
int i = 0, j = 0;
for (i = 0; i < rows; i++) {
- out[i]=in[i*columns];
+ out[i]=in[i];
for (j=0;j<columns;j++)
- if (in[i*columns+j]>out[i]) out[i] = in[i*columns+j];
+ if (in[i+j*rows]>out[i]) out[i] = in[i+j*rows];
}
}
diff --git a/src/statisticsFunctions/max/testDoubleMax.c b/src/statisticsFunctions/max/testDoubleMax.c
index b5d41bc5..81c50324 100644
--- a/src/statisticsFunctions/max/testDoubleMax.c
+++ b/src/statisticsFunctions/max/testDoubleMax.c
@@ -56,10 +56,10 @@ static void drowmaxaTest(void){
static void dcolumnmaxaTest(void){
double in[12]={4,5,7,1,2,6,4,1,2,5,4,3};
double out1[1],out2[2],out3[3],out4[4],out6[6],out12[12];
- double result2[2]={7,5};
- double result3[3]={7,6,5};
- double result4[4]={7,6,4,5};
- double result6[6]={5,7,6,4,5,4};
+ double result2[2]={7,6};
+ double result3[3]={5,5,7};
+ double result4[4]={4,6,7,3};
+ double result6[6]={4,5,7,5,4,6};
int i;
diff --git a/src/statisticsFunctions/max/testFloatMax.c b/src/statisticsFunctions/max/testFloatMax.c
index 5725b52d..7741aef4 100644
--- a/src/statisticsFunctions/max/testFloatMax.c
+++ b/src/statisticsFunctions/max/testFloatMax.c
@@ -55,10 +55,10 @@ static void srowmaxaTest(void){
static void scolumnmaxaTest(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]={7,5};
- float result3[3]={7,6,5};
- float result4[4]={7,6,4,5};
- float result6[6]={5,7,6,4,5,4};
+ float result2[2]={7,6};
+ float result3[3]={5,5,7};
+ float result4[4]={4,6,7,3};
+ float result6[6]={4,5,7,5,4,6};
int i;