diff --git a/docs/source/finam-book/development/adapters.rst b/docs/source/finam-book/development/adapters.rst
index 6d7472cba621b741181939812d8d302c91c8b4b3..7465eff381b16e6e517d4dc97fa060e777135db7 100644
--- a/docs/source/finam-book/development/adapters.rst
+++ b/docs/source/finam-book/development/adapters.rst
@@ -70,7 +70,7 @@ File ``src/scale.py``:
generator.outputs["Value"] >> adapter >> consumer.inputs["Input"]
- comp.run(end=datetime(2000, 1, 2))
+ comp.run(end_time=datetime(2000, 1, 2))
print(fm.data.strip_data(consumer.data["Input"]))
@@ -244,7 +244,7 @@ In :meth:`.Adapter._get_data`, we can now do the interpolation whenever data is
generator.outputs["Value"] >> adapter >> consumer.inputs["Input"]
- comp.run(end=datetime(2000, 1, 15))
+ comp.run(end_time=datetime(2000, 1, 15))
print(fm.data.strip_data(consumer.data["Input"]))
diff --git a/docs/source/finam-book/development/components.rst b/docs/source/finam-book/development/components.rst
index a0d4bac92fbb8449d87a695ce5a6a323f4e242b4..ac5ca54768568a08f2b2b9e69a790d39d93c951c 100644
--- a/docs/source/finam-book/development/components.rst
+++ b/docs/source/finam-book/development/components.rst
@@ -320,7 +320,7 @@ In :meth:`.TimeComponent._update`, we get the component's input data, do a "mode
def test_dummy_model(self):
# ...
- composition.run(end=datetime(2000, 12, 31))
+ composition.run(end_time=datetime(2000, 12, 31))
The test should fail, as we still need to implement the :meth:`.TimeComponent._finalize()` method.
@@ -442,7 +442,7 @@ Here is the final code of the completed component.
self.assertEqual(consumer.data, {"Sum": 0})
- composition.run(end=datetime(2000, 12, 31))
+ composition.run(end_time=datetime(2000, 12, 31))
if __name__ == "__main__":
unittest.main()
diff --git a/docs/source/finam-book/development/special_components.rst b/docs/source/finam-book/development/special_components.rst
index 6e32fb677334bd4e1aab8fa4d7ac3bbc44df59dc..9a3ffde43a6b9d28a94094a366b6540611276aa6 100644
--- a/docs/source/finam-book/development/special_components.rst
+++ b/docs/source/finam-book/development/special_components.rst
@@ -82,7 +82,7 @@ Push-based components can use :class:`.CallbackInput` to get informed about inco
generator.outputs["Value"] >> push_comp.inputs["Input"]
- comp.run(end=datetime(2000, 1, 15))
+ comp.run(end_time=datetime(2000, 1, 15))
In ``_initialize()``, a :class:`.CallbackInput` is added that calls ``_data_changed()`` when notified about new data.
@@ -153,7 +153,7 @@ Push-based components can use :class:`.CallbackOutput` to intercept data pulls.
pull_comp.outputs["Output"] >> consumer.inputs["Input"]
- comp.run(end=datetime(2000, 1, 15))
+ comp.run(end_time=datetime(2000, 1, 15))
In ``_initialize()``, a :class:`.CallbackOutput` is added that calls ``_get_data()`` when pulled.
``_get_data()`` must return the data that would normally be pushed to the output.
diff --git a/docs/source/finam-book/usage/coupling_scripts.rst b/docs/source/finam-book/usage/coupling_scripts.rst
index d7fdcd7d5c55c4e11b96ba976c8c5c259b89c01f..db7a54a5e9a67d53ee0a0d30cfbc6cb74504bc2d 100644
--- a/docs/source/finam-book/usage/coupling_scripts.rst
+++ b/docs/source/finam-book/usage/coupling_scripts.rst
@@ -43,7 +43,7 @@ Here is a simple example coupling two components:
generator.outputs["Noise"] >> consumer.inputs["Value"]
# Run the composition until June 2000
- composition.run(end=datetime(2000, 6, 30)) # doctest: +ELLIPSIS
+ composition.run(end_time=datetime(2000, 6, 30)) # doctest: +ELLIPSIS
.. testoutput:: simple-example
:hide:
@@ -149,7 +149,7 @@ time steps and an adapter:
)
# Run the composition until June 2000
- composition.run(end=datetime(2000, 6, 30)) # doctest: +ELLIPSIS
+ composition.run(end_time=datetime(2000, 6, 30)) # doctest: +ELLIPSIS
.. testoutput:: adapter-example
:hide:
diff --git a/src/finam/schedule.py b/src/finam/schedule.py
index fa6e333a79a649aff38cd3a5b9d508d8b9fdfdb2..15cff66ec698ad0e7eb58ba3f0430c90fae645d5 100644
--- a/src/finam/schedule.py
+++ b/src/finam/schedule.py
@@ -55,7 +55,7 @@ class Composition(Loggable):
comp_b.outputs["Out"] >> SomeAdapter() >> comp_b.inputs["In"]
- composition.run(end=...)
+ composition.run(end_time=...)
Parameters
----------
@@ -194,19 +194,19 @@ class Composition(Loggable):
self.is_connected = True
- def run(self, start=None, end=None):
+ def run(self, start_time=None, end_time=None):
"""Run this composition using the loop-based update strategy.
Performs the connect phase if it ``connect()`` was not already called.
Parameters
----------
- start : :class:`datetime <datetime.datetime>`, optional
+ start_time : :class:`datetime <datetime.datetime>`, optional
Starting time of the composition.
If provided, it should be the starting time of the earliest component.
If not provided, the composition tries to determine the starting time automatically.
Ignored if :meth:`.connect` was already called.
- end : :class:`datetime <datetime.datetime>`, optional
+ end_time : :class:`datetime <datetime.datetime>`, optional
Simulation time up to which to simulate.
Should be ``None`` if no components with time are present.
"""
@@ -214,18 +214,18 @@ class Composition(Loggable):
with ErrorLogger(self.logger):
if len(time_modules) == 0:
- if end is not None:
+ if end_time is not None:
raise ValueError(
"end must be None for a composition without time components"
)
else:
- if not isinstance(end, datetime):
+ if not isinstance(end_time, datetime):
raise ValueError(
"end must be of type datetime for a composition with time components"
)
if not self.is_connected:
- self.connect(start)
+ self.connect(start_time)
self.logger.debug("running composition")
while len(time_modules) > 0:
@@ -239,7 +239,7 @@ class Composition(Loggable):
any_running = False
for mod in time_modules:
- if mod.status != ComponentStatus.FINISHED and mod.time < end:
+ if mod.status != ComponentStatus.FINISHED and mod.time < end_time:
any_running = True
break
diff --git a/tests/adapters/test_regrid.py b/tests/adapters/test_regrid.py
index dd3cea194981ded8df393e6815bd5dffbdb5056b..50c914c152a41b2e368ddbf160bdfc4d9eeeae00 100644
--- a/tests/adapters/test_regrid.py
+++ b/tests/adapters/test_regrid.py
@@ -61,7 +61,7 @@ class TestRegrid(unittest.TestCase):
(source.outputs["Output"] >> RegridNearest() >> sink.inputs["Input"])
- composition.run(end=datetime(2000, 1, 5))
+ composition.run(end_time=datetime(2000, 1, 5))
self.assertEqual(sink.inputs["Input"].info.grid, out_spec)
self.assertEqual(sink.data["Input"][0, 0, 0], 1.0 * UNITS.meter)
@@ -114,7 +114,7 @@ class TestRegrid(unittest.TestCase):
(source.outputs["Output"] >> RegridNearest() >> sink.inputs["Input"])
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
self.assertEqual(sink.inputs["Input"].info.grid, out_spec)
self.assertEqual(sink.data["Input"][0, 0, 0], 1.0 * UNITS.meter)
@@ -158,7 +158,7 @@ class TestRegrid(unittest.TestCase):
(source.outputs["Output"] >> RegridLinear() >> sink.inputs["Input"])
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
self.assertEqual(sink.inputs["Input"].info.grid, out_spec)
self.assertEqual(sink.data["Input"][0, 0, 0], 1.0 * UNITS.meter)
@@ -206,7 +206,7 @@ class TestRegrid(unittest.TestCase):
>> sink.inputs["Input"]
)
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
self.assertEqual(sink.inputs["Input"].info.grid, out_spec)
self.assertAlmostEqual(fdata.get_magnitude(sink.data["Input"])[0, 0, 0], 1.0)
@@ -251,7 +251,7 @@ class TestRegrid(unittest.TestCase):
>> sink.inputs["Input"]
)
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
self.assertEqual(sink.inputs["Input"].info.grid, out_spec)
self.assertEqual(sink.data["Input"][0, 0, 0], 1.0 * UNITS.meter)
@@ -291,7 +291,7 @@ class TestRegrid(unittest.TestCase):
(source.outputs["Output"] >> RegridLinear() >> sink.inputs["Input"])
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
self.assertEqual(sink.inputs["Input"].info.grid, out_spec)
self.assertEqual(sink.data["Input"][0, 0, 0], 1.0 * UNITS.meter)
@@ -340,7 +340,7 @@ class TestRegrid(unittest.TestCase):
regrid >> sink_1.inputs["Input"]
regrid >> sink_2.inputs["Input"]
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
self.assertEqual(sink_1.inputs["Input"].info.grid, out_spec_1)
self.assertEqual(sink_1.data["Input"][0, 0, 0], 1.0 * UNITS.meter)
@@ -396,7 +396,7 @@ class TestRegrid(unittest.TestCase):
regrid >> sink_2.inputs["Input"]
with self.assertRaises(FinamMetaDataError) as _context:
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
def test_regrid_linear_unstructured(self):
time = datetime(2000, 1, 1)
@@ -448,7 +448,7 @@ class TestRegrid(unittest.TestCase):
>> sink.inputs["Input"]
)
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
self.assertEqual(sink.inputs["Input"].info.grid, out_spec)
self.assertEqual(sink.data["Input"][0, 0], 1.0 * UNITS.meter)
diff --git a/tests/adapters/test_stats.py b/tests/adapters/test_stats.py
index 0f7611739ec1364a5097221e2f9b11a32881c5b3..e5acdf18fdc35c85f4e0d0b9fafd2cf6d6e3ebc4 100644
--- a/tests/adapters/test_stats.py
+++ b/tests/adapters/test_stats.py
@@ -39,4 +39,4 @@ class TestHistogram(unittest.TestCase):
self.assertEqual(data.data.sum(), 11 * 14)
self.assertEqual(fm.data.get_units(data), fm.UNITS.dimensionless)
- composition.run(end=datetime(2000, 1, 10))
+ composition.run(end_time=datetime(2000, 1, 10))
diff --git a/tests/adapters/test_time_integration.py b/tests/adapters/test_time_integration.py
index bcc93f06a95deacdf8c0cacbd16a2782ae6c62ae..0fb922588f53630b07bcd798f0b232f12aeaaeb9 100644
--- a/tests/adapters/test_time_integration.py
+++ b/tests/adapters/test_time_integration.py
@@ -204,7 +204,7 @@ class TestSumOverTime(unittest.TestCase):
self.source["Step"] >> self.adapter_10 >> self.consumer["In_10"]
def test_sum_over_time(self):
- self.comp.run(end=datetime(2000, 1, 10))
+ self.comp.run(end_time=datetime(2000, 1, 10))
mm = fm.UNITS.Unit("mm")
@@ -292,7 +292,7 @@ class TestAbsSumOverTime(unittest.TestCase):
self.source["Step"] >> self.adapter_10 >> self.consumer["In_10"]
def test_sum_over_time(self):
- self.comp.run(end=datetime(2000, 1, 20))
+ self.comp.run(end_time=datetime(2000, 1, 20))
mm = fm.UNITS.Unit("mm")
diff --git a/tests/core/test_propagate_info.py b/tests/core/test_propagate_info.py
index 0be70220b137619211c3bf002a673e501e48ac62..10d24141165238b7e9f371abaf5eb394f70e9cd1 100644
--- a/tests/core/test_propagate_info.py
+++ b/tests/core/test_propagate_info.py
@@ -106,7 +106,7 @@ class TestPropagate(unittest.TestCase):
(source.outputs["Output"] >> SpecAdapter() >> sink.inputs["Input"])
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
self.assertEqual(
sink.inputs["Input"].info,
@@ -136,7 +136,7 @@ class TestPropagate(unittest.TestCase):
source.outputs["Output"] >> sink.inputs["Input"]
with self.assertRaises(FinamMetaDataError):
- composition.run(start=time, end=datetime(2000, 1, 2))
+ composition.run(start_time=time, end_time=datetime(2000, 1, 2))
def test_propagate_info_from_source(self):
time = datetime(2000, 1, 1)
@@ -160,7 +160,7 @@ class TestPropagate(unittest.TestCase):
source.outputs["Output"] >> sink.inputs["Input"]
- composition.run(start=time, end=datetime(2000, 1, 2))
+ composition.run(start_time=time, end_time=datetime(2000, 1, 2))
self.assertEqual(
sink.inputs["Input"].info,
@@ -187,7 +187,7 @@ class TestPropagate(unittest.TestCase):
source.outputs["Output"] >> sink.inputs["Input"]
- composition.run(start=time, end=datetime(2000, 1, 2))
+ composition.run(start_time=time, end_time=datetime(2000, 1, 2))
self.assertEqual(
source.outputs["Output"].info,
diff --git a/tests/core/test_pull_based_component.py b/tests/core/test_pull_based_component.py
index 248f2e8ae61a5cbbde86c969a4668d00ae51eb90..7266671827709b38e0ecb1776235af8fe1c7d615 100644
--- a/tests/core/test_pull_based_component.py
+++ b/tests/core/test_pull_based_component.py
@@ -53,6 +53,6 @@ class TestPullBasedComponent(unittest.TestCase):
pull_comp.outputs["Out"] >> consumer.inputs["In"]
- composition.run(start=time, end=datetime(2000, 1, 12))
+ composition.run(start_time=time, end_time=datetime(2000, 1, 12))
self.assertEqual(consumer.data, {"In": 12})
diff --git a/tests/core/test_schedule.py b/tests/core/test_schedule.py
index cf5a37e34ebd6b4bec05352238fb7336b20bd358..ad7d5ae80e085b30b2d5dbc8088c227bf3bb5081 100644
--- a/tests/core/test_schedule.py
+++ b/tests/core/test_schedule.py
@@ -302,7 +302,9 @@ class TestComposition(unittest.TestCase):
module1.outputs["Output"] >> module2.inputs["Input"]
- composition.run(start=datetime(2000, 1, 1), end=datetime(2000, 1, 2))
+ composition.run(
+ start_time=datetime(2000, 1, 1), end_time=datetime(2000, 1, 2)
+ )
with open(log_file) as f:
lines = f.readlines()
@@ -316,7 +318,7 @@ class TestComposition(unittest.TestCase):
composition.initialize()
with self.assertRaises(ValueError):
- composition.run(start=0, end=100)
+ composition.run(start_time=0, end_time=100)
def test_fail_double_initialize(self):
module1 = MockupComponent(
@@ -354,7 +356,7 @@ class TestComposition(unittest.TestCase):
module1.outputs["Output"] >> module2.inputs["Input"]
- composition.run(start=datetime(2000, 1, 1), end=datetime(2000, 1, 31))
+ composition.run(start_time=datetime(2000, 1, 1), end_time=datetime(2000, 1, 31))
def test_iterative_connect_multi(self):
module1 = MockupComponent(
@@ -369,7 +371,7 @@ class TestComposition(unittest.TestCase):
module1.outputs["Output"] >> module2.inputs["Input"]
module2.outputs["Output"] >> module3.inputs["Input"]
- composition.run(start=datetime(2000, 1, 1), end=datetime(2000, 1, 31))
+ composition.run(start_time=datetime(2000, 1, 1), end_time=datetime(2000, 1, 31))
def test_iterative_connect_adapter(self):
module1 = MockupComponent(
@@ -382,7 +384,7 @@ class TestComposition(unittest.TestCase):
module1.outputs["Output"] >> Scale(1.0) >> module2.inputs["Input"]
- composition.run(start=datetime(2000, 1, 1), end=datetime(2000, 1, 31))
+ composition.run(start_time=datetime(2000, 1, 1), end_time=datetime(2000, 1, 31))
def test_iterative_connect_multi_adapter(self):
module1 = MockupComponent(
@@ -395,7 +397,7 @@ class TestComposition(unittest.TestCase):
module1.outputs["Output"] >> Scale(1.0) >> Scale(1.0) >> module2.inputs["Input"]
- composition.run(start=datetime(2000, 1, 1), end=datetime(2000, 1, 31))
+ composition.run(start_time=datetime(2000, 1, 1), end_time=datetime(2000, 1, 31))
def test_iterative_connect_blocked(self):
module1 = MockupCircularComponent(step=timedelta(1.0))
@@ -408,7 +410,9 @@ class TestComposition(unittest.TestCase):
module2.outputs["Output"] >> module1.inputs["Input"]
with self.assertRaises(FinamCircularCouplingError):
- composition.run(start=datetime(2000, 1, 1), end=datetime(2000, 1, 31))
+ composition.run(
+ start_time=datetime(2000, 1, 1), end_time=datetime(2000, 1, 31)
+ )
def test_no_time_comp(self):
module = NoTimeComponent()
@@ -417,9 +421,9 @@ class TestComposition(unittest.TestCase):
composition.initialize()
with self.assertRaises(ValueError):
- composition.run(end=datetime(2000, 1, 31))
+ composition.run(end_time=datetime(2000, 1, 31))
- composition.run(end=None)
+ composition.run(end_time=None)
def test_time_comp(self):
module = MockupComponent(callbacks={"Output": lambda t: t}, step=timedelta(1.0))
@@ -428,9 +432,9 @@ class TestComposition(unittest.TestCase):
composition.initialize()
with self.assertRaises(ValueError):
- composition.run(end=None)
+ composition.run(end_time=None)
- composition.run(start=datetime(2000, 1, 1), end=datetime(2000, 1, 2))
+ composition.run(start_time=datetime(2000, 1, 1), end_time=datetime(2000, 1, 2))
def test_no_update(self):
module1 = MockupComponent(
@@ -441,7 +445,7 @@ class TestComposition(unittest.TestCase):
)
composition = Composition([module1, module2])
composition.initialize()
- composition.run(start=datetime(2000, 1, 1), end=datetime(2000, 1, 1))
+ composition.run(start_time=datetime(2000, 1, 1), end_time=datetime(2000, 1, 1))
def test_missing_component_upstream(self):
module1 = MockupComponent(
@@ -582,7 +586,7 @@ class TestComposition(unittest.TestCase):
source.outputs["Noise"] >> Scale(1.0) >> sink.inputs["In"]
with self.assertRaises(ValueError):
- composition.run(end=datetime(2000, 1, 1))
+ composition.run(end_time=datetime(2000, 1, 1))
composition.run()
@@ -658,7 +662,7 @@ class TestComposition(unittest.TestCase):
composition.connect(datetime(2000, 1, 1))
self.assertEqual(updates, ["A", "B", "C"])
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
self.assertEqual(
updates,
[
@@ -721,7 +725,7 @@ class TestComposition(unittest.TestCase):
composition.connect()
self.assertEqual(updates, ["A", "B"])
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
self.assertEqual(
updates,
[
@@ -785,7 +789,7 @@ class TestComposition(unittest.TestCase):
composition.connect()
self.assertEqual(updates, ["A1", "A2", "B"])
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
self.assertEqual(
updates,
[
@@ -835,7 +839,7 @@ class TestComposition(unittest.TestCase):
composition.connect(start)
with self.assertRaises(FinamCircularCouplingError):
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
def test_starting_time(self):
start_1 = datetime(2000, 1, 1)
@@ -888,7 +892,7 @@ class TestComposition(unittest.TestCase):
composition.connect()
- composition.run(end=datetime(2000, 1, 10))
+ composition.run(end_time=datetime(2000, 1, 10))
self.assertEqual([1, 8, 13], updates["A"])
self.assertEqual([1, 4, 7, 10], updates["B"])
diff --git a/tests/core/test_units.py b/tests/core/test_units.py
index 41e5882dd89089ee34d52c15f3dde1371d637d72..c3848caf19c5e7409c0867ac100d14108fc708b0 100644
--- a/tests/core/test_units.py
+++ b/tests/core/test_units.py
@@ -82,7 +82,7 @@ class TestUnits(unittest.TestCase):
(source.outputs["Output"] >> sink.inputs["Input"])
- composition.run(start=time, end=datetime(2000, 1, 2))
+ composition.run(start_time=time, end_time=datetime(2000, 1, 2))
self.assertEqual(sink.inputs["Input"].info.meta, {"units": UNITS.kilometer})
self.assertEqual(tools.get_units(sink.data), UNITS.kilometer)
@@ -116,4 +116,4 @@ class TestUnits(unittest.TestCase):
(source.outputs["Output"] >> sink.inputs["Input"])
with self.assertRaises(FinamMetaDataError):
- composition.run(start=time, end=datetime(2000, 1, 2))
+ composition.run(start_time=time, end_time=datetime(2000, 1, 2))
diff --git a/tests/modules/test_callback.py b/tests/modules/test_callback.py
index 617576c8dcf0ef482746f32c25fd657718d143e9..6d322dab79f03bc656e88bd1db0dd2ba4565256b 100644
--- a/tests/modules/test_callback.py
+++ b/tests/modules/test_callback.py
@@ -58,7 +58,7 @@ class TestCallback(unittest.TestCase):
self.assertGreaterEqual(out_data, 2.0)
self.assertLessEqual(out_data, 4.0)
- composition.run(end=datetime(2000, 3, 1))
+ composition.run(end_time=datetime(2000, 3, 1))
out_data = consumer.data["In1"]
self.assertGreaterEqual(out_data, 2.0)
diff --git a/tests/modules/test_control.py b/tests/modules/test_control.py
index eafe710e45e59aa2d7937a3df52a961955106a8a..06b7ece26e5e2b2ac87da0eb58dcb2703342077c 100644
--- a/tests/modules/test_control.py
+++ b/tests/modules/test_control.py
@@ -32,7 +32,7 @@ class TestTimeTrigger(unittest.TestCase):
trigger.outputs["Out"] >> sink.inputs["Input"]
composition.connect(time)
- composition.run(end=datetime(2000, 1, 5))
+ composition.run(end_time=datetime(2000, 1, 5))
def test_time_trigger_from_source(self):
time = datetime(2000, 1, 1)
@@ -75,7 +75,7 @@ class TestTimeTrigger(unittest.TestCase):
self.assertEqual(trigger._time, datetime(2000, 1, 1))
- composition.run(end=datetime(2000, 1, 5))
+ composition.run(end_time=datetime(2000, 1, 5))
def test_time_trigger_from_source_with_info(self):
time = datetime(2000, 1, 1)
@@ -118,7 +118,7 @@ class TestTimeTrigger(unittest.TestCase):
self.assertEqual(trigger._time, datetime(2000, 1, 1))
- composition.run(end=datetime(2000, 1, 5))
+ composition.run(end_time=datetime(2000, 1, 5))
def test_time_trigger_from_target(self):
time = datetime(2000, 1, 1)
@@ -152,7 +152,7 @@ class TestTimeTrigger(unittest.TestCase):
self.assertEqual(trigger._time, datetime(2000, 1, 1))
- composition.run(end=datetime(2000, 1, 5))
+ composition.run(end_time=datetime(2000, 1, 5))
def test_time_trigger_from_target_with_info(self):
time = datetime(2000, 1, 1)
@@ -187,7 +187,7 @@ class TestTimeTrigger(unittest.TestCase):
self.assertEqual(trigger._time, datetime(2000, 1, 1))
- composition.run(end=datetime(2000, 1, 5))
+ composition.run(end_time=datetime(2000, 1, 5))
def test_time_trigger_fail(self):
time = datetime(2000, 1, 1)
diff --git a/tests/modules/test_csv_writer.py b/tests/modules/test_csv_writer.py
index 644515420257d1a128284a3ad7b1b17eb38fea10..8f7b5908e74b867a3f1e82427e522ab062c56057 100644
--- a/tests/modules/test_csv_writer.py
+++ b/tests/modules/test_csv_writer.py
@@ -43,7 +43,7 @@ class TestCsvWriter(unittest.TestCase):
generator.outputs["B"] >> writer.inputs["B"]
generator.outputs["C"] >> writer.inputs["C"]
- comp.run(start=start, end=datetime(2000, 1, 31))
+ comp.run(start_time=start, end_time=datetime(2000, 1, 31))
csv = pd.read_csv(file_path)
diff --git a/tests/modules/test_debug.py b/tests/modules/test_debug.py
index bc5999c0869aed95db3e54371a4073a8d92ea5dd..aecef42edc125d468d6d03fa4308be6da194a0d1 100644
--- a/tests/modules/test_debug.py
+++ b/tests/modules/test_debug.py
@@ -58,7 +58,7 @@ class TestScheduleLogger(unittest.TestCase):
module3.outputs["Out"] >> schedule.inputs["M3"]
composition.connect(start)
- composition.run(end=datetime(2000, 1, 30))
+ composition.run(end_time=datetime(2000, 1, 30))
class TestPushDebugConsumer(unittest.TestCase):
@@ -89,6 +89,6 @@ class TestPushDebugConsumer(unittest.TestCase):
composition.connect(start)
self.assertEqual(fm.data.strip_data(consumer.data["In"]), 1)
- composition.run(start=start, end=datetime(2000, 1, 10))
+ composition.run(start_time=start, end_time=datetime(2000, 1, 10))
self.assertEqual(fm.data.strip_data(consumer.data["In"]), 11)
diff --git a/tests/modules/test_noise.py b/tests/modules/test_noise.py
index 097ca5c4f43f01e19b95654479bd1b23dbd15a89..8c7d2066aca9068dba4da62e3d6a1824a93c2242 100644
--- a/tests/modules/test_noise.py
+++ b/tests/modules/test_noise.py
@@ -34,7 +34,7 @@ class TestNoise(unittest.TestCase):
trigger.outputs["Out"] >> sink.inputs["Input"]
composition.connect()
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
data = fm.data.strip_data(sink.data["Input"])
self.assertEqual(data.shape, ())
@@ -66,7 +66,7 @@ class TestNoise(unittest.TestCase):
trigger.outputs["Out"] >> sink.inputs["Input"]
composition.connect(time)
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
data = fm.data.strip_data(sink.data["Input"])
self.assertEqual(data.shape, (19,))
@@ -98,7 +98,7 @@ class TestNoise(unittest.TestCase):
trigger.outputs["Out"] >> sink.inputs["Input"]
composition.connect(time)
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
data = fm.data.strip_data(sink.data["Input"])
self.assertEqual(data.shape, (19, 14))
@@ -130,7 +130,7 @@ class TestNoise(unittest.TestCase):
trigger.outputs["Out"] >> sink.inputs["Input"]
composition.connect(time)
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
data = fm.data.strip_data(sink.data["Input"])
self.assertEqual(data.shape, (19, 14, 9))
@@ -162,7 +162,7 @@ class TestNoise(unittest.TestCase):
trigger.outputs["Out"] >> sink.inputs["Input"]
composition.connect(time)
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
data = fm.data.strip_data(sink.data["Input"])
self.assertEqual(data.shape, (100,))
@@ -194,7 +194,7 @@ class TestNoise(unittest.TestCase):
trigger.outputs["Out"] >> sink.inputs["Input"]
composition.connect(time)
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
data = fm.data.strip_data(sink.data["Input"])
self.assertEqual(data.shape, (100,))
@@ -226,7 +226,7 @@ class TestNoise(unittest.TestCase):
trigger.outputs["Out"] >> sink.inputs["Input"]
composition.connect(time)
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
data = fm.data.strip_data(sink.data["Input"])
self.assertEqual(data.shape, (100,))
@@ -302,7 +302,7 @@ class TestStaticNoise(unittest.TestCase):
self.assertEqual(data_1.shape, ())
- composition.run(end=None)
+ composition.run(end_time=None)
data_2 = fm.data.strip_data(sink.data["Input"])
self.assertEqual(data_1, data_2)
diff --git a/tests/modules/test_parametric.py b/tests/modules/test_parametric.py
index eea674ae06daace6023774c19eeb5c692dc62010..bc50ab899fd079722c12129dbb9bd72088f238f6 100644
--- a/tests/modules/test_parametric.py
+++ b/tests/modules/test_parametric.py
@@ -38,7 +38,7 @@ class TestParametricGrid(unittest.TestCase):
trigger.outputs["Out"] >> sink.inputs["Input"]
composition.connect(time)
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
data = sink.data["Input"]
self.assertEqual(data.shape, (1, 19))
@@ -74,7 +74,7 @@ class TestParametricGrid(unittest.TestCase):
trigger.outputs["Out"] >> sink.inputs["Input"]
composition.connect(time)
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
data = sink.data["Input"]
self.assertEqual(data.shape, (1, 19, 14))
@@ -112,7 +112,7 @@ class TestParametricGrid(unittest.TestCase):
trigger.outputs["Out"] >> sink.inputs["Input"]
composition.connect(time)
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
data = sink.data["Input"]
self.assertEqual(data.shape, (1, 19, 14, 9))
@@ -147,7 +147,7 @@ class TestParametricGrid(unittest.TestCase):
trigger.outputs["Out"] >> sink.inputs["Input"]
composition.connect(time)
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
data = sink.data["Input"]
self.assertEqual(data.shape, (1, 100))
@@ -183,7 +183,7 @@ class TestParametricGrid(unittest.TestCase):
trigger.outputs["Out"] >> sink.inputs["Input"]
composition.connect(time)
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
data = sink.data["Input"]
self.assertEqual(data.shape, (1, 100))
@@ -219,7 +219,7 @@ class TestParametricGrid(unittest.TestCase):
trigger.outputs["Out"] >> sink.inputs["Input"]
composition.connect(time)
- composition.run(end=datetime(2000, 1, 2))
+ composition.run(end_time=datetime(2000, 1, 2))
data = sink.data["Input"]
self.assertEqual(data.shape, (1, 100))
@@ -287,7 +287,7 @@ class TestStaticParametricGrid(unittest.TestCase):
self.assertEqual(data_1.shape, (19, 14))
- composition.run(end=None)
+ composition.run(end_time=None)
data_2 = fm.data.strip_data(sink.data["Input"])
assert_allclose(data_1, data_2)
diff --git a/tests/modules/test_simplex_noise.py b/tests/modules/test_simplex_noise.py
index 889737c6548029046feae8ca84621d35b9d0b870..96fa77c8579fd2f88efdff30475f1bf9f1523fd9 100644
--- a/tests/modules/test_simplex_noise.py
+++ b/tests/modules/test_simplex_noise.py
@@ -26,7 +26,7 @@ class TestSimplexNoise(unittest.TestCase):
composition.connect(time)
- composition.run(end=datetime(2000, 3, 1))
+ composition.run(end_time=datetime(2000, 3, 1))
print(consumer.data["Noise"])
@@ -48,6 +48,6 @@ class TestSimplexNoise(unittest.TestCase):
_ = source.outputs["Noise"] >> consumer.inputs["Noise"]
composition.connect(time)
- composition.run(end=datetime(2000, 3, 1))
+ composition.run(end_time=datetime(2000, 3, 1))
print(consumer.data["Noise"])
diff --git a/tests/modules/test_weighted_sum.py b/tests/modules/test_weighted_sum.py
index 783d402b5874c0ff1259dcac17a5c7db30ac8c41..e3df404669329007a70a8f6f4f2c3d8a9cae688f 100644
--- a/tests/modules/test_weighted_sum.py
+++ b/tests/modules/test_weighted_sum.py
@@ -62,7 +62,7 @@ class TestWeightedSum(unittest.TestCase):
merger.outputs["WeightedSum"] >> consumer.inputs["WeightedSum"]
- composition.run(start=start, end=start + timedelta(days=30))
+ composition.run(start_time=start, end_time=start + timedelta(days=30))
self.assertEqual(consumer.data["WeightedSum"], 1.75 * fm.UNITS.millimeter)
self.assertEqual(
@@ -121,7 +121,7 @@ class TestWeightedSum(unittest.TestCase):
merger.outputs["WeightedSum"] >> consumer.inputs["WeightedSum"]
- composition.run(start=start, end=start + timedelta(days=30))
+ composition.run(start_time=start, end_time=start + timedelta(days=30))
self.assertEqual(
fm.data.get_units(consumer.data["WeightedSum"]), fm.UNITS("mm")
@@ -181,7 +181,7 @@ class TestWeightedSum(unittest.TestCase):
merger.outputs["WeightedSum"] >> consumer.inputs["WeightedSum"]
with self.assertRaises(finam.errors.FinamMetaDataError):
- composition.run(start=start, end=start + timedelta(days=30))
+ composition.run(start_time=start, end_time=start + timedelta(days=30))
def test_weighted_sum_fail_grid_weights(self):
start = datetime(2000, 1, 1)
@@ -237,7 +237,7 @@ class TestWeightedSum(unittest.TestCase):
merger.outputs["WeightedSum"] >> consumer.inputs["WeightedSum"]
with self.assertRaises(finam.errors.FinamMetaDataError):
- composition.run(start=start, end=start + timedelta(days=30))
+ composition.run(start_time=start, end_time=start + timedelta(days=30))
def test_weighted_sum_fail_units(self):
start = datetime(2000, 1, 1)
@@ -292,7 +292,7 @@ class TestWeightedSum(unittest.TestCase):
merger.outputs["WeightedSum"] >> consumer.inputs["WeightedSum"]
with self.assertRaises(finam.errors.FinamMetaDataError):
- composition.run(start=start, end=start + timedelta(days=30))
+ composition.run(start_time=start, end_time=start + timedelta(days=30))
def test_weighted_sum_fail_units_weights(self):
start = datetime(2000, 1, 1)
@@ -347,4 +347,4 @@ class TestWeightedSum(unittest.TestCase):
merger.outputs["WeightedSum"] >> consumer.inputs["WeightedSum"]
with self.assertRaises(finam.errors.FinamMetaDataError):
- composition.run(start=start, end=start + timedelta(days=30))
+ composition.run(start_time=start, end_time=start + timedelta(days=30))