Fix merge conflict.

paciorek · paciorek · commit 1027b553b4a4 · 2025-07-26T12:14:05.000-07:00
diff --git a/packages/nimble/R/MCMC_configuration.R b/packages/nimble/R/MCMC_configuration.R
@@ -787,10 +787,6 @@ The second usage of \'multivariateNodesAsScalars\' occurs when \'default\' is TR
 For internal use only
 '
             if(!allowData && !allowData_global) {
-<<<<<<< Updated upstream
-                if(all(model$isData(targetOne)))   return()
-                if(any(model$isData(targetOne)))   targetOne <- filterOutDataNodes(targetOne)
-=======
                 if(all(model$isData(targetOne))) {
                     messageIfVerbose('  [Note] Samplers not added to data node: `', paste0(targetOne, collapse = '`, `'), '`.\n',
                                      '         Provide argument `allowData = TRUE` to `addSampler` method, to force sampler assignment.')
@@ -803,7 +799,6 @@ For internal use only
                     messageIfVerbose('  [Note] Samplers not added to data node: `', paste0(targetDataComponents, collapse = '`, `'), '`.\n',
                                      '         Provide argument `allowData = TRUE` to `addSampler` method, to force sampler assignment.')
                 }
->>>>>>> Stashed changes
             }
             newInd <- length(samplerConfs) + 1
             samplerConfs[[newInd]] <<- samplerConf(name=thisSamplerName, samplerFunction=samplerFunction, target=targetOne, control=thisControlList, model=model)

Original file line number	Diff line number	Diff line change
`@@ -787,10 +787,6 @@ The second usage of \'multivariateNodesAsScalars\' occurs when \'default\' is TR`
`787`	`787`	`For internal use only`
`788`	`788`	`'`
`789`	`789`	`if(!allowData && !allowData_global) {`
`790`		`-<<<<<<< Updated upstream`
`791`		`- if(all(model$isData(targetOne))) return()`
`792`		`- if(any(model$isData(targetOne))) targetOne <- filterOutDataNodes(targetOne)`
`793`		`-=======`
`794`	`790`	`if(all(model$isData(targetOne))) {`
`795`	`791`	messageIfVerbose(' [Note] Samplers not added to data node: `', paste0(targetOne, collapse = '`, `'), '`.\n',
`796`	`792`	' Provide argument `allowData = TRUE` to `addSampler` method, to force sampler assignment.')
`@@ -803,7 +799,6 @@ For internal use only`
`803`	`799`	messageIfVerbose(' [Note] Samplers not added to data node: `', paste0(targetDataComponents, collapse = '`, `'), '`.\n',
`804`	`800`	' Provide argument `allowData = TRUE` to `addSampler` method, to force sampler assignment.')
`805`	`801`	`}`
`806`		`->>>>>>> Stashed changes`
`807`	`802`	`}`
`808`	`803`	`newInd <- length(samplerConfs) + 1`
`809`	`804`	`samplerConfs[[newInd]] <<- samplerConf(name=thisSamplerName, samplerFunction=samplerFunction, target=targetOne, control=thisControlList, model=model)`