Merge pull request #309 from CAMBI-tech/logging-fix

Logging fix

bcipy/simulator/helpers/log_utils.py

@@ -17,13 +17,10 @@ def fmt_likelihoods_for_hist(likelihoods, alp):
     return formatted
 
 
-def format_sample_rows(sample_rows: List[pd.DataFrame]):
-    formatted_rows = []
-    for row in sample_rows:
-        new_row = row.drop(columns=['eeg'], axis=1, inplace=False)
-        formatted_rows.append(new_row.to_string(index=False, header=True))
-
-    return ", ".join(formatted_rows)
+def format_sample_rows(sample_rows: List[pd.Series]) -> str:
+    """Returns a tabular representation of the sample rows."""
+    return pd.DataFrame(sample_rows).drop(columns=['eeg']).to_string(
+        index=False, header=True)
 
 
 def fmt_reshaped_evidence(evidences: Dict[str, SimEvidence]):

bcipy/simulator/helpers/sampler.py

@@ -55,11 +55,12 @@ def sample(self, state: SimState) -> np.ndarray:
                 raise TaskConfigurationException(
                     message="No eeg sample found with provided data and query")
 
-            row = filtered_data.sample(1)
+            row = filtered_data.sample(1).iloc[0]
             sample_rows.append(row)
 
         log.debug(f"EEG Samples: \n {format_sample_rows(sample_rows)}")
-        eeg_responses = [r['eeg'].to_numpy()[0] for r in sample_rows]
+
+        eeg_responses = [r['eeg'] for r in sample_rows]
         sample = self.model_input_reshaper(eeg_responses)
 
         return sample