summaryrefslogtreecommitdiff
path: root/2.3-1/src/c/statisticsFunctions/max/dcolumnmaxa.c
diff options
context:
space:
mode:
authorsiddhu89902015-11-28 02:14:11 +0530
committersiddhu89902015-11-28 02:14:11 +0530
commitfd8c4f9bc0763e85c16a59c7639803fd09663281 (patch)
treec3edb6c759627babbde74657e678c3bd1b96e8ed /2.3-1/src/c/statisticsFunctions/max/dcolumnmaxa.c
parent3bcc8ce62560f36eaaab0e064b169b0118f354f3 (diff)
parentfc6021634482f01e2eb7a485717b2bc3cd6355f3 (diff)
downloadScilab2C-fd8c4f9bc0763e85c16a59c7639803fd09663281.tar.gz
Scilab2C-fd8c4f9bc0763e85c16a59c7639803fd09663281.tar.bz2
Scilab2C-fd8c4f9bc0763e85c16a59c7639803fd09663281.zip
Merge pull request #1 from Mushirahmed/master
Files updated by Mushir merged with main branch.
Diffstat (limited to '2.3-1/src/c/statisticsFunctions/max/dcolumnmaxa.c')
-rw-r--r--2.3-1/src/c/statisticsFunctions/max/dcolumnmaxa.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/2.3-1/src/c/statisticsFunctions/max/dcolumnmaxa.c b/2.3-1/src/c/statisticsFunctions/max/dcolumnmaxa.c
index ae0bbd47..e66422a2 100644
--- a/2.3-1/src/c/statisticsFunctions/max/dcolumnmaxa.c
+++ b/2.3-1/src/c/statisticsFunctions/max/dcolumnmaxa.c
@@ -11,14 +11,16 @@
*/
#include "statMax.h"
+//#include "max.h"
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];
+ out[i]=in[i*columns];
for (j=0;j<columns;j++)
- if (in[i+j*rows]>out[i]) out[i] = in[i+j*rows];
+ if (in[i+j*rows]>out[i])
+ out[i] = in[i+j*rows];
}
}