Skip to content
Merged
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
4 changes: 2 additions & 2 deletions src/ezmsg/learn/process/adaptive_linear_regressor.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def partial_fit(self, message: AxisArray) -> None:
]:
# river path: needs numpy/pandas
data_np = np.asarray(message.data) if not is_numpy_array(message.data) else message.data
x = pd.DataFrame(data_np, columns=_axis_labels(message.axes["ch"].data))
x = pd.DataFrame(data_np, columns=[f"f{i}" for i in range(data_np.shape[1])])
targets = message.attrs["trigger"].value
target_np = np.asarray(targets.data)
if target_np.ndim == 1:
Expand Down Expand Up @@ -219,7 +219,7 @@ def _process(self, message: AxisArray) -> AxisArray | None:
]:
# river path: needs numpy/pandas
data_np = np.asarray(message.data) if not is_numpy_array(message.data) else message.data
x = pd.DataFrame(data_np, columns=_axis_labels(message.axes["ch"].data))
x = pd.DataFrame(data_np, columns=[f"f{i}" for i in range(data_np.shape[1])])
n_outputs = len(self.state.model) if isinstance(self.state.model, dict) else 1
out_labels = self._prediction_labels(n_outputs)
if isinstance(self.state.model, dict):
Expand Down
2 changes: 1 addition & 1 deletion src/ezmsg/learn/process/sklearn.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def partial_fit(self, message: AxisArray) -> None:
kwargs["classes"] = self.settings.partial_fit_classes
self._state.model.partial_fit(X, y, **kwargs)
elif hasattr(self._state.model, "learn_many"):
df_X = pd.DataFrame({k: v for k, v in zip(message.axes["ch"].data, message.data.T)})
df_X = pd.DataFrame(message.data, columns=[f"f{i}" for i in range(message.data.shape[1])])
name = (
message.attrs["trigger"].value.axes["ch"].data[0]
if hasattr(message.attrs["trigger"].value, "axes") and "ch" in message.attrs["trigger"].value.axes
Expand Down
Loading