Fix off-by-one display errors for batch and epoch (keras-team#8193)

ozabluda · fchollet · commit ab30f73a90b8 · 2017-10-19T15:36:58.000-07:00
diff --git a/examples/mnist_acgan.py b/examples/mnist_acgan.py
@@ -182,8 +182,8 @@ def build_discriminator():
     train_history = defaultdict(list)
     test_history = defaultdict(list)
 
-    for epoch in range(epochs):
-        print('Epoch {} of {}'.format(epoch + 1, epochs))
+    for epoch in range(1, epochs + 1):
+        print('Epoch {} of {}'.format(epoch, epochs))
 
         num_batches = int(X_train.shape[0] / batch_size)
         progress_bar = Progbar(target=num_batches)
@@ -192,7 +192,6 @@ def build_discriminator():
         epoch_disc_loss = []
 
         for index in range(num_batches):
-            progress_bar.update(index)
             # generate a new batch of noise
             noise = np.random.uniform(-1, 1, (batch_size, latent_size))
 
@@ -232,7 +231,9 @@ def build_discriminator():
                 [noise, sampled_labels.reshape((-1, 1))],
                 [trick, sampled_labels]))
 
-        print('\nTesting for epoch {}:'.format(epoch + 1))
+            progress_bar.update(index + 1)
+
+        print('Testing for epoch {}:'.format(epoch))
 
         # evaluate the testing loss here
 
