Skip to content

Commit cdc846a

Browse files
add parameter ranges to all representations
1 parent 56ae33b commit cdc846a

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

src/main/python/systemds/scuro/representations/timeseries_representations.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def compute_feature(self, signal):
184184
@register_representation([ModalityType.TIMESERIES])
185185
class SpectralCentroid(TimeSeriesRepresentation):
186186
def __init__(self, fs=1.0):
187-
super().__init__("SpectralCentroid", parameters={"fs": [1.0]})
187+
super().__init__("SpectralCentroid", parameters={"fs": [0.5, 1.0, 2.0]})
188188
self.fs = fs
189189

190190
def compute_feature(self, signal):
@@ -199,7 +199,8 @@ def compute_feature(self, signal):
199199
class BandpowerFFT(TimeSeriesRepresentation):
200200
def __init__(self, fs=1.0, f1=0.0, f2=0.5):
201201
super().__init__(
202-
"BandpowerFFT", parameters={"fs": [1.0], "f1": [0.0], "f2": [0.5]}
202+
"BandpowerFFT",
203+
parameters={"fs": [0.5, 1.0], "f1": [0.0, 1.0], "f2": [0.5, 1.0]},
203204
)
204205
self.fs = fs
205206
self.f1 = f1

src/main/python/systemds/scuro/representations/vgg.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ def forward(self, input_: torch.Tensor) -> torch.Tensor:
5353
self.model.fc = Identity()
5454

5555
def _get_parameters(self):
56-
parameters = {"layer_name": []}
57-
58-
parameters["layer_name"] = [
59-
"features.35",
60-
"classifier.0",
61-
"classifier.3",
62-
"classifier.6",
63-
]
56+
parameters = {
57+
"layer_name": [
58+
"features.35",
59+
"classifier.0",
60+
"classifier.3",
61+
"classifier.6",
62+
]
63+
}
6464

6565
return parameters
6666

src/main/python/systemds/scuro/representations/window_aggregation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def window_aggregate_nested_level(self, instance, new_length):
171171
class StaticWindow(Window):
172172
def __init__(self, aggregation_function="mean", num_windows=100):
173173
super().__init__("StaticWindow", aggregation_function)
174-
self.parameters["num_windows"] = [num_windows]
174+
self.parameters["num_windows"] = [10, num_windows]
175175
self.num_windows = int(num_windows)
176176

177177
def execute(self, modality):
@@ -202,7 +202,7 @@ def execute(self, modality):
202202
class DynamicWindow(Window):
203203
def __init__(self, aggregation_function="mean", num_windows=100):
204204
super().__init__("DynamicWindow", aggregation_function)
205-
self.parameters["num_windows"] = [num_windows]
205+
self.parameters["num_windows"] = [10, num_windows]
206206
self.num_windows = int(num_windows)
207207

208208
def execute(self, modality):

0 commit comments

Comments
 (0)