From 2f702dbcbf6a6cc817db9d8bccf93c4ca44beeb1 Mon Sep 17 00:00:00 2001 From: Bryan Rumsey Date: Mon, 12 Sep 2022 11:10:35 -0400 Subject: [PATCH] Added the class method decorator where missing and replaced self with cls. --- gillespy2/solvers/cpp/ode_c_solver.py | 3 ++- gillespy2/solvers/cpp/ssa_c_solver.py | 3 ++- gillespy2/solvers/cpp/tau_hybrid_c_solver.py | 3 ++- gillespy2/solvers/cpp/tau_leaping_c_solver.py | 3 ++- gillespy2/solvers/numpy/CLE_solver.py | 2 +- gillespy2/solvers/numpy/ode_solver.py | 2 +- gillespy2/solvers/numpy/ssa_solver.py | 3 ++- gillespy2/solvers/numpy/tau_hybrid_solver.py | 2 +- gillespy2/solvers/numpy/tau_leaping_solver.py | 2 +- 9 files changed, 14 insertions(+), 9 deletions(-) diff --git a/gillespy2/solvers/cpp/ode_c_solver.py b/gillespy2/solvers/cpp/ode_c_solver.py index a185fc8c7..ebb68a8ea 100644 --- a/gillespy2/solvers/cpp/ode_c_solver.py +++ b/gillespy2/solvers/cpp/ode_c_solver.py @@ -40,7 +40,8 @@ def get_supported_integrator_options(): "max_step", } - def get_solver_settings(self): + @classmethod + def get_solver_settings(cls): """ Returns a list of arguments supported by odc_c_solver.run. :returns: Tuple of strings, denoting all keyword argument for this solvers run() method. diff --git a/gillespy2/solvers/cpp/ssa_c_solver.py b/gillespy2/solvers/cpp/ssa_c_solver.py index 353004ad2..c41d08161 100644 --- a/gillespy2/solvers/cpp/ssa_c_solver.py +++ b/gillespy2/solvers/cpp/ssa_c_solver.py @@ -32,7 +32,8 @@ class SSACSolver(GillesPySolver, CSolver): name = "SSACSolver" target = "ssa" - def get_solver_settings(self): + @classmethod + def get_solver_settings(cls): """ Returns a list of arguments supported by ssa_c_solver.run. :returns: Tuple of strings, denoting all keyword argument for this solvers run() method. diff --git a/gillespy2/solvers/cpp/tau_hybrid_c_solver.py b/gillespy2/solvers/cpp/tau_hybrid_c_solver.py index 0bf931cf4..3b4b7fc64 100644 --- a/gillespy2/solvers/cpp/tau_hybrid_c_solver.py +++ b/gillespy2/solvers/cpp/tau_hybrid_c_solver.py @@ -190,7 +190,8 @@ def _handle_return_code(self, return_code: "int") -> "int": return super()._handle_return_code(return_code) - def get_solver_settings(self): + @classmethod + def get_solver_settings(cls): """ Returns a list of arguments supported by tau_hybrid_c_solver.run. :return: Tuple of strings, denoting all keyword argument for this solvers run() method. diff --git a/gillespy2/solvers/cpp/tau_leaping_c_solver.py b/gillespy2/solvers/cpp/tau_leaping_c_solver.py index ad12dc8d3..815bd818a 100644 --- a/gillespy2/solvers/cpp/tau_leaping_c_solver.py +++ b/gillespy2/solvers/cpp/tau_leaping_c_solver.py @@ -35,7 +35,8 @@ class TauLeapingCSolver(GillesPySolver, CSolver): name = "TauLeapingCSolver" target = "tau_leap" - def get_solver_settings(self): + @classmethod + def get_solver_settings(cls): """ Returns a list of arguments supported by tau_leaping_c_solver.run. :returns: Tuple of strings, denoting all keyword argument for this solvers run() method. diff --git a/gillespy2/solvers/numpy/CLE_solver.py b/gillespy2/solvers/numpy/CLE_solver.py index ab1444a44..6ec3515a6 100644 --- a/gillespy2/solvers/numpy/CLE_solver.py +++ b/gillespy2/solvers/numpy/CLE_solver.py @@ -99,7 +99,7 @@ def __get_reactions(self, step, curr_state, curr_time, save_time, propensities, return rxn_count, curr_state, curr_time @classmethod - def get_solver_settings(self): + def get_solver_settings(cls): """ Returns a list of arguments supported by CLE_solver.run. :returns: Tuple of strings, denoting all keyword argument for this solvers run() method. diff --git a/gillespy2/solvers/numpy/ode_solver.py b/gillespy2/solvers/numpy/ode_solver.py index c9517b5e6..6631d066c 100644 --- a/gillespy2/solvers/numpy/ode_solver.py +++ b/gillespy2/solvers/numpy/ode_solver.py @@ -81,7 +81,7 @@ def __f(t, y, curr_state, model, c_prop): return state_change @classmethod - def get_solver_settings(self): + def get_solver_settings(cls): """ Returns a list of arguments supported by ode_solver.run. :returns: Tuple of strings, denoting all keyword argument for this solvers run() method. diff --git a/gillespy2/solvers/numpy/ssa_solver.py b/gillespy2/solvers/numpy/ssa_solver.py index de166c6c9..3deefd483 100644 --- a/gillespy2/solvers/numpy/ssa_solver.py +++ b/gillespy2/solvers/numpy/ssa_solver.py @@ -53,7 +53,8 @@ def __init__(self, model=None): self.model = copy.deepcopy(model) self.is_instantiated = True - def get_solver_settings(self): + @classmethod + def get_solver_settings(cls): """ Returns a list of arguments supported by the ssa_solver.run :returns: Tuple of strings, denoting all keyword argument for this solvers run() method. diff --git a/gillespy2/solvers/numpy/tau_hybrid_solver.py b/gillespy2/solvers/numpy/tau_hybrid_solver.py index bd54f79ec..5a4722514 100644 --- a/gillespy2/solvers/numpy/tau_hybrid_solver.py +++ b/gillespy2/solvers/numpy/tau_hybrid_solver.py @@ -886,7 +886,7 @@ def __map_state(self, species, parameters, compiled_reactions, events, curr_stat return y0, y_map @classmethod - def get_solver_settings(self): + def get_solver_settings(cls): """ Returns a list of arguments supported by tau_hybrid_solver.run. :returns: Tuple of strings, denoting all keyword argument for this solvers run() method. diff --git a/gillespy2/solvers/numpy/tau_leaping_solver.py b/gillespy2/solvers/numpy/tau_leaping_solver.py index 8cda6fa12..b73e5555e 100644 --- a/gillespy2/solvers/numpy/tau_leaping_solver.py +++ b/gillespy2/solvers/numpy/tau_leaping_solver.py @@ -87,7 +87,7 @@ def __get_reactions(self, step, curr_state, curr_time, save_time, propensities, return rxn_count, curr_state, curr_time @classmethod - def get_solver_settings(self): + def get_solver_settings(cls): """ Returns a list of arguments supported by tau_leaping_solver.run. :returns: Tuple of strings, denoting all keyword argument for this solvers run() method.