Move saving of f-est to be after failure logic

So we don't save f-est values for failed steps

Author: etphipp

src/Genten_GCP_FedOpt.hpp

@@ -495,14 +495,6 @@ operator() (const Loss& loss) {
     }
     */
 
-    {
-      history_.addEmpty();
-      auto& p = history_.lastEntry();
-      p.iteration = e+1;
-      p.residual = fest;
-      p.cum_time = t1 - start_time;
-    }
-
     if (passed_epoch) {
       stepper->setPassed();
       meta_stepper->setPassed();
@@ -522,6 +514,14 @@ operator() (const Loss& loss) {
       ++nfails;
     }
 
+    {
+      history_.addEmpty();
+      auto& p = history_.lastEntry();
+      p.iteration = e+1;
+      p.residual = fest;
+      p.cum_time = t1 - start_time;
+    }
+
     if (nfails > max_fails || fest < tol*fest_init)
       break;
   }

src/Genten_GCP_SGD.cpp

@@ -352,16 +352,6 @@ namespace Genten {
         out << std::endl;
       }
 
-      {
-        perfInfo.addEmpty();
-        auto& p = perfInfo.lastEntry();
-        p.iteration = numEpochs+1;
-        p.residual = fest;
-        if (compute_fit)
-          p.fit = fit;
-        p.cum_time = timer.getTotalTime(timer_sgd);
-      }
-
       if (failed_epoch) {
         // restart from last epoch
         u.set(u_prev);
@@ -379,6 +369,16 @@ namespace Genten {
         annealer->success();
       }
 
+      {
+        perfInfo.addEmpty();
+        auto& p = perfInfo.lastEntry();
+        p.iteration = numEpochs+1;
+        p.residual = fest;
+        if (compute_fit)
+          p.fit = fit;
+        p.cum_time = timer.getTotalTime(timer_sgd);
+      }
+
       if (nfails > max_fails || fest < tol)
         break;
     }