From 1eefe44b1dea49801ad33849e943dc87946e00dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Bla=C3=9F?= <michael.blass@uni-hamburg.de>
Date: Fri, 12 Jun 2020 12:33:11 +0200
Subject: [PATCH] Fixes for TimbreTrackAlt.
---
src/comsar/_tracks/timbre.py | 7 +++----
src/comsar/_tracks/utilities.py | 7 +++++++
src/comsar/tracks.py | 1 +
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/comsar/_tracks/timbre.py b/src/comsar/_tracks/timbre.py
index a0041fc..8a91ef9 100644
--- a/src/comsar/_tracks/timbre.py
+++ b/src/comsar/_tracks/timbre.py
@@ -16,7 +16,7 @@ from apollon.tools import time_stamp
import comsar
from comsar._tracks.utilities import (TrackMeta, TrackResult,
- TimbreTrackParams)
+ TimbreTrackParams, TimbreTrackAltParams)
STFT_DEFAULT = container.StftParams(fps=44100, window='hamming', n_fft=None,
@@ -125,9 +125,8 @@ class TimbreTrackAlt:
"""
Args:
"""
- self.params = TimbreTrackParams(stft_params or STFT_DEFAULT,
- corr_dim_params or CORR_DIM_DEFAULT,
- corr_gram_params or CORR_GRAM_DEFAULT)
+ self.params = TimbreTrackAltParams(stft_params or STFT_DEFAULT,
+ corr_dim_params or CORR_DIM_DEFAULT)
self.cutter = Segmentation(self.params.stft.n_perseg,
self.params.stft.n_overlap,
diff --git a/src/comsar/_tracks/utilities.py b/src/comsar/_tracks/utilities.py
index 549acbf..5b54ee2 100644
--- a/src/comsar/_tracks/utilities.py
+++ b/src/comsar/_tracks/utilities.py
@@ -42,6 +42,13 @@ class TimbreTrackParams(TrackParams):
corr_gram: signal.container.CorrGramParams
+@dataclass
+class TimbreTrackAltParams(TrackParams):
+ """Parameter set for TimbreTrack"""
+ stft: signal.container.StftParams
+ corr_dim: signal.container.CorrDimParams
+
+
class TrackResult:
"""Provide track results."""
def __init__(self, meta: TrackMeta, params: TrackParams,
diff --git a/src/comsar/tracks.py b/src/comsar/tracks.py
index 969dbf1..03c48ab 100644
--- a/src/comsar/tracks.py
+++ b/src/comsar/tracks.py
@@ -1 +1,2 @@
from . _tracks.timbre import TimbreTrack
+from . _tracks.timbre import TimbreTrackAlt
--
GitLab