Minor change to the testing utils

nimble-dev · Apr 5, 2024 · 5da41bd · 5da41bd
1 parent f5e239f
commit 5da41bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/inst/AD_test_utils.R b/inst/AD_test_utils.R
@@ -1255,7 +1255,7 @@ setup_update_and_constant_nodes_for_tests <- function(model,
   ##  derivNodes <- model$expandNodeNames(derivNodes) # do not do this because do not want vector node names
   nNodes <- length(derivNodes)
   calcNodes <- model$getDependencies(derivNodes)
-  ucNodes <- makeDerivsInfo(model, derivNodes, calcNodes, dataAsConstantNodes = TRUE)
+  ucNodes <- makeModelDerivsInfo(model, derivNodes, calcNodes, dataAsConstantNodes = TRUE)
   updateNodes <- ucNodes$updateNodes
   constantNodes <- ucNodes$constantNodes
   updateNodes <- setdiff(updateNodes, forceConstantNodes) # remove forceConstants from updates

diff --git a/inst/test_utils.R b/inst/test_utils.R
@@ -1314,7 +1314,7 @@ derivsNimbleFunctionMeta <- nimbleFunction(
   setup = function(model, calcNodes, wrt, reset = FALSE) {
     innerWrtVec <- seq_along(model$expandNodeNames(wrt, returnScalarComponents = TRUE))
     d <- length(innerWrtVec)
-    derivsInfo <- makeDerivsInfo(model, wrt, calcNodes)
+    derivsInfo <- makeModelDerivsInfo(model, wrt, calcNodes)
     updateNodes <- derivsInfo$updateNodes
     constantNodes <- derivsInfo$constantNodes
   },
@@ -1375,7 +1375,7 @@ derivsNimbleFunctionParamTransform <- nimbleFunction(
     my_parameterTransform <- parameterTransform(model, wrtNodesAsScalars)
     d <- my_parameterTransform$getTransformedLength()
     nimDerivs_wrt <- 1:d
-    derivsInfo <- makeDerivsInfo(model, wrt, calcNodes)
+    derivsInfo <- makeModelDerivsInfo(model, wrt, calcNodes)
     updateNodes   <- derivsInfo$updateNodes
     constantNodes <- derivsInfo$constantNodes
   },
@@ -1407,7 +1407,7 @@ derivsNimbleFunctionParamTransformMeta <- nimbleFunction(
     my_parameterTransform <- parameterTransform(model, wrtNodesAsScalars)
     d <- my_parameterTransform$getTransformedLength()
     nimDerivs_wrt <- 1:d
-    derivsInfo <- makeDerivsInfo(model, wrt, calcNodes)
+    derivsInfo <- makeModelDerivsInfo(model, wrt, calcNodes)
     updateNodes   <- derivsInfo$updateNodes
     constantNodes <- derivsInfo$constantNodes
   },
@@ -1811,7 +1811,7 @@ test_ADModelCalculate_internal <- function(model, name = 'unknown', xOrig = NULL
       if(!is.null(d) && length(d) == 2 && d[1] == d[2]) return(TRUE) else return(FALSE)
     }
 
-    derivsInfo <- makeDerivsInfo(model, wrt, calcNodes)
+    derivsInfo <- makeModelDerivsInfo(model, wrt, calcNodes)
     updateNodes <- derivsInfo$updateNodes
     constantNodes <- derivsInfo$constantNodes