Simu: move Emitter/Receiver into Antenna file

simulations/lib/location/__init__.py

@@ -1,3 +1,2 @@
 from .location import *
-from .emitter import *
+from .antenna import *
-from .receiver import *

simulations/lib/location/antenna.py

@@ -0,0 +1,45 @@
+from functools import partial
+
+try:
+    from .location import Location
+except ImportError:
+    from location import Location
+
+class Antenna(Location):
+    """
+    A location able to interact with a signal.
+
+    Either emitting or receiving.
+
+    Optionally applies a transformation to the traced signal.
+    """
+    def __repr__(self):
+        return "Antenna({})".format(repr(self.x))
+
+    def recv(self, travel_signal: callable) -> callable:
+        """
+        Return a function that traces the signal as a function of time
+        at the antenna's location
+        """
+        return partial(travel_signal, x_f=self.x)
+
+    receive = recv
+
+    def emit(self, travel_signal: callable) -> callable:
+        return partial(travel_signal, x_0=self.x)
+
+class Receiver(Antenna):
+    """
+    An antenna which main purpose is to trace a signal over time.
+
+    Optionally applies a transformation to the traced signal.
+    """
+    def __repr__(self):
+        return "Receiver({})".format(repr(self.x))
+
+class Emitter(Antenna):
+    """
+    An antenna which main purpose is to emit a signal.
+    """
+    def __repr__(self):
+        return "Emitter({})".format(repr(self.x))

simulations/lib/location/emitter.py

@@ -1,16 +0,0 @@
-from functools import partial
-
-try:
-    from .location import Location
-except ImportError:
-    from location import Location
-
-class Emitter(Location):
-    """
-    Emit a signal from position x_0 (and time t_0)
-    """
-    def __repr__(self):
-        return "Emitter({})".format(repr(self.x))
-
-    def emit(self, travel_signal: callable) -> callable:
-        return partial(travel_signal, x_0=self.x)

simulations/lib/location/example.py

@@ -3,8 +3,7 @@
 import matplotlib.pyplot as plt
 from mpl_toolkits.mplot3d import axes3d
 
-from receiver import Receiver
+from antenna import Receiver, Emitter
-from emitter import Emitter
 
 # 2D showcase
 source = Emitter([1,1])

simulations/lib/location/receiver.py

@@ -1,24 +0,0 @@
-from functools import partial
-
-try:
-    from .location import Location
-except ImportError:
-    from location import Location
-
-class Receiver(Location):
-    """
-    A location able to trace a signal over time.
-
-    Optionally applies a transformation to the traced signal.
-    """
-    def __repr__(self):
-        return "Receiver({})".format(repr(self.x))
-
-    def recv(self, travel_signal: callable) -> callable:
-        """
-        Return a function that traces the signal as a function of time
-        at the receiver's location
-        """
-        return partial(travel_signal, x_f=self.x)
-
-    receive = recv