From c5dd64b6591cb5481960cd40daf887b99508a3a4 Mon Sep 17 00:00:00 2001
From: David Hendriks <davidhendriks93@gmail.com>
Date: Sun, 29 Nov 2020 20:20:07 +0000
Subject: [PATCH] fixed wrong edits in grid file
---
binarycpython/utils/grid.py | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/binarycpython/utils/grid.py b/binarycpython/utils/grid.py
index 14036a907..ab4ad0c84 100644
--- a/binarycpython/utils/grid.py
+++ b/binarycpython/utils/grid.py
@@ -348,7 +348,10 @@ class Population:
def _return_binary_c_version_info(self, parsed=False):
"""
Function that returns the version information of binary_c
- """.return_version_info().strip()
+ """
+
+
+ version_info = _binary_c_bindings.return_version_info().strip()
if parsed:
version_info = parse_binary_c_version_info(version_info)
@@ -531,7 +534,8 @@ class Population:
"""
for thread_nr in self.grid_options["amt_cores"]:
- persistent_data_memad.binary_c_return_persistent_data_memaddr()
+ persistent_data_memaddr = (
+ _binary_c_bindings.binary_c_return_persistent_data_memaddr()
)
self.persistent_data_memory_dict[thread_nr] = persistent_data_memaddr
verbose_print(
@@ -563,7 +567,8 @@ class Population:
1,
)
- # Get the output and decode it correctly.binary_c_free_persistent_data_memaddr_and_return_json_output(
+ # Get the output and decode it correctly to get the numbers correct
+ ensemble_json_output = _binary_c_bindings.binary_c_free_persistent_data_memaddr_and_return_json_output(
persistent_data_memaddr
)
parsed_json = json.loads(
@@ -694,8 +699,8 @@ class Population:
for i, system in enumerate(self.grid_options["system_generator"](self)):
full_system_dict = self.bse_options.copy()
full_system_dict.update(system)
-
- binary_cmdline_string =.run_system(
+ binary_cmdline_string = self._return_argline(full_system_dict)
+ out = _binary_c_bindings.run_system(
argstring=binary_cmdline_string,
custom_logging_func_memaddr=self.grid_options[
"custom_logging_func_memaddr"
@@ -713,7 +718,9 @@ class Population:
def evolve_system_mp(self, binary_cmdline_string):
"""
Function that the multiprocessing evolution method calls to evolve a system
- """.run_system(
+ """
+
+ out = _binary_c_bindings.run_system(
argstring=binary_cmdline_string,
custom_logging_func_memaddr=self.grid_options[
"custom_logging_func_memaddr"
@@ -758,7 +765,8 @@ class Population:
argline = self._return_argline(self.bse_options)
verbose_print("Running {}".format(argline), self.grid_options["verbosity"], 1)
- # Run syste.run_system(
+ # Run system
+ out = _binary_c_bindings.run_system(
argstring=argline,
custom_logging_func_memaddr=self.grid_options[
"custom_logging_func_memaddr"
@@ -802,7 +810,8 @@ class Population:
### Custom logging code:
self._set_custom_logging()
- ### Load stor.return_store_memaddr()
+ ### Load store
+ self.grid_options["store_memaddr"] = _binary_c_bindings.return_store_memaddr()
### ensemble:
## check the settings:
@@ -920,7 +929,8 @@ class Population:
# Unload functions
- # Unload stor.free_store_memaddr(self.grid_options["store_memaddr"])
+ # Unload store
+ _binary_c_bindings.free_store_memaddr(self.grid_options["store_memaddr"])
###################################################
# Gridcode functions
--
GitLab