Merge

2 files changed, 17 insertions, 21 deletions

diff --git a/2.3-1/src/c/elementaryFunctions/nanmin/dnanmincola.c b/2.3-1/src/c/elementaryFunctions/nanmin/dnanmincola.c
index 0c4d202f..35b94c08 100644
--- a/2.3-1/src/c/elementaryFunctions/nanmin/dnanmincola.c
+++ b/2.3-1/src/c/elementaryFunctions/nanmin/dnanmincola.c
@@ -15,22 +15,19 @@
 #include <math.h>
 #include "nanmin.h"
 
-void dnanmincola(double *in, int row, int col, double *p, double *out)
+void dnanmincola(double *in, int row, int col, double *out, double *p)
 {
-    double inter[col]; 
-
-
-for(int i=0; i< row; i++)
+    double inter[col];
+    double position[col];
+    
+    for(int i=0; i < row; i++)
+    {
+	for(int j=0; j < col; i++)
 	{
-		for(int j=0 ; j< col; j++)
-			{
-				inter[j]= in[i+ (j*row)];
-				
-			}
-     out[i]= dnanmina( inter, 1, col, p);
-	
+	    inter[j]= in[i+ (j*row)];
 	}
-
-
+	
+	out[i]= dnanmina(inter, 1, col, position);
+	
+    }
 }
-
diff --git a/2.3-1/src/c/elementaryFunctions/nanmin/dnanminrowa.c b/2.3-1/src/c/elementaryFunctions/nanmin/dnanminrowa.c
index d255ef14..0909fc2c 100644
--- a/2.3-1/src/c/elementaryFunctions/nanmin/dnanminrowa.c
+++ b/2.3-1/src/c/elementaryFunctions/nanmin/dnanminrowa.c
@@ -15,22 +15,21 @@
 #include <math.h>
 #include "nanmin.h"
 
-void dnanminrowa(double *in, int row, int col, double *p, double *out)
+void dnanminrowa(double *in, int row, int col, double *out, double *p)
 {
-    double inter[row]; 
+    double inter[row], *position;
 
 
 
-for(int i=0; i< col; i++)
+    for(int i=0; i< col; i++)
 	{
 		for(int j=0 ; j< row; j++)
 			{
 				inter[j]= in[j+ (i*row)];
 				
 			}
-     out[i]= dnanmina( inter, row, 1, p);
-	
+     	out[i]= dnanmina( inter, row, 1, position);
 	}
-
+	//p = position;
 
 }