summaryrefslogtreecommitdiff
path: root/src/statisticsFunctions/min
diff options
context:
space:
mode:
Diffstat (limited to 'src/statisticsFunctions/min')
-rw-r--r--src/statisticsFunctions/min/dcolumnmina.c4
-rw-r--r--src/statisticsFunctions/min/scolumnmina.c4
-rw-r--r--src/statisticsFunctions/min/testDoubleMin.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/statisticsFunctions/min/dcolumnmina.c b/src/statisticsFunctions/min/dcolumnmina.c
index 4ccbf39a..e12cb8ff 100644
--- a/src/statisticsFunctions/min/dcolumnmina.c
+++ b/src/statisticsFunctions/min/dcolumnmina.c
@@ -16,9 +16,9 @@ void dcolumnmina(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/min/scolumnmina.c b/src/statisticsFunctions/min/scolumnmina.c
index 2f3d6289..79fac41a 100644
--- a/src/statisticsFunctions/min/scolumnmina.c
+++ b/src/statisticsFunctions/min/scolumnmina.c
@@ -16,9 +16,9 @@ void scolumnmina(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/min/testDoubleMin.c b/src/statisticsFunctions/min/testDoubleMin.c
index 4f81342e..41522164 100644
--- a/src/statisticsFunctions/min/testDoubleMin.c
+++ b/src/statisticsFunctions/min/testDoubleMin.c
@@ -56,9 +56,9 @@ static void drowminaTest(void){
static void dcolumnminaTest(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]={1,1};
+ double result2[2]={2,1};
double result3[3]={1,1,2};
- double result4[4]={4,1,1,3};
+ double result4[4]={2,5,4,1};
double result6[6]={4,1,2,1,2,3};
int i;