From 8ac42d8fa2c8af467c367ab388d128ddfea5c42f Mon Sep 17 00:00:00 2001
From: David Hendriks <davidhendriks93@gmail.com>
Date: Mon, 22 Mar 2021 15:03:22 +0000
Subject: [PATCH] moved some stuff for outputs around
---
binarycpython/utils/grid.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/binarycpython/utils/grid.py b/binarycpython/utils/grid.py
index 81c7e9ae7..91f6b16ef 100644
--- a/binarycpython/utils/grid.py
+++ b/binarycpython/utils/grid.py
@@ -21,6 +21,7 @@ Tasks:
- TODO: uncomment and implement the HPC functionality
- TODO: think of a clean and nice way to unload and remove the custom_logging_info library from memory (and from disk)
- TODO: think of a nice way to remove the loaded grid_code/ generator from memory.
+ - TODO: Create a designated dict for results
"""
import os
@@ -111,6 +112,12 @@ class Population:
#
self.process_ID = 0
+ # Create location to store results. Users should write to this dictionary.
+ self.grid_results = {}
+
+ # Create location where ensemble results are written to
+ self.grid_ensemble_results = {}
+
###################################################
# Argument functions
###################################################
@@ -821,10 +828,8 @@ class Population:
combined_output_dict = merge_dicts(combined_output_dict, output_dict)
# Put the values back as object properties
- self.grid_options["results"] = combined_output_dict["results"]
- self.grid_options["ensemble_results"] = combined_output_dict[
- "ensemble_results"
- ] # Ensemble results are also passed as output from that dictionary
+ self.grid_results = combined_output_dict["results"]
+ self.grid_ensemble_results = combined_output_dict['ensemble_results'] # Ensemble results are also passed as output from that dictionary
self.grid_options["_failed_count"] = combined_output_dict["_failed_count"]
self.grid_options["_failed_prob"] = combined_output_dict["_failed_prob"]
self.grid_options["_failed_systems_error_codes"] = list(
@@ -1040,7 +1045,7 @@ class Population:
# Return a set of results and errors
output_dict = {
- "results": self.grid_options["results"],
+ "results": self.grid_results,
"ensemble_results": ensemble_json,
"_failed_count": self.grid_options["_failed_count"],
"_failed_prob": self.grid_options["_failed_prob"],
--
GitLab