From e9554328718af0b452dfa1d7ff11bb7e018d49fd Mon Sep 17 00:00:00 2001 From: Bryan Rumsey Date: Thu, 13 Jan 2022 14:26:05 -0500 Subject: [PATCH] Fixed 'SimulationError' import issue. --- 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/ode_solver.py | 2 +- gillespy2/solvers/numpy/ssa_solver.py | 3 ++- gillespy2/solvers/numpy/tau_leaping_solver.py | 2 +- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/gillespy2/solvers/cpp/ode_c_solver.py b/gillespy2/solvers/cpp/ode_c_solver.py index 43a59a776..4bde7118b 100644 --- a/gillespy2/solvers/cpp/ode_c_solver.py +++ b/gillespy2/solvers/cpp/ode_c_solver.py @@ -19,7 +19,8 @@ from gillespy2.solvers.cpp.c_decoder import BasicSimDecoder from gillespy2.solvers.utilities import solverutils as cutils -from gillespy2.core import GillesPySolver, gillespyError, Model +from gillespy2.core import GillesPySolver, Model +from gillespy2.core.gillespyError import * from gillespy2.core import Results from .c_solver import CSolver, SimulationReturnCode diff --git a/gillespy2/solvers/cpp/ssa_c_solver.py b/gillespy2/solvers/cpp/ssa_c_solver.py index 34867e40e..7aa81d2e7 100644 --- a/gillespy2/solvers/cpp/ssa_c_solver.py +++ b/gillespy2/solvers/cpp/ssa_c_solver.py @@ -20,7 +20,8 @@ from gillespy2.solvers.cpp.c_decoder import IterativeSimDecoder from gillespy2.solvers.utilities import solverutils as cutils -from gillespy2.core import GillesPySolver, gillespyError, Model +from gillespy2.core import GillesPySolver, Model +from gillespy2.core.gillespyError import * from gillespy2.core import Results from .c_solver import CSolver, SimulationReturnCode diff --git a/gillespy2/solvers/cpp/tau_hybrid_c_solver.py b/gillespy2/solvers/cpp/tau_hybrid_c_solver.py index f3d41a02f..a18a9b850 100644 --- a/gillespy2/solvers/cpp/tau_hybrid_c_solver.py +++ b/gillespy2/solvers/cpp/tau_hybrid_c_solver.py @@ -1,7 +1,8 @@ import gillespy2 from gillespy2.solvers.cpp.c_decoder import IterativeSimDecoder from gillespy2.solvers.utilities import solverutils as cutils -from gillespy2.core import GillesPySolver, gillespyError, Model +from gillespy2.core import GillesPySolver, Model +from gillespy2.core.gillespyError import * from typing import Union from gillespy2.core import Results diff --git a/gillespy2/solvers/cpp/tau_leaping_c_solver.py b/gillespy2/solvers/cpp/tau_leaping_c_solver.py index c56a98ea9..36d1d34aa 100644 --- a/gillespy2/solvers/cpp/tau_leaping_c_solver.py +++ b/gillespy2/solvers/cpp/tau_leaping_c_solver.py @@ -19,7 +19,8 @@ from gillespy2.solvers.cpp.c_decoder import IterativeSimDecoder from gillespy2.solvers.utilities import solverutils as cutils -from gillespy2.core import GillesPySolver, gillespyError, Model +from gillespy2.core import GillesPySolver, Model +from gillespy2.core.gillespyError import * from gillespy2.core import Results from .c_solver import CSolver, SimulationReturnCode diff --git a/gillespy2/solvers/numpy/ode_solver.py b/gillespy2/solvers/numpy/ode_solver.py index acd5efc58..957346903 100644 --- a/gillespy2/solvers/numpy/ode_solver.py +++ b/gillespy2/solvers/numpy/ode_solver.py @@ -22,7 +22,7 @@ from scipy.integrate import ode from collections import OrderedDict import numpy as np -from gillespy2.core import GillesPySolver, log, gillespyError +from gillespy2.core import GillesPySolver, log, gillespyError, SimulationError from gillespy2.solvers.utilities import solverutils as nputils from gillespy2.core.results import Results diff --git a/gillespy2/solvers/numpy/ssa_solver.py b/gillespy2/solvers/numpy/ssa_solver.py index 5056b6fba..46c1984cf 100644 --- a/gillespy2/solvers/numpy/ssa_solver.py +++ b/gillespy2/solvers/numpy/ssa_solver.py @@ -18,7 +18,8 @@ from threading import Thread, Event from gillespy2.core.results import Results -from gillespy2.core import GillesPySolver, log, gillespyError +from gillespy2.core import GillesPySolver, log +from gillespy2.core.gillespyError import * from gillespy2.solvers.utilities import solverutils as nputils import random import math diff --git a/gillespy2/solvers/numpy/tau_leaping_solver.py b/gillespy2/solvers/numpy/tau_leaping_solver.py index 09e510af7..a54766a47 100644 --- a/gillespy2/solvers/numpy/tau_leaping_solver.py +++ b/gillespy2/solvers/numpy/tau_leaping_solver.py @@ -24,7 +24,7 @@ from gillespy2.solvers.utilities import Tau from gillespy2.solvers.utilities import solverutils as nputils from gillespy2.core import GillesPySolver, log, liveGraphing -from gillespy2.core import ModelError, ExecutionError +from gillespy2.core.gillespyError import * from gillespy2.core.results import Results class TauLeapingSolver(GillesPySolver):