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.

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

function reconstruct_signal_hess #52

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions diffpy/snmf/subroutines.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,31 @@ def reconstruct_signal(components, signal_idx):
reconstruction += stretched_and_weighted
return reconstruction

def reconstruct_signal_hess(components, signal_idx):
"""Reconstruct a specific signal's hessian (second derivative) from its weighted and stretched components.

Calculates the linear combination of stretched components' hessians where each term is a stretched component's
hessian mulitplied by its weight factor.

Parameters
----------
components: tuple of ComponentSignal objects
The tuple containing the ComponentSignal objects
signal_idx: int
The index of the specific signal in the input data to be reconstructed.

Returns
-------
1d array like
The reconstruction of a signal's hessian from calculated weights, stretching factors, and iq values
"""
signal_length = len(components[0].grid)
reconstruction = np.zeros(signal_length)
for component in components:
stretched = component.apply_stretch(signal_idx)[2]
stretched_and_weighted = component.apply_weight(signal_idx, stretched)
reconstruction += stretched_and_weighted
return reconstruction
def initialize_arrays(number_of_components, number_of_moments, signal_length):
"""Generates the initial guesses for the weight, stretching, and component matrices

Expand Down
16 changes: 15 additions & 1 deletion diffpy/snmf/tests/test_subroutines.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from diffpy.snmf.containers import ComponentSignal
from diffpy.snmf.subroutines import objective_function, get_stretched_component, reconstruct_data, get_residual_matrix, \
update_weights_matrix, initialize_arrays, lift_data, initialize_components, construct_stretching_matrix, \
construct_component_matrix, construct_weight_matrix, update_weights, reconstruct_signal
construct_component_matrix, construct_weight_matrix, update_weights, reconstruct_signal, reconstruct_signal_hess

to = [
([[[1, 2], [3, 4]], [[5, 6], [7, 8]], 1e11, [[1, 2], [3, 4]], [[1, 2], [3, 4]], 1], 2.574e14),
Expand Down Expand Up @@ -251,3 +251,17 @@ def test_update_weights(tuw):
def test_reconstruct_signal(trs):
actual = reconstruct_signal(trs[0], trs[1])
assert len(actual) == len(trs[0][0].grid)

trsh = [([ComponentSignal([0, .25, .5, .75, 1], 2, 0), ComponentSignal([0, .25, .5, .75, 1], 2, 1),
ComponentSignal([0, .25, .5, .75, 1], 2, 2)], 1),
([ComponentSignal([0, .25, .5, .75, 1], 2, 0), ComponentSignal([0, .25, .5, .75, 1], 2, 1),
ComponentSignal([0, .25, .5, .75, 1], 2, 2)], 0),
([ComponentSignal([0, .25, .5, .75, 1], 3, 0), ComponentSignal([0, .25, .5, .75, 1], 3, 1),
ComponentSignal([0, .25, .5, .75, 1], 3, 2)], 2),
# ([ComponentSignal([0, .25, .5, .75, 1], 2, 0), ComponentSignal([0, .25, .5, .75, 1], 2, 1),
# ComponentSignal([0, .25, .5, .75, 1], 2, 2)], -1),
]
@pytest.mark.parametrize('trsh', trsh)
def test_reconstruct_signal_hess(trsh):
actual = reconstruct_signal(trsh[0], trsh[1])
assert len(actual) == len(trsh[0][0].grid)
Copy link
Contributor

@sbillinge sbillinge Oct 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be just testing the shape of the array handed back. Is that your intention?

Let's have a quick conversation about what you want to test here and then how best to do it.