Skip to content
Open
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
19 changes: 11 additions & 8 deletions src/data_configs/data_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,20 @@ def load_dataset(self, **kwargs) -> DataSet:
del kwargs["features"]

recordings = self._load_dataset(**kwargs)

for recording in recordings:
if features != None:
recording.sensor_frame = recording.sensor_frame[features]

recording.sensor_frame = recording.sensor_frame.fillna(
method="ffill")

variance, mean = self._loadDataSetMeasures()
if variance is None or mean is None:
print(
"Calculating mean and variance of whole dataset once. This can take a while...")
"Calculating mean and variance of whole dataset once. This can take a while...")
startTime = datetime.now()
for recording in recordings:
if features != None:
recording.sensor_frame = recording.sensor_frame[features]

recording.sensor_frame = recording.sensor_frame.fillna(
method="ffill")
sensor_frames = tf.constant(np.concatenate(
[recording.sensor_frame.to_numpy() for recording in recordings], axis=0))
layer = tf.keras.layers.Normalization(axis=-1)
Expand All @@ -78,7 +81,7 @@ def load_dataset(self, **kwargs) -> DataSet:
return ds

# interface (subclass responsibility to define) ------------------------------------------------------------
def _load_dataset(self,**kwargs) -> "list[Recording]":
def _load_dataset(self, **kwargs) -> "list[Recording]":
raise NotImplementedError(
"init subclass of Config that defines the method activity_idx_to_activity_name"
)
Expand Down Expand Up @@ -167,4 +170,4 @@ def _loadMetadataDict(self):
return {}

def _getDataConfigIdentifier(self):
return type(self).__name__ + self.dataset_path + ", ".join(self.features) if self.features!=None else ""
return type(self).__name__ + self.dataset_path + ", ".join(self.features) if self.features != None else ""