COMP: Another attempt at passing travis.

R/extractImagePatches.R

@@ -28,11 +28,11 @@
 #' maskImage <- getMask( image, 1, 1000 )
 #' patchSet1 <- extractImagePatches( image, c( 32, 32 ), 10, c( 32, 32 ), randomSeed = 0 )
 #' patchSet2 <- extractImagePatches( image, c( 32, 32 ), 10, c( 32, 32 ), randomSeed = 1 )
-#' # patchSet3 <- extractImagePatches( image, c( 32, 32 ), 10, c( 32, 32 ), maskImage, randomSeed = 0 )
+#' patchSet3 <- extractImagePatches( image, c( 32, 32 ), 10, c( 32, 32 ), maskImage, randomSeed = 0 )
 #'
 #' @export
 extractImagePatches <- function( image, patchSize, maxNumberOfPatches = 'all',
-  strideLength = 1, maskImage = NA, randomSeed, returnAsArray = FALSE )
+  strideLength = 1, maskImage = NULL, randomSeed, returnAsArray = FALSE )
 {
   if ( ! missing( randomSeed ) )
     {
@@ -185,7 +185,7 @@ extractImagePatches <- function( image, patchSize, maxNumberOfPatches = 'all',
     randomIndices <-
       array( data = NA, dim = c( maxNumberOfPatches, dimensionality ) )
 
-    if( !is.na( maskImage ) )
+    if( !is.null( maskImage ) )
       {
       maskArray <- as.array( maskImage )
       maskArray[which( maskArray != 0 )] <- 1

R/randomlyTransformImageData.R

@@ -168,8 +168,8 @@ randomlyTransformImageData <- function( referenceImage,
   for( i in seq_len( numberOfSimulations ) )
     {
     singleSubjectImageList <- inputImageList[[randomIndices[i]]]
-    singleSubjectSegmentationImage <- NA
-    if( !is.na( segmentationImageList[[1]] ) )
+    singleSubjectSegmentationImage <- NULL
+    if( ! is.null( segmentationImageList[[1]] ) )
       {
       singleSubjectSegmentationImage <- segmentationImageList[[randomIndices[i]]]
       }
@@ -182,7 +182,7 @@ randomlyTransformImageData <- function( referenceImage,
           singleSubjectImageList[[j]], referenceImage,
             interpType = inputImageInterpolator )
         }
-      if( !is.na( singleSubjectSegmentationImage ) )
+      if( ! is.null( singleSubjectSegmentationImage ) )
         {
         singleSubjectSegmentationImage <- resampleImageToTarget(
           singleSubjectSegmentationImage, referenceImage,
@@ -223,15 +223,15 @@ randomlyTransformImageData <- function( referenceImage,
       }
     simulatedImageList[[i]] <- singleSubjectSimulatedImageList
 
-    if( !is.na( singleSubjectSegmentationImage ) )
+    if( ! is.null( singleSubjectSegmentationImage ) )
       {
       simulatedSegmentationImageList[[i]] <- applyAntsrTransform( transforms,
         singleSubjectSegmentationImage, referenceImage,
           interpolation = segmentationImageInterpolator )
       }
     }
 
-  if( is.na( segmentationImageList[[1]] ) )
+  if( is.null( segmentationImageList[[1]] ) )
     {
     return( list( simulatedImageList = simulatedImageList ) )
     }