Tidying up the test.

Author: Craigacp

tensorflow-framework/src/main/java/org/tensorflow/framework/optimizers/AdaGrad.java

@@ -44,7 +44,7 @@ public class AdaGrad extends Optimizer {
   public static final float INITIAL_ACCUMULATOR_DEFAULT = 0.01f;
 
   private static final ApplyAdagrad.Options[] opts = new ApplyAdagrad.Options[]{
-          ApplyAdagrad.updateSlots(true),ApplyAdagrad.useLocking(true)};
+          ApplyAdagrad.updateSlots(true), ApplyAdagrad.useLocking(true)};
 
   private final float learningRate;
 

tensorflow-framework/src/test/java/org/tensorflow/framework/optimizers/GradientDescentTest.java

@@ -113,9 +113,9 @@ public void testBasic() {
     }
   }
 
-  // This test fails due to initialization and gradient issues. It should not, but it seems to be a
-  // problem
-  // in TF-core.
+  // This test fails due to incorrect gradients being generated some of the time, when
+  // using an identical graph on identical data. It should not, but it seems to be a
+  // problem in TF-core.
   @Disabled
   @Test
   public void testDeterminism() {
@@ -204,7 +204,6 @@ public void testDeterminism() {
                 .fetch(outputWeightName)
                 .fetch(outputBiasName)
                 .run());
-        System.out.println("Initialized - " + ndArrToString((TFloat32)initialized.get(i).get(3)));
 
         TFloat32 lossVal = (TFloat32) s.runner()
             .addTarget(trainName)
@@ -222,8 +221,6 @@ public void testDeterminism() {
                 .fetch(outputWeightName)
                 .fetch(outputBiasName)
                 .run());
-        System.out.println("Initialized - " + ndArrToString((TFloat32)initialized.get(i).get(3)));
-        System.out.println("Trained - " + ndArrToString((TFloat32)trained.get(i).get(3)));
 
         lossVal = (TFloat32) s.runner()
                 .addTarget(trainName)
@@ -237,10 +234,10 @@ public void testDeterminism() {
     }
 
     for (int i = 1; i < numRuns; i++) {
-      assertEquals(initialLoss[0],initialLoss[i]);
-      assertEquals(postTrainingLoss[0],postTrainingLoss[i]);
+      assertEquals(initialLoss[0], initialLoss[i]);
+      assertEquals(postTrainingLoss[0], postTrainingLoss[i]);
       // Because the weights are references not copies.
-      assertEquals(initialized.get(i),trained.get(i));
+      assertEquals(initialized.get(i), trained.get(i));
       assertEquals(
           initialized.get(0),
           initialized.get(i),
@@ -260,10 +257,4 @@ public void testDeterminism() {
       }
     }
   }
-
-  private static String ndArrToString(FloatNdArray ndarray) {
-    StringBuffer sb = new StringBuffer();
-    ndarray.scalars().forEachIndexed((idx,array) -> sb.append(Arrays.toString(idx)).append(" = ").append(array.getFloat()).append("\n"));
-    return sb.toString();
-  }
 }