Skip to content

Commit b87b8eb

Browse files
move out parameterized function type
1 parent 4239e6a commit b87b8eb

File tree

3 files changed

+2
-87
lines changed

3 files changed

+2
-87
lines changed

src/ParameterizedFunctions.jl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,9 @@ module ParameterizedFunctions
3030
include("fem.jl")
3131
include("macros.jl")
3232
include("utils.jl")
33-
include("parameterized_function_type.jl")
3433

35-
export @ode_def, @fem_def, ode_def_opts,
36-
@ode_def_bare, @ode_def_nohes, @ode_def_noinvjac, @ode_def_noinvhes,
37-
@ode_def_mm, @ode_def_nohes_mm, @ode_def_noinvjac, @ode_def_noinvhes_mm
38-
39-
export ParameterizedFunction, DAEParameterizedFunction, DDEParameterizedFunction
34+
export @ode_def, @fem_def, ode_def_opts,@ode_def_bare, @ode_def_nohes,
35+
@ode_def_noinvjac, @ode_def_noinvhes,@ode_def_noinvjac
4036

4137
end # module
4238

src/parameterized_function_type.jl

Lines changed: 0 additions & 63 deletions
This file was deleted.

test/runtests.jl

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,11 @@ end
3737
du[2] = -3 * u[2] + u[1]*u[2]
3838
end
3939

40-
pf_func = function (t,u,p,du)
41-
du[1] = p[1] * u[1] - p[2] * u[1]*u[2]
42-
du[2] = -3 * u[2] + u[1]*u[2]
43-
end
44-
45-
pf = ParameterizedFunction(pf_func,[1.5,1.0])
46-
47-
pf_func2 = function (t,u,p)
48-
[p[1] * u[1] - p[2] * u[1]*u[2];-3 * u[2] + u[1]*u[2]]
49-
end
50-
51-
pf2 = ParameterizedFunction(pf_func2,[1.5,1.0])
52-
5340
println("Test Values")
5441
@test param_values(f_t) == Real[1.5,1]
5542
@test param_values(f) == Real[1.5,1,3]
56-
@test param_values(pf) == Real[1.5,1]
5743
@test num_params(f_t) == 2
5844
@test num_params(f) == 3
59-
@test num_params(pf) == 2
6045
t = 1.0
6146
u = [2.0,3.0]
6247
du = zeros(2)
@@ -71,9 +56,6 @@ f_t(t,u,du)
7156
@test du == [2.0,-3.0]
7257
f_t2(t,u,du)
7358
@test du == [1.0,-3.0]
74-
pf(t,u,du)
75-
@test du == [-3.0,-3.0]
76-
@test pf2(t,u) == [-3.0,-3.0]
7759

7860
println("Test t-gradient")
7961
f(Val{:tgrad},t,u,grad)

0 commit comments

Comments
 (0)