Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: allow even more complex bindings #133

Merged
merged 2 commits into from
Oct 25, 2024
Merged

fix: allow even more complex bindings #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b5c666
fix: allow even more complex bindings
fjebaker Oct 4, 2024
9e4616d
fixup! fix: allow even more complex bindings
fjebaker Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/fitting/binding.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,22 @@ function _construct_bound_mapping(bindings, parameter_count)
parameter_mapping[b[1]][b[2]] = reference[2]

# mark for removal: find the parameter index in the global array
N = sum(length(parameter_mapping[q]) for q = 1:(b[1]-1))
N = if b[1] > 1
sum(length(parameter_mapping[q]) for q = 1:b[1]-1)
else
0
end
index = N + b[2]
push!(remove, index)

# need to now shuffle all the indices greater than this one down by 1
for k = (b[2]+1):length(parameter_mapping[b[1]])
for k = b[2]+1:length(parameter_mapping[b[1]])
if (parameter_mapping[b[1]][k] > parameter_number)
parameter_mapping[b[1]][k] -= 1
end
end
# and for subsequent models
for j = (b[1]+1):length(parameter_count)
for j = b[1]+1:length(parameter_count)
for k = 1:length(parameter_mapping[j])
if parameter_mapping[j][k] > parameter_number
parameter_mapping[j][k] -= 1
Expand Down
19 changes: 19 additions & 0 deletions test/fitting/test-binding.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,22 @@ new_bindings = SpectralFitting.adjust_free_bindings(prob.model, prob.bindings)
@test new_bindings == [[1 => 1, 2 => 3]]

# TODO: free parameters should not be allowed to bind to frozen parameters


# can we bind parameters within the same model
prob = FittingProblem(model1 => dummy_data1)
bind!(prob, 1 => :K_1, 1 => :a_1)
_, mapping = SpectralFitting._build_parameter_mapping(prob.model, prob.bindings)
@test mapping == ([1, 1, 2],)

# can we bind parameters within the same model
model1.a_2.frozen = false
prob = FittingProblem(model1 => dummy_data1, model1 => dummy_data1)
bind!(prob, 1 => :K_1, 2 => :K_1)
bind!(prob, 1 => :a_1, 2 => :a_1)
bind!(prob, 1 => :K_2, 2 => :K_2)
bind!(prob, 1 => :a_2, 2 => :a_2)
bind!(prob, 1 => :K_1, 1 => :a_1)
details(prob)
params, mapping = SpectralFitting._build_parameter_mapping(prob.model, prob.bindings)
@test mapping == ([1, 1, 2, 3], [1, 2, 2, 3])
Loading