Complete migration of SPATZ to this repository

spatz/sensors/__init__.py

@@ -1,6 +1,4 @@
-from sensor import Sensor
-from compound import CompoundSensor
-
-from imu import Accelerometer
-from imu import Gyroscope
-from imu import IMU
+from spatz.sensors.sensor import Sensor
+from spatz.sensors.imu import Accelerometer, Gyroscope, IMU
+from spatz.sensors.pressure import PressureSensor
+from spatz.sensors.compound import CompoundSensor

spatz/sensors/compound.py

@@ -3,7 +3,7 @@ import numpy as np
 from typing import List
 from numpy.typing import ArrayLike
 
-from sensor import Sensor
+from spatz.sensors import Sensor
 from spatz.dataset import Dataset, List
 from spatz.logger import Logger
 from spatz.transforms import Transform

spatz/sensors/imu/__init__.py

@@ -1,2 +1,3 @@
-from accelerometer import Accelerometer
-from gyroscope import Gyroscope
+from spatz.sensors.imu.accelerometer import Accelerometer
+from spatz.sensors.imu.gyroscope import Gyroscope
+from spatz.sensors.imu.imu import IMU

spatz/sensors/imu/imu.py

@@ -1,7 +1,8 @@
 from typing import List
 from spatz.dataset import Dataset, List
 from spatz.logger import Logger
-from spatz.sensors import CompoundSensor, Accelerometer, Gyroscope
+from spatz.sensors.compound import CompoundSensor
+from spatz.sensors.imu import Accelerometer, Gyroscope
 from spatz.sensors.sensor import Sensor
 from spatz.transforms import Transform
 

spatz/sensors/pressure/__init__.py

@@ -1,2 +1 @@
-from pressure import PressureSensor
-from ms5611_01ba03 import MS5611_01BA03
+from spatz.sensors.pressure.pressure import PressureSensor

spatz/sensors/pressure/ms5611_01ba03.py

@@ -1,8 +1,7 @@
 from typing import List, AnyStr
 from numpy.typing import ArrayLike
 
-from pressure import PressureSensor
-
+from spatz.sensors import PressureSensor
 from spatz.dataset import Dataset, Phase
 from spatz.logger import Logger
 from spatz.transforms import GaussianNoise, Transform

spatz/sensors/sensor.py

@@ -51,14 +51,4 @@ class Sensor:
             for i in range(len(out)):
                 self._log(f'out_{i}', out[i])
 
-        return out
-    
-
-class CompoundSensor(Sensor):
-    def __init__(self, sensors: List[Sensor]):
-        super(CompoundSensor, self).__init__(None)
-
-        self.__sensors = sensors
-
-    def _get_data(self) -> ArrayLike:
-        return np.stack([sensor() for sensor in self.__sensors])
+        return out