Skip to content

Commit d2fcfce

Browse files
shengjiex98shengjiex98
committed
Fix naming of dynamic/dynamics.
1 parent 07dcc24 commit d2fcfce

26 files changed

+108
-108
lines changed

‎demo/dryvr_demo/cardiac_cell_agent.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ def __init__(
4040
super().__init__(id, code, file_name)
4141

4242
@staticmethod
43-
def dynamic_on(t, state):
43+
def dynamics_on(t, state):
4444
u, v = state
4545
u_dot = -0.9*u*u-u*u*u-0.9*u-v+1
4646
v_dot = u-2*v
4747
return [u_dot, v_dot]
4848

4949
@staticmethod
50-
def dynamic_off(t, state):
50+
def dynamics_off(t, state):
5151
u, v = state
5252
u_dot = -0.9*u*u-u*u*u-0.9*u-v
5353
v_dot = u-2*v
@@ -64,9 +64,9 @@ def TC_simulate(
6464
trace[0, 1:] = init
6565
for i in range(num_points):
6666
if mode[0]=="On":
67-
r = ode(self.dynamic_on)
67+
r = ode(self.dynamics_on)
6868
elif mode[0]=="Off":
69-
r = ode(self.dynamic_off)
69+
r = ode(self.dynamics_off)
7070
else:
7171
raise ValueError
7272
r.set_initial_value(init)

‎demo/dryvr_demo/lin_thermo.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ def __init__(
3131
super().__init__(id, code, file_name)
3232

3333
@staticmethod
34-
def dynamic_heat(t, state):
34+
def dynamics_heat(t, state):
3535
x = state
3636
x_dot = 40-0.5*x
3737
return [x_dot]
3838

3939
@staticmethod
40-
def dynamic_cool(t, state):
40+
def dynamics_cool(t, state):
4141
x = state
4242
x_dot = 30-0.5*x
4343
return [x_dot]
@@ -52,9 +52,9 @@ def TC_simulate(
5252
trace[0, 1:] = init
5353
for i in range(num_points):
5454
if mode[0]=="Heat":
55-
r = ode(self.dynamic_heat)
55+
r = ode(self.dynamics_heat)
5656
elif mode[0]=="Cool":
57-
r = ode(self.dynamic_cool)
57+
r = ode(self.dynamics_cool)
5858
else:
5959
raise ValueError
6060
r.set_initial_value(init)

‎demo/dryvr_demo/origin_agent.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def __init__(self, id, code=None, file_name=None):
1313
super().__init__(id, code, file_name)
1414

1515
@staticmethod
16-
def dynamic(t, state):
16+
def dynamics(t, state):
1717
x, y = state
1818
x = float(x)
1919
y = float(y)
@@ -32,7 +32,7 @@ def TC_simulate(
3232
trace = [[0] + list(init)]
3333
# print(trace)
3434
for i in range(len(t)):
35-
r = ode(self.dynamic)
35+
r = ode(self.dynamics)
3636
r.set_initial_value(init)
3737
res: np.ndarray = r.integrate(r.t + time_step)
3838
init = res.flatten().tolist()
@@ -47,7 +47,7 @@ def __init__(self, id, code=None, file_name=None):
4747
super().__init__(id, code, file_name)
4848

4949
@staticmethod
50-
def dynamic(t, state, rate):
50+
def dynamics(t, state, rate):
5151
temp, total_time, cycle_time = state
5252
temp = float(temp)
5353
total_time = float(total_time)
@@ -78,7 +78,7 @@ def TC_simulate(
7878
trace = np.array([0, *init])
7979
for i in range(len(t)):
8080
rate = self.action_handler(mode[0])
81-
r = ode(self.dynamic)
81+
r = ode(self.dynamics)
8282
r.set_initial_value(init).set_f_params(rate)
8383
res: np.ndarray = r.integrate(r.t + time_step)
8484
init = res.flatten().tolist()

‎demo/dryvr_demo/origin_agent_heat.py

+13-13
Large diffs are not rendered by default.

‎demo/dryvr_demo/sleeve_agent.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def __init__(self, id, code=None, file_name=None):
3434
super().__init__(id, code, file_name)
3535

3636
@staticmethod
37-
def dynamic_free(t, state):
37+
def dynamics_free(t, state):
3838
px, py, vx, vy, i = state
3939
vx_dot = Fs / ms
4040
vy_dot = -Rs * Tf / Jg2
@@ -44,7 +44,7 @@ def dynamic_free(t, state):
4444
return [px_dot, py_dot, vx_dot, vy_dot, i_dot]
4545

4646
@staticmethod
47-
def dynamic_meshed(t, state):
47+
def dynamics_meshed(t, state):
4848
px, py, vx, vy, i = state
4949
vx_dot = 0
5050
vy_dot = 0
@@ -64,9 +64,9 @@ def TC_simulate(
6464
trace = [[0] + init]
6565
for i in range(len(t)):
6666
if mode[0] == "Free":
67-
r = ode(self.dynamic_free)
67+
r = ode(self.dynamics_free)
6868
elif mode[0] == "Meshed":
69-
r = ode(self.dynamic_meshed)
69+
r = ode(self.dynamics_meshed)
7070
else:
7171
raise ValueError
7272
r.set_initial_value(init)

‎demo/fp_demos/brusselator.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def __init__(
2929
super().__init__(id, code, file_name)
3030

3131
@staticmethod
32-
def dynamic(t, state):
32+
def dynamics(t, state):
3333
x, y = state
3434
x_dot = 1+x**2*y-2.5*x
3535
y_dot = 1.5*x-x**2*y
@@ -44,7 +44,7 @@ def TC_simulate(
4444
trace[1:, 0] = [round(i * time_step, 10) for i in range(num_points)]
4545
trace[0, 1:] = init
4646
for i in range(num_points):
47-
r = ode(self.dynamic)
47+
r = ode(self.dynamics)
4848
r.set_initial_value(init)
4949
res: np.ndarray = r.integrate(r.t + time_step)
5050
init = res.flatten()

‎demo/fp_demos/buckling_col.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def __init__(
2929
super().__init__(id, code, file_name)
3030

3131
@staticmethod
32-
def dynamic(t, state):
32+
def dynamics(t, state):
3333
x, y = state
3434
x_dot = y
3535
y_dot = 2*x-x*x*x-0.2*y+0.1
@@ -44,7 +44,7 @@ def TC_simulate(
4444
trace[1:, 0] = [round(i * time_step, 10) for i in range(num_points)]
4545
trace[0, 1:] = init
4646
for i in range(num_points):
47-
r = ode(self.dynamic)
47+
r = ode(self.dynamics)
4848
r.set_initial_value(init)
4949
res: np.ndarray = r.integrate(r.t + time_step)
5050
init = res.flatten()

‎demo/fp_demos/cardiac_cell_agent.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ def __init__(
4141
super().__init__(id, code, file_name)
4242

4343
@staticmethod
44-
def dynamic_on(t, state):
44+
def dynamics_on(t, state):
4545
u, v = state
4646
u_dot = -0.9*u*u-u*u*u-0.9*u-v+1
4747
v_dot = u-2*v
4848
return [u_dot, v_dot]
4949

5050
@staticmethod
51-
def dynamic_off(t, state):
51+
def dynamics_off(t, state):
5252
u, v = state
5353
u_dot = -0.9*u*u-u*u*u-0.9*u-v
5454
v_dot = u-2*v
@@ -65,9 +65,9 @@ def TC_simulate(
6565
trace[0, 1:] = init
6666
for i in range(num_points):
6767
if mode[0]=="On":
68-
r = ode(self.dynamic_on)
68+
r = ode(self.dynamics_on)
6969
elif mode[0]=="Off":
70-
r = ode(self.dynamic_off)
70+
r = ode(self.dynamics_off)
7171
else:
7272
raise ValueError
7373
r.set_initial_value(init)

‎demo/fp_demos/helicopter.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def __init__(
3030
super().__init__(id, code, file_name)
3131

3232
@staticmethod
33-
def dynamic(t, state):
33+
def dynamics(t, state):
3434
x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15, x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28 = state
3535
x1_dot= (0.998573780060) *x4 + (0.053384274244) *x5
3636
x2_dot= x3 + (-0.003182219341) *x4 + (0.059524655342) *x5
@@ -72,7 +72,7 @@ def TC_simulate(
7272
trace[1:, 0] = [round(i * time_step, 10) for i in range(num_points)]
7373
trace[0, 1:] = init
7474
for i in range(num_points):
75-
r = ode(self.dynamic)
75+
r = ode(self.dynamics)
7676
r.set_initial_value(init)
7777
res: np.ndarray = r.integrate(r.t + time_step)
7878
init = res.flatten()

‎demo/fp_demos/jet_engine.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def __init__(
2929
super().__init__(id, code, file_name)
3030

3131
@staticmethod
32-
def dynamic(t, state):
32+
def dynamics(t, state):
3333
x, y = state
3434
x_dot = -y-1.5*x*x-0.5*x*x*x-0.5
3535
y_dot = 3*x-y
@@ -44,7 +44,7 @@ def TC_simulate(
4444
trace[1:, 0] = [round(i * time_step, 10) for i in range(num_points)]
4545
trace[0, 1:] = init
4646
for i in range(num_points):
47-
r = ode(self.dynamic)
47+
r = ode(self.dynamics)
4848
r.set_initial_value(init)
4949
res: np.ndarray = r.integrate(r.t + time_step)
5050
init = res.flatten()

‎demo/fp_demos/lin_thermo.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ def __init__(
2929
super().__init__(id, code, file_name)
3030

3131
@staticmethod
32-
def dynamic_heat(t, state):
32+
def dynamics_heat(t, state):
3333
x = state
3434
x_dot = 40-0.5*x
3535
return [x_dot]
3636

3737
@staticmethod
38-
def dynamic_cool(t, state):
38+
def dynamics_cool(t, state):
3939
x = state
4040
x_dot = 30-0.5*x
4141
return [x_dot]
@@ -50,9 +50,9 @@ def TC_simulate(
5050
trace[0, 1:] = init
5151
for i in range(num_points):
5252
if mode[0]=="Heat":
53-
r = ode(self.dynamic_heat)
53+
r = ode(self.dynamics_heat)
5454
elif mode[0]=="Cool":
55-
r = ode(self.dynamic_cool)
55+
r = ode(self.dynamics_cool)
5656
else:
5757
raise ValueError
5858
r.set_initial_value(init)

‎demo/fp_demos/nav_sys.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,28 @@ def __init__(
3131
super().__init__(id, code, file_name)
3232

3333
@staticmethod
34-
def dynamic_z1(t, state):
34+
def dynamics_z1(t, state):
3535
x, y, vx, vy = state
3636
vx_dot = -1.2*vx+0.1*vy-0.1
3737
vy_dot = 0.1*vx-1.2*vy+1.2
3838
return [vx, vy, vx_dot, vy_dot]
3939

4040
@staticmethod
41-
def dynamic_z2(t, state):
41+
def dynamics_z2(t, state):
4242
x, y, vx, vy = state
4343
vx_dot = -1.2*vx+0.1*vy-4.8
4444
vy_dot = 0.1*vx-1.2*vy+0.4
4545
return [vx, vy, vx_dot, vy_dot]
4646

4747
@staticmethod
48-
def dynamic_z3(t, state):
48+
def dynamics_z3(t, state):
4949
x, y, vx, vy = state
5050
vx_dot = -1.2*vx+0.1*vy+2.4
5151
vy_dot = 0.1*vx-1.2*vy-0.2
5252
return [vx, vy, vx_dot, vy_dot]
5353

5454
@staticmethod
55-
def dynamic_z4(t, state):
55+
def dynamics_z4(t, state):
5656
x, y, vx, vy = state
5757
vx_dot = -1.2*vx+0.1*vy+3.9
5858
vy_dot = 0.1*vx-1.2*vy-3.9
@@ -68,13 +68,13 @@ def TC_simulate(
6868
trace[0, 1:] = init
6969
for i in range(num_points):
7070
if mode[0]=="Zone1":
71-
r = ode(self.dynamic_z1)
71+
r = ode(self.dynamics_z1)
7272
elif mode[0]=="Zone2":
73-
r = ode(self.dynamic_z2)
73+
r = ode(self.dynamics_z2)
7474
elif mode[0]=="Zone3":
75-
r = ode(self.dynamic_z3)
75+
r = ode(self.dynamics_z3)
7676
elif mode[0]=="Zone4":
77-
r = ode(self.dynamic_z4)
77+
r = ode(self.dynamics_z4)
7878
else:
7979
raise ValueError
8080
r.set_initial_value(init)

‎demo/fp_demos/power_train.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def __init__(
2929
super().__init__(id, code, file_name)
3030

3131
@staticmethod
32-
def dynamic_mode0(t, state):
32+
def dynamics_mode0(t, state):
3333
p, lam, pe, ivalue, t_int = state
3434
p_dot = -476.851246128715*p**2 + 563.63999719734*p - 65.460328416
3535
lam_dot= -4*lam - 33.3965838336589*p**2 + 99.359272121109*p + 33.8518550719433*pe**2 - 100.713764517065*pe - 4*(-5.05643107459819*p**2 + 15.0435539636327*p - 5.244048)*(-0.240071819537891*pe**2 + 0.714245545738554*pe - 0.248979591836735) + 4*(-4.97822527866553*pe**2 + 14.8108813346529*pe - 5.16294040816327)*(-0.240071819537891*pe**2 + 0.714245545738554*pe - 0.248979591836735) + 56.0441639020408
@@ -39,7 +39,7 @@ def dynamic_mode0(t, state):
3939
return [p_dot, lam_dot, pe_dot, ivalue_dot, t_dot]
4040

4141
@staticmethod
42-
def dynamic_mode1(t, state):
42+
def dynamics_mode1(t, state):
4343
p, lam, pe, ivalue, t_int = state
4444
p_dot= -476.851246128715*p**2 + 563.63999719734*p - 66.685538304
4545
lam_dot= -4*lam - 33.3965838336589*p**2 + 99.359272121109*p + 82.9456*(0.0680272108843537*ivalue + 0.00272108843537415*lam + 0.0280272108843537)**2*(-3.529055747207*pe**2 + 10.4994095223567*pe - 0.366)**2 - 4*(0.0680272108843537*ivalue + 0.00272108843537415*lam + 0.0280272108843537)*(-5.05643107459819*p**2 + 15.0435539636327*p - 0.5244048)*(-3.529055747207*pe**2 + 10.4994095223567*pe - 0.366) - 141.0072*(0.0680272108843537*ivalue + 0.00272108843537415*lam + 0.0280272108843537)*(-3.529055747207*pe**2 + 10.4994095223567*pe - 0.366) + 52.10842488
@@ -59,9 +59,9 @@ def TC_simulate(
5959
trace[0, 1:] = init
6060
for i in range(num_points):
6161
if mode[0]=="Mode0":
62-
r = ode(self.dynamic_mode0)
62+
r = ode(self.dynamics_mode0)
6363
elif mode[0]=="Mode1":
64-
r = ode(self.dynamic_mode1)
64+
r = ode(self.dynamics_mode1)
6565
else:
6666
raise ValueError
6767
r.set_initial_value(init)

‎demo/fp_demos/robot.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def __init__(
2929
super().__init__(id, code, file_name)
3030

3131
@staticmethod
32-
def dynamic(t, state):
32+
def dynamics(t, state):
3333
x0, x1, x2, x3 = state
3434
x0_dot = x2
3535
x1_dot = x3
@@ -46,7 +46,7 @@ def TC_simulate(
4646
trace[1:, 0] = [round(i * time_step, 10) for i in range(num_points)]
4747
trace[0, 1:] = init
4848
for i in range(num_points):
49-
r = ode(self.dynamic)
49+
r = ode(self.dynamics)
5050
r.set_initial_value(init)
5151
res: np.ndarray = r.integrate(r.t + time_step)
5252
init = res.flatten()

0 commit comments

Comments
 (0)