Skip to content

Commit 521fabe

Browse files
cwhansekandersolar
andauthored
Apply suggestions from code review
Co-authored-by: Kevin Anderson <[email protected]>
1 parent 78f2a69 commit 521fabe

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

pvlib/ivtools/sdm.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,9 @@ def fit_desoto(v_mp, i_mp, v_oc, i_sc, alpha_sc, beta_voc, cells_in_series,
232232
for key in init_guess:
233233
if key in init_guess_keys:
234234
init[key] = init_guess[key]
235-
235+
else:
236+
raise ValueError(f"'{key}' is not a valid name; "
237+
f"allowed values are {init_guess_keys}")
236238
# params_i : initial values vector
237239
params_i = np.array([init[k] for k in init_guess_keys])
238240

pvlib/tests/ivtools/test_sdm.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,11 @@ def test_fit_desoto_init_guess(mocker):
8484
init_guess_array = np.array([9.4, 3.0e-10, 0.3, 125., 1.6])
8585
init_guess = {k: v for k, v in zip(
8686
['IL_0', 'Io_0', 'Rs_0', 'Rsh_0', 'a_0'], init_guess_array)}
87-
mocker.spy(optimize, 'root')
88-
root_args = {} # to fill out call for test
87+
spy = mocker.spy(optimize, 'root')
8988
result, _ = sdm.fit_desoto(v_mp=31.0, i_mp=8.71, v_oc=38.3, i_sc=9.43,
9089
alpha_sc=0.005658, beta_voc=-0.13788,
9190
cells_in_series=60, init_guess=init_guess)
92-
optimize.root.assert_called_once_with(mocker.ANY,
93-
x0=pytest.approx(init_guess_array),
94-
args=mocker.ANY,
95-
**root_args)
91+
np.testing.assert_array_equal(init_guess_array, spy.call_args[1]['x0'])
9692

9793

9894
def test_fit_desoto_failure():

0 commit comments

Comments
 (0)