From 52606d7583166c397594bc12585635825352dd1f Mon Sep 17 00:00:00 2001 From: Anupam Prasad Vedurmudi Date: Mon, 29 Mar 2021 17:45:04 +0200 Subject: [PATCH] feat(MetrologicalGeneratorAgent): rewrote to default metrological generator agent for both streams --- agentMET4FOF/metrological_agents.py | 14 ++++---------- agentMET4FOF/metrological_streams.py | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/agentMET4FOF/metrological_agents.py b/agentMET4FOF/metrological_agents.py index e4009a92..61179d28 100644 --- a/agentMET4FOF/metrological_agents.py +++ b/agentMET4FOF/metrological_agents.py @@ -202,7 +202,7 @@ def custom_plot_function(self, data, sender_agent, **kwargs): trace = go.Scatter() return trace -class MetrologicalSineGeneratorAgent(MetrologicalAgent): +class MetrologicalGeneratorAgent(MetrologicalAgent): """An agent streaming a sine signal Takes samples from an instance of :py:class:`MetrologicalSineGenerator` with sampling frequency `sfreq` and @@ -221,14 +221,8 @@ def init_parameters( Parameters ---------- - sine_freq : float - the frequency of the - sfreq : int - the sampling frequency of the generated signal - value_unc : iterable of floats or float, optional - standard uncertainty(ies) of the quantity values. Defaults to 0.1. - time_unc : iterable of floats or float, optional - standard uncertainty of the time stamps. Defaults to 0. + signal : MetrologicalDataStreamMET4FOF + the underlying signal for the generator """ self._stream = signal super().init_parameters() @@ -246,4 +240,4 @@ def agent_loop(self): """ if self.current_state == "Running": self.set_output_data(channel="default", data=self._stream.next_sample()) - super().agent_loop() + super().agent_loop() \ No newline at end of file diff --git a/agentMET4FOF/metrological_streams.py b/agentMET4FOF/metrological_streams.py index bd55a420..c21cb41c 100644 --- a/agentMET4FOF/metrological_streams.py +++ b/agentMET4FOF/metrological_streams.py @@ -306,7 +306,7 @@ def __init__( ampl_arr: np.array = np.array([1]), phase_ini_arr: np.array = np.array([0]), intercept: float = 0, - device_id: str = "DataGenerator", + device_id: str = "MultiWaveDataGenerator", time_name: str = "time", time_unit: str = "s", quantity_names: Union[str, Tuple[str, ...]] = ("Length", "Mass"),