Set pointer of DelayFixed to 0

SDXorg · Dec 18, 2023 · 32c3da0 · 32c3da0
1 parent 3b98bb9
commit 32c3da0
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 4 deletions.
diff --git a/docs/whats_new.rst b/docs/whats_new.rst
@@ -1,5 +1,29 @@
 What's New
 ==========
+v3.12.1 (2023/12/XX)
+--------------------
+New Features
+~~~~~~~~~~~~
+
+Breaking changes
+~~~~~~~~~~~~~~~~
+
+Deprecations
+~~~~~~~~~~~~
+
+Bug fixes
+~~~~~~~~~
+- Set the pointer of :py:class:`pysd.py_backend.statefuls.DelayFixed` to 0 during initialization (:issue:`427`). (`@enekomartinmartinez <https://github.com/enekomartinmartinez>`_)
+
+Documentation
+~~~~~~~~~~~~~
+
+Performance
+~~~~~~~~~~~
+
+Internal Changes
+~~~~~~~~~~~~~~~~
+
 v3.12.0 (2023/10/02)
 --------------------
 New Features

diff --git a/pysd/_version.py b/pysd/_version.py
@@ -1 +1 @@
-__version__ = "3.12.0"
+__version__ = "3.12.1"
diff --git a/pysd/py_backend/statefuls.py b/pysd/py_backend/statefuls.py
@@ -384,6 +384,9 @@ def initialize(self, init_val=None):
         # The order can only be set once
         self.order = round(order + SMALL_VENSIM)
 
+        # set the pointer to 0
+        self.pointer = 0
+
         if init_val is None:
             init_state_value = self.init_func()
         else:

diff --git a/tests/pytest_types/external/pytest_external.py b/tests/pytest_types/external/pytest_external.py
@@ -66,9 +66,8 @@ def test_read_clean_opyxl(self, _root):
         Excels.clean()
         assert list(Excels._Excels_opyxl) == []
 
-    @pytest.mark.skipif(
-        sys.platform.startswith("win"),
-        reason="not working on Windows"
+    @pytest.mark.skip(
+        reason="may fail in parallel running"
     )
     def test_close_file(self, _root):
         """

diff --git a/tests/pytest_types/statefuls/pytest_statefuls.py b/tests/pytest_types/statefuls/pytest_statefuls.py
@@ -1,5 +1,6 @@
 import pytest
 
+import numpy as np
 import xarray as xr
 
 from pysd.py_backend.statefuls import Stateful, Integ, Delay, DelayN,\
@@ -96,6 +97,22 @@ def test_delay(self):
         delay_c.initialize(6)
         assert delay_c() == 6
 
+        for p, i in enumerate(np.arange(0, 2.5, 0.5)):
+            delay_c.update(None)
+            assert delay_c() == 6
+            assert delay_c.pointer == p+1
+
+        delay_c.update(None)
+        assert delay_c() == 5
+        assert delay_c.pointer == 0
+
+        # check that the pointer is set to 0 after initialization
+        delay_c.update(None)
+        assert delay_c.pointer != 0
+        delay_c.initialize()
+        assert delay_c.pointer == 0
+
+
     def test_delay_subscript(self):
         """
         Test for subscripted delay