Changed Array.print() to Array.toString()

ShadyBoukhary · umar456 · commit 44a2b174d4c6 · 2019-07-25T15:15:24.000-04:00
diff --git a/com/arrayfire/Array.java b/com/arrayfire/Array.java
@@ -29,7 +29,7 @@ public class Array extends ArrayFire implements AutoCloseable {
 
   private native static long createArrayFromBoolean(int[] dims, boolean[] elems);
 
-  private native static void afPrint(long ref, String name);
+  private native static String afPrint(long ref, String name);
 
   // Global reference to JVM object
   // to persist between JNI calls
@@ -218,8 +218,13 @@ public boolean[] getBooleanArray() throws Exception {
     return Data.getBooleanArray(this);
   }
 
-  public void print(String name) {
-      afPrint(ref, name);
+  @Override
+  public String toString() {
+      return afPrint(ref, "No name");
+  }
+
+  public String toString(String name) {
+      return afPrint(ref, name);
   }
 
   @Override
diff --git a/examples/HelloWorld.java b/examples/HelloWorld.java
@@ -11,26 +11,26 @@ public static void main(String[] args) {
       Util.info();
       System.out.println("Create a 5-by-3 matrix of random floats on the GPU");
       Data.randu(a, new int[] { 5, 3 }, Array.FloatType);
-      a.print("a");
+      System.out.println(a.toString("a"));
 
       System.out.println("Element-wise arithmetic");
       Arith.sin(b, a);
-      b.print("b");
+      System.out.println(a.toString("b"));
 
       System.out.println("Fourier transform the result");
       Signal.fft(c, b);
-      c.print("c");
+      System.out.println(a.toString("c"));
 
       System.out.println("Matmul b and c");
       Arith.mul(d, b, c);
-      d.print("d");
+      System.out.println(a.toString("d"));
 
       System.out.println("Calculate weighted variance.");
       Array forVar = new Array();
       Array weights = new Array();
       Data.randn(forVar, new int[] { 5, 3 }, Array.DoubleType);
       Data.randn(weights, new int[] { 5, 3 }, Array.DoubleType);
-      forVar.print("forVar");
+      System.out.println(a.toString("forVar"));
 
       double abc = Statistics.var(forVar, weights, Double.class);
       System.out.println(String.format("Variance is: %f", abc));
@@ -49,13 +49,13 @@ public static void main(String[] args) {
         data[i] = (float) (tmp);
       }
       Array e = new Array(dims, data);
-      e.print("e");
+      System.out.println(a.toString("e"));
 
       System.out.println("Add e and random array");
       Array randa = new Array();
       Data.randu(randa, dims, Array.FloatType);
       Arith.add(f, e, randa);
-      f.print("f");
+      System.out.println(a.toString("f"));
 
       System.out.println("Copy result back to host.");
       float[] result = f.getFloatArray();
diff --git a/src/array.cpp b/src/array.cpp
@@ -9,11 +9,15 @@ JNIEXPORT void JNICALL ARRAY_FUNC(destroyArray)(JNIEnv *env, jclass clazz,
   AF_CHECK_VOID(af_release_array(ARRAY(ref)));
 }
 
-JNIEXPORT void JNICALL ARRAY_FUNC(afPrint)(JNIEnv *env, jclass clazz, jlong ref,
+JNIEXPORT jstring JNICALL ARRAY_FUNC(afPrint)(JNIEnv *env, jclass clazz, jlong ref,
                                            jstring name) {
   const char *str = env->GetStringUTFChars(name, 0);
-  AF_CHECK_VOID(af_print_array_gen(str, ARRAY(ref), 3));
+  char * res;
+  af_array_to_string(&res, str, ARRAY(ref), 4, false);
+
+  //AF_CHECK_VOID(af_print_array_gen(str, ARRAY(ref), 3));
   env->ReleaseStringUTFChars(name, str);
+  return env->NewStringUTF(res);
 }
 
 JNIEXPORT jintArray JNICALL ARRAY_FUNC(getDims)(JNIEnv *env, jclass clazz,
diff --git a/src/statistics.cpp b/src/statistics.cpp
@@ -47,20 +47,27 @@ BEGIN_EXTERN_C
     return java::createJavaObject(env, java::JavaObjects::jtype, real, img); \
   }
 
-JNIEXPORT jlong JNICALL STATISTICS_FUNC(afMean)(JNIEnv *env, jclass clazz,
-                                                jlong ref, jint dim) {
-  af_array ret = 0;
-  AF_CHECK(af_mean(&ret, ARRAY(ref), dim));
-  return JLONG(ret);
+#define INSTANTIATE_STAT(Name, name)                                    \
+    JNIEXPORT jlong JNICALL STATISTICS_FUNC(af##Name)(JNIEnv *env, jclass clazz, \
+                                                    jlong ref, jint dim) { \
+    af_array ret = 0;                                                   \
+    AF_CHECK(af_##name(&ret, ARRAY(ref), dim));                           \
+    return JLONG(ret);                                                  \
 }
 
-JNIEXPORT jdouble JNICALL STATISTICS_FUNC(afMeanAll)(JNIEnv *env, jclass clazz,
-                                                     jlong ref) {
-  double ret = 0;
-  AF_CHECK(af_mean_all(&ret, NULL, ARRAY(ref)));
-  return (jdouble)ret;
+INSTANTIATE_STAT(Mean, mean)
+INSTANTIATE_STAT(Stdev, stdev)
+
+#define INSTANTIATE_STAT_ALL(Name, name)                                \
+    JNIEXPORT jdouble JNICALL STATISTICS_FUNC(af##Name##All)(JNIEnv *env, jclass clazz, \
+                                                         jlong ref) {   \
+    double ret = 0;                                                     \
+    AF_CHECK(af_##name##_all(&ret, NULL, ARRAY(ref)));                      \
+    return (jdouble)ret;                                                \
 }
 
+INSTANTIATE_STAT_ALL(Mean, mean)
+
 INSTANTIATE_MEAN(FloatComplex)
 INSTANTIATE_MEAN(DoubleComplex)
 INSTANTIATE_ALL_REAL_WEIGHTED(Mean, mean)
