Changeset 33888 for branches/eam_branches/ipp-20120405/Ohana

Timestamp:

May 17, 2012, 11:17:55 AM (14 years ago)

Author:

eugene

Message:

add dsortfour,fsortfour; stdev in opihi

Location:

branches/eam_branches/ipp-20120405/Ohana/src

Files:

• libohana/include/ohana_sort.h (modified) (1 diff)
• libohana/src/sorts.c (modified) (1 diff)
• opihi/cmd.data/vstats.c (modified) (1 diff)

branches/eam_branches/ipp-20120405/Ohana/src/libohana/include/ohana_sort.h

@@ -73 +73 @@
 void fsortthree (float *X, float *Y, float *Z, int N);
 void dsortthree (double *X, double *Y, double *Z, int N);
+void fsortfour (float *X, float *Y, float *Z, float *W, int N);
+void dsortfour (double *X, double *Y, double *Z, double *W, int N);
 
 #endif

branches/eam_branches/ipp-20120405/Ohana/src/libohana/src/sorts.c

@@ -120 +120 @@
 
 }
+
+void fsortfour (float *X, float *Y, float *Z, float *W, int N) {
+
+# define SWAPFUNC(A,B){ float tmp; \
+  tmp = X[A]; X[A] = X[B]; X[B] = tmp; \
+  tmp = Y[A]; Y[A] = Y[B]; Y[B] = tmp; \
+  tmp = Z[A]; Z[A] = Z[B]; Z[B] = tmp; \
+  tmp = W[A]; W[A] = W[B]; W[B] = tmp; \
+}
+# define COMPARE(A,B)(X[A] < X[B])
+
+  OHANA_SORT (N, COMPARE, SWAPFUNC);
+
+# undef SWAPFUNC
+# undef COMPARE
+
+}
+
+void dsortfour (double *X, double *Y, double *Z, double *W, int N) {
+
+# define SWAPFUNC(A,B){ double tmp; \
+  tmp = X[A]; X[A] = X[B]; X[B] = tmp; \
+  tmp = Y[A]; Y[A] = Y[B]; Y[B] = tmp; \
+  tmp = Z[A]; Z[A] = Z[B]; Z[B] = tmp; \
+  tmp = W[A]; W[A] = W[B]; W[B] = tmp; \
+}
+# define COMPARE(A,B)(X[A] < X[B])
+
+  OHANA_SORT (N, COMPARE, SWAPFUNC);
+
+# undef SWAPFUNC
+# undef COMPARE
+
+}

branches/eam_branches/ipp-20120405/Ohana/src/opihi/cmd.data/vstats.c

@@ -144 +144 @@
       }      
     }
-    stdev = sqrt (var / N);
+    stdev = sqrt (var / (N - 1));
 
     Nmode = 0;