Skip to content

Commit 02a3102

Browse files
committed
spellcheck + hrunic
1 parent cdc1b25 commit 02a3102

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

benchmarking/benchmarks.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1285,7 +1285,7 @@ benchmarks = Dict(
12851285
:ode => @ODEmodel(
12861286
C'(t) = u(t) - k1 * C(t) / (k2 + C(t)),
12871287
T'(t) = ka * T(t) - kb * C(t) * T(t) / (kc + T(t)) - kd * T(t) * I(t),
1288-
I'(t) = X(t) - ke * T(t) * I(t) - kf * C(t) * I(t) - kg * I(t) * Y(t) - kh * I(t),
1288+
I'(t) = X(t) - ke * T(t) * I(t) - kf * C(t) * I(t) - kg * I(t) * Y(t) - kh * I(t),
12891289
X'(t) = C(t) / (1 + C(t) * ki_inv) - kj * X(t) - kk * X(t) * Y(t),
12901290
Y'(t) = I(t) / (1 + C(t) * kl_inv) - km * Y(t) * C(t),
12911291
y(t) = T(t)

src/output_saturation.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
saturate_outputs(ode, orders, max_deg = 5)
33
44
Adds extra outputs extracted from the Lie derivatives of the existing outputs up to the prescribed order.
5-
Adds only the outputs which are algebraically independent over the existing outputs, paramaters, and inputs
5+
Adds only the outputs which are algebraically independent over the existing outputs, parameters, and inputs
66
(and, thus, may be useful in the differential elimination process).
77
88
Inputs:
@@ -13,10 +13,10 @@ Inputs:
1313
Output: a new ode model with inputs inserted
1414
"""
1515
function saturate_outputs(
16-
ode::ODE{P},
17-
orders::Dict{P, Int},
18-
max_deg = 5,
19-
) where {P <: MPolyRingElem}
16+
ode::ODE{P},
17+
orders::Dict{P, Int},
18+
max_deg = 5,
19+
) where {P <: MPolyRingElem}
2020
lie_ders = lie_derivatives_up_to(ode, Dict(ode.y_equations[y] => ord for (y, ord) in orders))
2121
@info "Degrees: $([(total_degree(numerator(f)), total_degree(denominator(f))) for f in lie_ders])"
2222

@@ -28,7 +28,7 @@ function saturate_outputs(
2828
current_y = RationalFunctionField([generators(current_y)..., f])
2929
end
3030
end
31-
new_outputs = generators(current_y)[length(ode.y_vars) + length(ode.u_vars) + length(ode.parameters) + 1 : end]
31+
new_outputs = generators(current_y)[(length(ode.y_vars) + length(ode.u_vars) + length(ode.parameters) + 1):end]
3232

3333
idx = 1
3434
old_y_names = map(var_to_str, ode.y_vars)

src/primality_check.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function check_primality_zerodim(J::Array{QQMPolyRingElem, 1})
1818
push!(matrices, M)
1919
end
2020
generic_multiplication = sum(Nemo.QQ(rand(1:100)) * M for M in matrices)
21-
@debug "Generic mulitplication matrix computed"
21+
@debug "Generic multiplication matrix computed"
2222
@debug "Trying reductions over primed first"
2323
NUM_PRIMES = 10
2424
p = 2^31 - 1

test/y_saturation.jl

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if GROUP == "All" || GROUP == "Core"
3030
y5(t) = x2(t),
3131
y6(t) = x12(t)
3232
)
33-
33+
3434
nfkb_orders = propose_orders(nfkb)
3535
new_nfkb = saturate_outputs(nfkb, nfkb_orders)
3636
@test length(new_nfkb.y_vars) == 14
@@ -41,25 +41,25 @@ if GROUP == "All" || GROUP == "Core"
4141

4242
# TumorPilis model from the benchmarks
4343
tum_pil = @ODEmodel(
44-
T'(t) =
45-
a * T(t) * (1 - b * T(t)) - c1 * N(t) * T(t) - D(t) * T(t) -
46-
KT * M(t) * T(t), #tumor cells
47-
L'(t) =
48-
-m * L(t) - q * L(t) * T(t) - ucte * L(t)^2 +
49-
r2 * C(t) * T(t) +
50-
pI * L(t) * I(t) / (gI + I(t)) +
51-
u1(t) - KL * M(t) * L(t), # tumor-specific effector cells, T-celss
52-
N'(t) =
53-
alpha1 - f * N(t) + g * T(t) * N(t) / (h + T(t)) - p * N(t) * T(t) - KN * M(t) * N(t), # non-specific effector cells, NK cells
54-
C'(t) = alpha2 - beta * C(t) - KC * M(t) * C(t), #circulating lymphocytes
55-
I'(t) =
56-
pt * T(t) * L(t) / (gt + T(t)) + w * L(t) * I(t) - muI * I(t) + u2(t), # IL-2, VI = u2 aplicación directa, terapia de IL2
57-
M'(t) = -gamma * M(t) + u1(t), #chemotherapy drug, terapia/aplicación de quimio, u1 = VM
58-
y1(t) = L(t),
59-
y2(t) = N(t),
60-
y3(t) = M(t)
61-
)
62-
44+
T'(t) =
45+
a * T(t) * (1 - b * T(t)) - c1 * N(t) * T(t) - D(t) * T(t) -
46+
KT * M(t) * T(t), #tumor cells
47+
L'(t) =
48+
-m * L(t) - q * L(t) * T(t) - ucte * L(t)^2 +
49+
r2 * C(t) * T(t) +
50+
pI * L(t) * I(t) / (gI + I(t)) +
51+
u1(t) - KL * M(t) * L(t), # tumor-specific effector cells, T-celss
52+
N'(t) =
53+
alpha1 - f * N(t) + g * T(t) * N(t) / (h + T(t)) - p * N(t) * T(t) - KN * M(t) * N(t), # non-specific effector cells, NK cells
54+
C'(t) = alpha2 - beta * C(t) - KC * M(t) * C(t), #circulating lymphocytes
55+
I'(t) =
56+
pt * T(t) * L(t) / (gt + T(t)) + w * L(t) * I(t) - muI * I(t) + u2(t), # IL-2, VI = u2 aplicación directa, terapia de IL2
57+
M'(t) = -gamma * M(t) + u1(t), #chemotherapy drug, terapia/aplicación de quimio, u1 = VM
58+
y1(t) = L(t),
59+
y2(t) = N(t),
60+
y3(t) = M(t)
61+
)
62+
6363
tum_pil_orders = propose_orders(tum_pil)
6464
new_tum_pil = saturate_outputs(tum_pil, tum_pil_orders)
6565
@test length(new_tum_pil.y_vars) == 6

0 commit comments

Comments
 (0)