Skip to content
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
2 changes: 1 addition & 1 deletion impedance/models/circuits/circuits.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def fit(self, frequencies, impedance, bounds=None,
if len(frequencies) != len(impedance):
raise TypeError('length of frequencies and impedance do not match')

if self.initial_guess != []:
if len(self.initial_guess) != 0:
parameters, conf = circuit_fit(frequencies, impedance,
self.circuit, self.initial_guess,
constants=self.constants,
Expand Down
26 changes: 26 additions & 0 deletions impedance/tests/test_model_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,29 @@ def test_model_io():

fitted_template = CustomCircuit()
fitted_template.load('test_io.json', fitted_as_initial=True)


def test_refit_after_load_fitted_as_initial():
# Regression test for #310: loading a fitted model with
# fitted_as_initial=True stores initial_guess as a numpy array, which
# broke the subsequent ``fit`` call because the emptiness check compared
# the array against ``[]`` (raising a broadcasting ValueError).
data = np.genfromtxt(os.path.join(".", "data",
"exampleData.csv"), delimiter=',')
frequencies = data[:, 0]
Z = data[:, 1] + 1j * data[:, 2]

randles = CustomCircuit(initial_guess=[.01, .005, .1, .005, .1, .9,
.001, 200],
circuit='R0-p(R1,C1)-p(R1,CPE1)-Wo1')
randles.fit(frequencies, Z)
randles.save('./test_io.json')

reloaded = CustomCircuit()
reloaded.load('./test_io.json', fitted_as_initial=True)
assert isinstance(reloaded.initial_guess, np.ndarray)

# Refitting must not raise; it previously failed with
# "operands could not be broadcast together with shapes (n,) (0,)"
reloaded.fit(frequencies, Z)
assert reloaded.parameters_ is not None