X-Git-Url: https://git.auder.net/?p=morpheus.git;a=blobdiff_plain;f=pkg%2FR%2FoptimParams.R;h=1ef1494e74841078859d7a4ff26eadffee98e029;hp=9185efba0f8403cc412eb52f8500fcbf9740b726;hb=cf673dee64ab0ce02ccaaba0fb63a9a4589ee8aa;hpb=5fc1b9d9bbb20ebf5228792f5885b77991c0cec9 diff --git a/pkg/R/optimParams.R b/pkg/R/optimParams.R index 9185efb..1ef1494 100644 --- a/pkg/R/optimParams.R +++ b/pkg/R/optimParams.R @@ -56,11 +56,6 @@ optimParams = function(K, link=c("logit","probit"), optargs=list()) M <- computeMoments(optargs$X,optargs$Y) } - # TODO: field?! - exactComp <<- optargs$exact - if (is.null(exactComp)) - exactComp <<- FALSE - # Build and return optimization algorithm object methods::new("OptimParams", "li"=link, "M1"=as.double(M[[1]]), "M2"=as.double(M[[2]]), "M3"=as.double(M[[3]]), "K"=as.integer(K)) @@ -249,6 +244,8 @@ setRefClass( # link="probit"; order=2; λ=c(531.8099,586.8893,523.5816); b=c(-118.512674,-3.488020,2.109969) # Switch to pracma package for that (but it seems slow...) + exactComp <- FALSE #TODO: global, or argument... + if (exactComp && link == "probit") { # Use exact computations