@@ -17,17 +17,17 @@ Base.@kwdef mutable struct ExpuhNode{P, A<:AbstractFloat} <: IHACRESNode
1717
1818 storage_coef:: P = Param (2.9 , bounds= (0.2 , 10.0 ))
1919
20- level_params:: Array{P, 1} = [
21- Param (- 0.01 , bounds= (- 10.0 , - 0.01 )), # p1
22- Param (0.8 , bounds= (0.0 , 1.5 )), # p2
23- Param (4.5 , bounds= (0.0 , 20.0 )), # p3
24- Param (5.0 , bounds= (1.0 , 10.0 )), # p4
25- Param (0.35 , bounds= (0.0 , 1.0 )), # p5
26- Param (1.41 , bounds= (- 2.0 , 2.0 )), # p6
27- Param (- 1.45 , bounds= (- 2.5 , 0.0 )), # p7
28- Param (6.75 , bounds= (0.0 , 10.0 )), # p8
29- Param (150.0 , bounds= (50.0 , 200.0 )) # ctf
30- ]
20+ # level_params::Array{P, 1} = [
21+ # Param(-0.01, bounds=(-10.0, -0.01)), # p1
22+ # Param(0.8, bounds=(0.0, 1.5)), # p2
23+ # Param(4.5, bounds=(0.0, 20.0)), # p3
24+ # Param(5.0, bounds=(1.0, 10.0)), # p4
25+ # Param(0.35, bounds=(0.0, 1.0)), # p5
26+ # Param(1.41, bounds=(-2.0, 2.0)), # p6
27+ # Param(-1.45, bounds=(-2.5, 0.0)), # p7
28+ # Param(6.75, bounds=(0.0, 10.0)), # p8
29+ # Param(150.0, bounds=(50.0, 200.0)) # ctf
30+ # ]
3131
3232 storage:: Array{A} = [100.0 ]
3333 quick_store:: Array{A} = [0.0 ]
@@ -47,17 +47,17 @@ function ExpuhNode(name::String, spec::Dict)
4747 node_params = spec[" parameters" ]
4848 n_lparams = n. level_params
4949 s_lparams = spec[" level_params" ]
50- node_params[" level_params" ] = Param[
51- Param (s_lparams[1 ], bounds= n_lparams[1 ]. bounds)
52- Param (s_lparams[2 ], bounds= n_lparams[2 ]. bounds)
53- Param (s_lparams[3 ], bounds= n_lparams[3 ]. bounds)
54- Param (s_lparams[4 ], bounds= n_lparams[4 ]. bounds)
55- Param (s_lparams[5 ], bounds= n_lparams[5 ]. bounds)
56- Param (s_lparams[6 ], bounds= n_lparams[6 ]. bounds)
57- Param (s_lparams[7 ], bounds= n_lparams[7 ]. bounds)
58- Param (s_lparams[8 ], bounds= n_lparams[8 ]. bounds)
59- Param (s_lparams[9 ], bounds= n_lparams[9 ]. bounds)
60- ]
50+ # node_params["level_params"] = Param[
51+ # Param(s_lparams[1], bounds=n_lparams[1].bounds)
52+ # Param(s_lparams[2], bounds=n_lparams[2].bounds)
53+ # Param(s_lparams[3], bounds=n_lparams[3].bounds)
54+ # Param(s_lparams[4], bounds=n_lparams[4].bounds)
55+ # Param(s_lparams[5], bounds=n_lparams[5].bounds)
56+ # Param(s_lparams[6], bounds=n_lparams[6].bounds)
57+ # Param(s_lparams[7], bounds=n_lparams[7].bounds)
58+ # Param(s_lparams[8], bounds=n_lparams[8].bounds)
59+ # Param(s_lparams[9], bounds=n_lparams[9].bounds)
60+ # ]
6161
6262 node_params[" storage" ] = [node_params[" initial_storage" ]]
6363 delete! (node_params, " initial_storage" )
0 commit comments