Merge branch 'master' of https://github.com/ANTsX/ANTsRNet

ANTsX · Sep 23, 2024 · 991588c · 991588c
2 parents c996afa + 737e212
commit 991588c
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 48 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -130,8 +130,8 @@ export(encodeSsd3D)
 export(encodeUnet)
 export(extractImagePatchCoordinates)
 export(extractImagePatches)
+export(getANTsXNetCacheDirectory)
 export(getANTsXNetData)
-export(getAntsxnetCacheDirectory)
 export(getMixtureDensityLossFunction)
 export(getMixtureDensityMseAccuracyFunction)
 export(getMixtureDensitySamplingFunction)
@@ -194,7 +194,7 @@ export(reconstructImageFromPatches)
 export(regressionMatchImage)
 export(sampleFromCategoricalDistribution)
 export(sampleFromOutput)
-export(setAntsxnetCacheDirectory)
+export(setANTsXNetCacheDirectory)
 export(shivaPvsSegmentation)
 export(shivaWmhSegmentation)
 export(simulateBiasField)

diff --git a/R/getANTsXNetData.R b/R/getANTsXNetData.R
@@ -7,8 +7,8 @@
 #' @param path A character string specifying the path to the cache directory.
 #' @return NULL
 #' @export
-setAntsxnetCacheDirectory <- function(path) {
-  normalizedPath <- normalizePath(path, winslash = "/", mustWork = FALSE)
+setANTsXNetCacheDirectory <- function(path) {
+  normalizedPath <- normalizePath( path, winslash = "/", mustWork = FALSE )
 
   if (!dir.exists(normalizedPath)) {
     dir.create(normalizedPath, recursive = TRUE)
@@ -26,7 +26,7 @@ setAntsxnetCacheDirectory <- function(path) {
 #'
 #' @return A character string specifying the path to the cache directory.
 #' @export
-getAntsxnetCacheDirectory <- function() {
+getANTsXNetCacheDirectory <- function() {
   cacheDir <- getOption("antsxnetCacheDirectory", default = NULL)
 
   if (is.null(cacheDir)) {
@@ -185,12 +185,12 @@ getANTsXNetData <- function(
       }
     }
 
-  targetFileNamePath <- fs::path_join( path.expand( c( getAntsxnetCacheDirectory(), targetFileName ) ) )
+  targetFileNamePath <- fs::path_join( path.expand( c( getANTsXNetCacheDirectory(), targetFileName ) ) )
 
   if( ! fs::file_exists( targetFileNamePath ) )
     {
     targetFileNamePath <- tensorflow::tf$keras$utils$get_file(
-      targetFileName, url, cache_subdir = getAntsxnetCacheDirectory() )
+      targetFileName, url, cache_subdir = getANTsXNetCacheDirectory() )
     }
 
   return( as.character( targetFileNamePath ) )

diff --git a/R/getPretrainedNetwork.R b/R/getPretrainedNetwork.R
@@ -322,7 +322,7 @@ getPretrainedNetwork <- function(
     targetFileName <- paste0( fileId, ".h5" )
     }
 
-  cacheDir <- getAntsxnetCacheDirectory()
+  cacheDir <- getANTsXNetCacheDirectory()
 
   targetFileNamePath <- fs::path_join( path.expand( c( cacheDir, targetFileName ) ) )
 

diff --git a/README.md b/README.md
@@ -194,6 +194,6 @@ R CMD INSTALL ANTsRNet
 
 [Documentation page](https://antsx.github.io/ANTsRNet/)
 
-[ANTsXNet tutorial](https://gist.github.com/ntustison/12a656a5fc2f6f9c4494c88dc09c5621#antsxnet)
+[ANTsXNet self-contained examples](https://gist.github.com/ntustison/12a656a5fc2f6f9c4494c88dc09c5621#antsxnet) 
 
 
diff --git a/man/dot-antsxnetCacheDirectory.Rd b/man/dot-antsxnetCacheDirectory.Rd
diff --git a/man/getANTsXNetData.Rd b/man/getANTsXNetData.Rd
diff --git a/man/getAntsxnetCacheDirectory.Rd b/man/getAntsxnetCacheDirectory.Rd
diff --git a/man/getPretrainedNetwork.Rd b/man/getPretrainedNetwork.Rd
diff --git a/man/randomlyTransformImageData.Rd b/man/randomlyTransformImageData.Rd
diff --git a/man/setAntsxnetCacheDirectory.Rd b/man/setAntsxnetCacheDirectory.Rd
Original file line number	Diff line number	Diff line change
Expand Up		@@ -194,6 +194,6 @@ R CMD INSTALL ANTsRNet

		[Documentation page](https://antsx.github.io/ANTsRNet/)

		[ANTsXNet tutorial](https://gist.github.com/ntustison/12a656a5fc2f6f9c4494c88dc09c5621#antsxnet)
		[ANTsXNet self-contained examples](https://gist.github.com/ntustison/12a656a5fc2f6f9c4494c88dc09c5621#antsxnet)