pynamicalsys 1.3.1__py3-none-any.whl → 1.4.0__py3-none-any.whl

pynamicalsys/core/discrete_dynamical_systems.py

@@ -36,7 +36,7 @@ from pynamicalsys.discrete_time.dynamical_indicators import (
     finite_time_hurst_exponent,
     finite_time_lyapunov,
     finite_time_RTE,
-    hurst_exponent,
+    hurst_exponent_wrapped,
     lagrangian_descriptors,
     lyapunov_1D,
     lyapunov_er,
@@ -556,9 +556,13 @@ class DiscreteDynamicalSystem:
         validate_transient_time(transient_time, total_time, type_=Integral)
 
         if u.ndim == 1:
-            return generate_trajectory(
+            result = generate_trajectory(
                 u, parameters, total_time, self.__mapping, transient_time=transient_time
             )
+            if self.__system_dimension == 1:
+                return result[:, 0]
+            else:
+                return result
         else:
             return ensemble_trajectories(
                 u, parameters, total_time, self.__mapping, transient_time=transient_time
@@ -2663,13 +2667,10 @@ class DiscreteDynamicalSystem:
         ----------
         u : NDArray[np.float64]
             Initial condition vector of shape (n,).
-        parameters : Union[None, float, Sequence[np.float64], NDArray[np.float64]], optional
-            Parameters passed to the mapping function.
         total_time : int
             Total number of iterations used to generate the trajectory.
-        mapping : Callable[[NDArray[np.float64],
-            NDArray[np.float64]], NDArray[np.float64]]
-            A function that defines the system dynamics, i.e., how `u` evolves over time given `parameters`.
+        parameters : Union[None, float, Sequence[np.float64], NDArray[np.float64]], optional
+            Parameters passed to the mapping function.
         wmin : int, optional
             Minimum window size for the rescaled range calculation. Default is 2.
         transient_time : Optional[int], optional
@@ -2721,12 +2722,17 @@ class DiscreteDynamicalSystem:
         validate_transient_time(transient_time, total_time, Integral)
 
         validate_positive(wmin, "wmin", Integral)
-        if wmin < 2 or wmin >= total_time // 2:
+
+        if (
+            wmin < 2
+            or wmin
+            >= (total_time - (transient_time if transient_time is not None else 0)) // 2
+        ):
             raise ValueError(
                 f"`wmin` must be an integer >= 2 and <= total_time / 2. Got {wmin}."
             )
 
-        return hurst_exponent(
+        result = hurst_exponent_wrapped(
             u,
             parameters,
             total_time,
@@ -2735,6 +2741,11 @@ class DiscreteDynamicalSystem:
             transient_time=transient_time,
         )
 
+        if self.__system_dimension == 1:
+            return result[0]
+        else:
+            return result
+
     def finite_time_hurst_exponent(
         self,
         u: Union[NDArray[np.float64], Sequence[float], float],