Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #719 call dispose #720

Merged
merged 1 commit into from
Jan 24, 2022
Merged

Fixes #719 call dispose #720

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 31 additions & 23 deletions R/utilities-simulation.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,30 +216,38 @@ runSimulations <- function(simulations, population = NULL, agingData = NULL, sim
}

.runSimulationsConcurrently <- function(simulations, simulationRunOptions, silentMode = FALSE) {
validateIsOfType(simulations, Simulation)
simulationRunner <- getNetTask("ConcurrentSimulationRunner")
rClr::clrSet(simulationRunner, "SimulationRunOptions", simulationRunOptions$ref)

# Map of simulations ids to simulations objects
simulationIdSimulationMap <- vector("list", length(simulations))

# Add simulations
for (simulationIdx in seq_along(simulations)) {
simulation <- simulations[[simulationIdx]]
simulationIdSimulationMap[[simulationIdx]] <- simulation
names(simulationIdSimulationMap)[[simulationIdx]] <- simulation$id

rClr::clrCall(simulationRunner, "AddSimulation", simulation$ref)
}
# Run all simulations
results <- rClr::clrCall(simulationRunner, "RunConcurrently")

# Ids of the results are Ids of the simulations
resultsIdSimulationIdMap <- names(simulationIdSimulationMap)
names(resultsIdSimulationIdMap) <- names(simulationIdSimulationMap)
simulationResults <- .getConcurrentSimulationRunnerResults(results = results, resultsIdSimulationIdMap = resultsIdSimulationIdMap, simulationIdSimulationMap = simulationIdSimulationMap, silentMode = silentMode)

return(simulationResults)
tryCatch(
{
validateIsOfType(simulations, Simulation)
rClr::clrSet(simulationRunner, "SimulationRunOptions", simulationRunOptions$ref)

# Map of simulations ids to simulations objects
simulationIdSimulationMap <- vector("list", length(simulations))

# Add simulations
for (simulationIdx in seq_along(simulations)) {
simulation <- simulations[[simulationIdx]]
simulationIdSimulationMap[[simulationIdx]] <- simulation
names(simulationIdSimulationMap)[[simulationIdx]] <- simulation$id

rClr::clrCall(simulationRunner, "AddSimulation", simulation$ref)
}
# Run all simulations
results <- rClr::clrCall(simulationRunner, "RunConcurrently")

# Ids of the results are Ids of the simulations
resultsIdSimulationIdMap <- names(simulationIdSimulationMap)
names(resultsIdSimulationIdMap) <- names(simulationIdSimulationMap)
simulationResults <- .getConcurrentSimulationRunnerResults(results = results, resultsIdSimulationIdMap = resultsIdSimulationIdMap, simulationIdSimulationMap = simulationIdSimulationMap, silentMode = silentMode)

return(simulationResults)
},
finally = {
# Dispose of the runner to release any possible instances still in memory (.NET side)
rClr::clrCall(simulationRunner, "Dispose")
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was missing. We have it for the batch but not for this one. It does not explain the lack of // ism

}
)
}

#' @title Creates and returns an instance of a `SimulationBatch` that can be used to efficiently vary parameters and initial values in a simulation
Expand Down