Skip to content

Commit 31b3220

Browse files
committed
Fix some minor bugs
1 parent b15c579 commit 31b3220

3 files changed

Lines changed: 9 additions & 8 deletions

File tree

src/continuous.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,5 @@ macro continuous(expr::Expr)
6565
push!(args, expr.args[i])
6666
end
6767
end
68-
esc(:(Continuous($func(), $(args...); $(params...))))
68+
esc(:(SimJulia.Continuous($func(), $(args...); $(params...))))
6969
end

src/odes/macros.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ macro model(expr::Expr)
5151
end
5252
end
5353
end
54-
println(zc_vec)
55-
println(neg_vec)
56-
println(pos_vec)
54+
#println(zc_vec)
55+
#println(neg_vec)
56+
#println(pos_vec)
5757
n = length(f_vec)
5858
m = length(zc_vec)
5959
deps = zeros(Bool, n, n)
@@ -67,9 +67,9 @@ macro model(expr::Expr)
6767
for (i, ex) in enumerate(zc_vec)
6868
check_dependencies(ex, zc_deps, i, expr.args[1].args[3])
6969
end
70-
println(deps)
71-
println(param_deps)
72-
println(zc_deps)
70+
#println(deps)
71+
#println(param_deps)
72+
#println(zc_deps)
7373
esc(:(function $func_name()
7474
f = Array{Function}($n)
7575
$((:(f[$(f_vec[i].args[1].args[2])] = ($(expr.args[1].args[2])::TaylorSeries.Taylor1{Float64}, $(expr.args[1].args[3])::Vector{TaylorSeries.Taylor1{Float64}}, $(expr.args[1].args[4])::Vector{Float64})->begin

test/continuous.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using SimJulia
2+
using Distributions
23

34
@model function simple(t, x, p, dx)
45
dx[1] = x[1]
@@ -13,7 +14,7 @@ end
1314
dx[2] = p[1]-100.0*x[1]-100.0*x[2]
1415
end
1516

16-
function report(sim::Simulation, cont::Continuous)
17+
function report(sim::Simulation, cont::SimJulia.Continuous)
1718
λ, P = eig([0.0 0.01; -100.0 -100.0])
1819
while true
1920
t = now(sim)

0 commit comments

Comments
 (0)