BUG: Move convergence monitoring outside verbose loop.

ANTsX · May 10, 2023 · 9df124a · 9df124a
1 parent 6121db6
commit 9df124a
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/R/landmarkTransforms.R b/R/landmarkTransforms.R
@@ -402,11 +402,11 @@ fitTransformToPairedPoints <- function(
         updatedMovingPoints <- applyAntsrTransformToPoint( totalFieldMovingToMiddleXfrm, movingPoints )
         }
 
+      error <- mean( sqrt( rowSums( ( updatedFixedPoints - updatedMovingPoints )^2 ) ) )
+      errorValues <- append( errorValues, error )
+      convergenceValue <- convergenceMonitoring( errorValues )
       if( verbose )
         {
-        error <- mean( sqrt( rowSums( ( updatedFixedPoints - updatedMovingPoints )^2 ) ) )
-        errorValues <- append( errorValues, error )
-        convergenceValue <- convergenceMonitoring( errorValues )
         endTime <- Sys.time()
         diffTime <- endTime - startTime
         cat( "Composition ", i, ": error = ", error, " (convergence = ", convergenceValue, ", elapsed time = ", diffTime, ")\n", sep = "" )
@@ -521,11 +521,11 @@ fitTransformToPairedPoints <- function(
           spacing = antsGetSpacing( velocityField ), direction = antsGetDirection( velocityField ),
           components = TRUE )
 
+      error <- mean( sqrt( rowSums( ( updatedFixedPoints - updatedMovingPoints )^2 ) ) )
+      errorValues <- append( errorValues, error )
+      convergenceValue <- convergenceMonitoring( errorValues )
       if( verbose )
         {
-        error <- mean( sqrt( rowSums( ( updatedFixedPoints - updatedMovingPoints )^2 ) ) )
-        errorValues <- append( errorValues, error )
-        convergenceValue <- convergenceMonitoring( errorValues )
         endTime <- Sys.time()
         diffTime <- endTime - startTime
         cat( "Composition ", i, ": error = ", error, " (convergence = ", convergenceValue, ", elapsed time = ", diffTime, ")\n", sep = "" )
@@ -844,11 +844,11 @@ fitTimeVaryingTransformToPointSets <- function(
         spacing = antsGetSpacing( velocityField ), direction = antsGetDirection( velocityField ),
         components = TRUE )
 
+    error <- mean( sqrt( rowSums( ( updatedFixedPoints - updatedMovingPoints )^2 ) ) )
+    errorValues <- append( errorValues, error )
+    convergenceValue <- convergenceMonitoring( errorValues )
     if( verbose )
       {
-      error <- mean( sqrt( rowSums( ( updatedFixedPoints - updatedMovingPoints )^2 ) ) )
-      errorValues <- append( errorValues, error )
-      convergenceValue <- convergenceMonitoring( errorValues )
       endTime <- Sys.time()
       diffTime <- endTime - startTime
       cat( "Composition ", i, ": error = ", error, " (convergence = ", convergenceValue, ", elapsed time = ", diffTime, ")\n", sep = "" )