From 5b8324b5233187d274f7c1c95beca426709fa3b3 Mon Sep 17 00:00:00 2001
From: PeterMeisrimelModelon
<92585725+PeterMeisrimelModelon@users.noreply.github.com>
Date: Thu, 11 Jan 2024 16:27:35 +0100
Subject: [PATCH] fixing the imports; work in progress
---
src/constants.pxi | 2 --
src/explicit_ode.pxd | 3 +--
src/explicit_ode.pyx | 22 +++++++++++-----------
src/ode.pxd | 2 +-
src/ode.pyx | 9 ++++-----
5 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/src/constants.pxi b/src/constants.pxi
index cf8999e9..2bdad2e3 100644
--- a/src/constants.pxi
+++ b/src/constants.pxi
@@ -45,7 +45,6 @@ NORMAL = WARNING
LOUD = INFO
SCREAM = DEBUG
-
DEF ID_OK = 0
DEF ID_DISCARD = 1
DEF ID_EVENT = 2
@@ -57,4 +56,3 @@ ID_PY_DISCARD = 1
ID_PY_EVENT = 2
ID_PY_COMPLETE = 3
ID_PY_FAIL = -1
-
diff --git a/src/explicit_ode.pxd b/src/explicit_ode.pxd
index 74a73158..c83ff540 100644
--- a/src/explicit_ode.pxd
+++ b/src/explicit_ode.pxd
@@ -15,11 +15,10 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this program. If not, see .
-
-from ode cimport ODE
import numpy as N
cimport numpy as N
+from assimulo.ode cimport ODE
cdef class Explicit_ODE(ODE):
diff --git a/src/explicit_ode.pyx b/src/explicit_ode.pyx
index 4881c18f..1ddc843d 100644
--- a/src/explicit_ode.pyx
+++ b/src/explicit_ode.pyx
@@ -17,19 +17,19 @@
# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
-from ode cimport ODE
-from problem import Explicit_Problem, Delay_Explicit_Problem, SingPerturbed_Problem, cExplicit_Problem
+cimport cython
import itertools
import sys
import numpy as N
cimport numpy as N
+from timeit import default_timer as timer
-cimport explicit_ode # .pxd
-cimport cython
+from assimulo.ode cimport ODE
+from assimulo.explicit_ode cimport Explicit_ODE, f_event_locator
-from exception import Explicit_ODE_Exception, TimeLimitExceeded, TerminateSimulation
-from timeit import default_timer as timer
+from assimulo.problem import Explicit_Problem, Delay_Explicit_Problem, SingPerturbed_Problem, cExplicit_Problem
+from assimulo.exception import Explicit_ODE_Exception, TimeLimitExceeded, TerminateSimulation
include "constants.pxi" #Includes the constants (textual include)
@@ -342,11 +342,11 @@ cdef class Explicit_ODE(ODE):
cdef N.ndarray[double, mode="c", ndim=1] g_high_c = N.empty(n_g, dtype = N.double)
cdef N.ndarray[double, mode="c", ndim=1] y_high_c = N.array(y_high)
cdef int nstatefcns = 0
- cdef int ret = explicit_ode.f_event_locator(len(y_high), n_g, 1.e-13, t_low, &t_high,
- &y_high_c[0], &g_low_c[0], &g_mid_c[0], &g_high_c[0],
- callback_event, self.event_func,
- callback_interp, self.interpolate,
- &nstatefcns)
+ cdef int ret = f_event_locator(len(y_high), n_g, 1.e-13, t_low, &t_high,
+ &y_high_c[0], &g_low_c[0], &g_mid_c[0], &g_high_c[0],
+ callback_event, self.event_func,
+ callback_interp, self.interpolate,
+ &nstatefcns)
self.statistics["nstatefcns"] += nstatefcns
if ret == ID_PY_EVENT:
diff --git a/src/ode.pxd b/src/ode.pxd
index 7190278c..a281cdb7 100644
--- a/src/ode.pxd
+++ b/src/ode.pxd
@@ -17,7 +17,7 @@
import numpy as N
cimport numpy as N
-from support cimport Statistics
+from assimulo.support cimport Statistics
cdef class ODE:
cdef public dict options, solver_options, problem_info
diff --git a/src/ode.pyx b/src/ode.pyx
index 915a9224..3e814a37 100644
--- a/src/ode.pyx
+++ b/src/ode.pyx
@@ -19,14 +19,13 @@
import numpy as N
cimport numpy as N
-from timeit import default_timer as timer
-
import itertools
import multiprocessing
+from timeit import default_timer as timer
-from exception import ODE_Exception, AssimuloException
-from problem import Explicit_Problem, Delay_Explicit_Problem, Implicit_Problem, SingPerturbed_Problem
-from support import Statistics
+from assimulo.exception import ODE_Exception, AssimuloException
+from assimulo.problem import Explicit_Problem, Delay_Explicit_Problem, Implicit_Problem, SingPerturbed_Problem
+from assimulo.support import Statistics
include "constants.pxi" #Includes the constants (textual include)