Skip to content

Fix TimeResponseData.to_pandas() to handle zero state case #958

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

Merged
merged 1 commit into from
Jan 10, 2024
Merged

Fix TimeResponseData.to_pandas() to handle zero state case #958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions control/tests/timeresp_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1230,6 +1230,14 @@ def test_to_pandas():
np.testing.assert_equal(df['x[0]'], resp.states[0])
np.testing.assert_equal(df['x[1]'], resp.states[1])

# System with no states
sys = ct.ss([], [], [], 5)
resp = ct.input_output_response(sys, timepts, np.sin(timepts), t_eval=T)
df = resp.to_pandas()
np.testing.assert_equal(df['time'], resp.time)
np.testing.assert_equal(df['u[0]'], resp.inputs)
np.testing.assert_equal(df['y[0]'], resp.inputs * 5)


@pytest.mark.skipif(pandas_check(), reason="pandas installed")
def test_no_pandas():
Expand Down
15 changes: 9 additions & 6 deletions control/timeresp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,12 +678,15 @@ def to_pandas(self):

# Create a dict for setting up the data frame
data = {'time': self.time}
data.update(
{name: self.u[i] for i, name in enumerate(self.input_labels)})
data.update(
{name: self.y[i] for i, name in enumerate(self.output_labels)})
data.update(
{name: self.x[i] for i, name in enumerate(self.state_labels)})
if self.ninputs > 0:
data.update(
{name: self.u[i] for i, name in enumerate(self.input_labels)})
if self.noutputs > 0:
data.update(
{name: self.y[i] for i, name in enumerate(self.output_labels)})
if self.nstates > 0:
data.update(
{name: self.x[i] for i, name in enumerate(self.state_labels)})

return pandas.DataFrame(data)

Expand Down