PyEvoMotion 0.1.0__tar.gz → 0.1.1__tar.gz

{pyevomotion-0.1.0 → pyevomotion-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PyEvoMotion
-Version: 0.1.0
+Version: 0.1.1
 Summary: Evolutionary motion analysis tool
 Keywords: evolution,anomalous diffusion,bioinformatics
 Author: Lucas Goiriz
@@ -27,7 +27,7 @@ _(See [Goiriz L, et al.](http://doi.org/10.1073/pnas.2303578120))_
 ## Installation
 
 > **Note:**
-> `PyEvoMotion` uses [mafft](https://mafft.cbrc.jp/alignment/software/) to do the sequence alignment. If it’s not available in your system, on the the first run of `PyEvoMotion`, it will ask to install it locally.
+> `PyEvoMotion` uses [mafft](https://mafft.cbrc.jp/alignment/software/) to do the sequence alignment. If it's not available in your system, on the first run of `PyEvoMotion`, it will ask to install it locally.
 > 
 > If so, ensure to restart your shell session or run `source ~/.bashrc` to update the PATH environment variable, so that the `mafft` executable is available in your shell.
 >
@@ -74,8 +74,6 @@ options:
   -ep, --export_plots   Export the plots of the analysis.
   -l LENGTH_FILTER, --length_filter LENGTH_FILTER
                         Length filter for the sequences (removes sequences with length less than the specified value). Default is 0.
-  -n N_THRESHOLD, --n_threshold N_THRESHOLD
-                        Minimum number of sequences required in a time interval to compute statistics. Default is 2.
   -xj, --export_json    Export the run arguments to a json file.
   -ij IMPORT_JSON, --import_json IMPORT_JSON
                         Import the run arguments from a JSON file. If this argument is passed, the other arguments are ignored. The JSON file must contain the mandatory keys 'seqs', 'meta', and 'out'.
@@ -114,4 +112,74 @@ pytest
 > Given the size of the test data, this may take a while.
 
 
+## Docker
 
+A Docker image containing a virtual environment with `PyEvoMotion` pre-installed, its dependencies, the test data is available at `ghcr.io/luksgrin/pyevomotion:latest` and the manuscript's original figure script is available at `ghcr.io/luksgrin/pyevomotion-fig:latest`.
+
+Pull the image from by running:
+
+```bash
+docker pull ghcr.io/luksgrin/pyevomotion:latest
+```
+
+Alternatively, to build the main image, run:
+
+```bash
+docker build -t ghcr.io/luksgrin/pyevomotion:latest -f docker/Dockerfile
+```
+
+### Running the container
+
+To start an interactive container:
+
+```bash
+docker run -it ghcr.io/luksgrin/pyevomotion:latest
+```
+
+This will open a prompt that displays a welcome message and allows you to start using `PyEvoMotion` right away.
+
+### Included data
+
+The image includes (heavy) input files (FASTA and metadata) in:
+
+```bash
+/home/pyevomotion/pyevomotion-*/tests/data/test3
+```
+
+which are used by the test suite (and are automatically downloaded and extracted if not present, thereby using the containerized version is more convenient).
+
+Also, the source script for figure generation (along with the pre-generated results of running `PyEvoMotion`) is already available under:
+
+```bash
+/home/pyevomotion/pyevomotion-*/share
+```
+
+Do note that if all the contents within
+
+```bash
+/home/pyevomotion/pyevomotion-*/share
+```
+
+are deleted except for the `manuscript_figure.py` script, it is still possible to generate the figure (although it will take much longer since the dataset's stats must be computed by `PyEvoMotion`).
+
+### Running tests
+
+Once inside the container, run:
+
+```bash
+cd pyevomotion-*
+pytest
+```
+
+This will execute the test suite included with the source.
+
+### Reproducing the Figure from the original manuscript
+
+To reproduce the figure from the original manuscript, run:
+
+```bash
+cd pyevomotion-*
+python share/manuscript_figure.py export
+```
+
+The figure will be saved in the `share` directory. Font warnings may appear — they are safe to ignore and do not affect the scientific content of the figure, only the styling.

{pyevomotion-0.1.0 → pyevomotion-0.1.1}/PyEvoMotion/cli.py

@@ -255,13 +255,6 @@ def _parse_arguments() -> argparse.Namespace:
         default=0,
         help="Length filter for the sequences (removes sequences with length less than the specified value). Default is 0."
     )
-    parser.add_argument(
-        "-n",
-        "--n_threshold",
-        type=int,
-        default=2,
-        help="Minimum number of sequences required in a time interval to compute statistics. Default is 2."
-    )
     parser.add_argument(
         "-xj",
         "--export_json",
@@ -407,7 +400,6 @@ def _main():
     # Runs the analysis
     stats, reg = instance.analysis(
         length=args.length_filter,
-        n_threshold=args.n_threshold,
         show=args.show,
         mutation_kind=args.kind,
         export_plots_filename=(
@@ -432,6 +424,7 @@ def _main():
     # Exports the regression models to a JSON file
     with open(f"{args.out}_regression_results.json", "w") as file:
         json.dump(_reg, file, indent=4)
+    print(f"Regression results saved to {args.out}_regression_results.json")
 
     # Exits the program with code 0 (success)
     exit(0)

{pyevomotion-0.1.0 → pyevomotion-0.1.1}/PyEvoMotion/core/base.py

@@ -102,7 +102,7 @@ class PyEvoMotionBase():
             print(f"Method {method} not found in {instance}")
 
     @staticmethod
-    def _remove_nan(x: pd.Series, y: pd.Series) -> tuple[np.ndarray, np.ndarray]:
+    def _remove_nan(x: pd.Series, y: pd.Series, z: pd.Series) -> tuple[np.ndarray, np.ndarray]:
         """
         Remove NaN values from two pandas Series and return them as numpy arrays.
 
@@ -110,22 +110,40 @@ class PyEvoMotionBase():
         :type x: pd.Series
         :param y: the second pandas Series.
         :type y: pd.Series
+        :param z: the third pandas Series.
+        :type z: pd.Series
         :return: a tuple with the two pandas Series without NaN values.
         :rtype: tuple[np.ndarray,np.ndarray]
         """
 
-        data = pd.DataFrame({"x": x, "y": y}).dropna()
+        data = pd.DataFrame({"x": x, "y": y, "z": z}).dropna()
 
         x = data["x"].to_numpy().reshape(-1, 1)
         y = data["y"].to_numpy().reshape(-1, 1)
+        z = data["z"].to_numpy().reshape(-1, 1)
+        return x, y, z
 
-        return x, y
+    @staticmethod
+    def _weighting_function(n: int, n_0: int = 30) -> np.ndarray:
+        """
+        Weighting function for the data points.
+
+        :param n: The number of data points.
+        :type n: int
+        :param n_0: The number of data points at which the weighting function approximates the constant 1. Default is 30.
+        :type n_0: int
+        :return: The weighting function.
+        :rtype: np.ndarray
+        """
+
+        return np.tanh(2*n/n_0)
 
     @classmethod
     def linear_regression(cls,
         x: np.ndarray,
         y: np.ndarray,
-        fit_intercept=True
+        weights: np.ndarray | None = None,
+        fit_intercept: bool = True
     ) -> dict[str, any]:
         """
         Perform a linear regression on a set of data.
@@ -136,6 +154,8 @@ class PyEvoMotionBase():
         :type y: np.ndarray
         :param fit_intercept: Whether to fit the intercept. Default is ``True``.
         :type fit_intercept: bool
+        :param weights: Optional weights for the data points. If provided, points with higher weights will have more influence on the fit. These weights are scaled by the weighting function tanh(2*n/n_0), where n is the number of data points and n_0 is the number of data points at which the weighting function approximates the constant 1. Default is ``None``.
+        :type weights: np.ndarray | None
         :return: A dictionary containing:
 
             * ``model``: A ``lambda`` function that computes predictions based on the fitted model.
@@ -145,7 +165,9 @@ class PyEvoMotionBase():
         :rtype: ``dict[str, any]``
         """
 
-        reg = LinearRegression(fit_intercept=fit_intercept).fit(x,y)
+        _weights = cls._weighting_function(weights).flatten() if weights is not None else None
+
+        reg = LinearRegression(fit_intercept=fit_intercept).fit(x, y, sample_weight=_weights)
 
         if fit_intercept:
             model = {
@@ -166,7 +188,7 @@ class PyEvoMotionBase():
                 "expression": "mx"
             }
 
-        model["r2"] = r2_score(y, reg.predict(x))
+        model["r2"] = r2_score(y, reg.predict(x), sample_weight=_weights)
 
         return model
     
@@ -192,7 +214,7 @@ class PyEvoMotionBase():
         return a*np.power(x, b)
 
     @classmethod
-    def power_law_fit(cls, x: np.ndarray, y: np.ndarray) -> dict[str, any]:
+    def power_law_fit(cls, x: np.ndarray, y: np.ndarray, weights: np.ndarray | None = None) -> dict[str, any]:
         """
         Perform a power law fit on a set of data.
 
@@ -200,6 +222,8 @@ class PyEvoMotionBase():
         :type x: np.ndarray
         :param y: A numpy array of the target.
         :type y: np.ndarray
+        :param weights: Optional weights for the data points. If provided, points with higher weights will have more influence on the fit. These weights are scaled by the weighting function tanh(2*n/n_0), where n is the number of data points and n_0 is the number of data points at which the weighting function approximates the constant 1. Default is ``None``.
+        :type weights: np.ndarray | None
         :return: A dictionary containing:
 
             * ``model``: A ``lambda`` function that computes predictions based on the fitted model.
@@ -209,10 +233,13 @@ class PyEvoMotionBase():
         :rtype: ``dict[str, any]``
         """
 
+        _weights = cls._weighting_function(weights).flatten() if weights is not None else None
+
         try:
             _popt, _, _, _msg, _ier = curve_fit(
                 cls._power_law,
                 x.T.tolist()[0], y.T.tolist()[0],
+                sigma=1/np.sqrt(_weights) if _weights is not None else None,
                 full_output=True
             )
         except RuntimeError as e:
@@ -230,16 +257,18 @@ class PyEvoMotionBase():
                 "alpha": _popt[1]
             },
             "expression": "d*x^alpha",
-            "r2": r2_score(y, cls._power_law(x, *_popt))
+            "r2": r2_score(y, cls._power_law(x, *_popt), sample_weight=_weights)
         }
 
         return model
         
-    @staticmethod
+    @classmethod
     def F_test(
+        cls,
         model1: dict[str,any],
         model2: dict[str,any],
-        data: np.ndarray
+        data: np.ndarray,
+        weights: np.ndarray | None = None
     ) -> tuple[float, float]:
         """
         Perform an F-test between two models.
@@ -257,6 +286,11 @@ class PyEvoMotionBase():
         """
 
         data = data.flatten()
+        
+        if weights is not None:
+            _weights = cls._weighting_function(weights.flatten())
+        else:
+            _weights = np.ones(len(data))
 
         # Note that p1 < p2 always. Won't do an assertion because I'm making sure elsewhere that the linear model does not have an intercept, i.e. it only has the slope
         p1 = len(model1["parameters"])
@@ -278,8 +312,8 @@ class PyEvoMotionBase():
         )
 
         # Sum the residuals without the infinite values
-        RSS1 = RS1.sum(where=~mask)
-        RSS2 = RS2.sum(where=~mask)
+        RSS1 = np.sum(_weights*RS1, where=~mask)
+        RSS2 = np.sum(_weights*RS2, where=~mask)
 
         F = ((RSS1 - RSS2)/(p2 - p1))/(RSS2/(n - p2))
 
@@ -289,7 +323,8 @@ class PyEvoMotionBase():
     def adjust_model(cls,
         x: pd.Series,
         y: pd.Series,
-        name: str = None
+        name: str = None,
+        weights: pd.Series | None = None
     ) -> dict[str, any]:
         """Adjust a model to the data.
 
@@ -299,12 +334,14 @@ class PyEvoMotionBase():
         :type y: pd.Series
         :param name: The name of the data. Default is ``None``.
         :type name: str
+        :param weights: Optional weights for the data points. If provided, points with higher weights will have more influence on the fit. These weights are scaled by the weighting function tanh(2*n/n_0), where n is the number of data points and n_0 is the number of data points at which the weighting function approximates the constant 1. Default is ``None``.
+        :type weights: np.ndarray | None
         :return: A dictionary with the model.   
         :rtype: ``dict[str, any]``
         :raises ValueError: If the dataset is empty or full of NaN values. This may occur if the grouped data contains only one entry per group, indicating that the variance cannot be computed.
         """
 
-        x,y = cls._remove_nan(x, y)
+        x,y,w = cls._remove_nan(x, y, weights)
 
         # Raises an error if the dataset is (almost) empty at this point
         if (x.size <= 1) or (y.size <= 1):
@@ -313,10 +350,10 @@ class PyEvoMotionBase():
                 f"Dataset length after filtering is: x: {x.size} elements; y: {y.size} elements. In particular:\n\nx: {x}\ny: {y}\n\nPerhaps NaN appeared for certain entries. Check if the grouped data contains only one entry per group, as this may cause NaN values when computing the variance. Also, consider widening the time window."
             )
 
-        model1 = cls.linear_regression(x, y, fit_intercept=False) # Not fitting the intercept because data is passed scaled to the minimum
-        model2 = cls.power_law_fit(x, y)
+        model1 = cls.linear_regression(x, y, weights=w, fit_intercept=False) # Not fitting the intercept because data is passed scaled to the minimum
+        model2 = cls.power_law_fit(x, y, weights=w)
 
-        _, p = cls.F_test(model1, model2, y)
+        _, p = cls.F_test(model1, model2, y, weights=w)
 
         if p < 0.05:
             model = model2
@@ -337,6 +374,7 @@ class PyEvoMotionBase():
         model_label: str,
         data_xlabel_units: str,
         ax: any,
+        dt_ratio: float,
         **kwargs: dict[str, any]
     ) -> None:
         """
@@ -376,13 +414,13 @@ class PyEvoMotionBase():
                 point_kwargs[_k] = kwargs[k]
 
         ax.scatter(
-            data_x,
+            data_x.to_numpy()*dt_ratio,
             data_y,
             **point_kwargs
         )
         ax.plot(
-            data_x,
-            model(data_x),
+            data_x.to_numpy()*dt_ratio,
+            model(data_x.to_numpy()*dt_ratio),
             label=model_label,
             **line_kwargs
         )
@@ -404,3 +442,28 @@ class PyEvoMotionBase():
             raise ValueError(
                 f"The dataset is (almost) empty at this point of the analysis.\n{msg}"
             )
+        
+    @staticmethod
+    def _get_time_ratio(dt: str, reference: str = "7D") -> float:
+        """Get the ratio of a time interval with respect to a reference interval.
+
+        :param dt: Time interval string (e.g. "5D", "7D", "10D", "14D", "12H")
+        :type dt: str
+        :param reference: Reference time interval string. Default is "7D".
+        :type reference: str
+        :return: The ratio of dt to reference
+        :rtype: float
+        """
+
+        return pd.Timedelta(dt) / pd.Timedelta(reference)
+
+    @classmethod
+    def _verify_dt(cls, dt: str) -> None:
+        """Verify that the time window string is greater than 1 day.
+        
+        :param dt: Time window string (e.g. "5D", "7D", "10D", "14D")
+        :type dt: str
+        :raises ValueError: If the time window is not greater than 1 day
+        """
+        if cls._get_time_ratio(dt, "1D") <= 1:
+            raise ValueError(f"Time window must be greater than 1 day. Got {dt}")

{pyevomotion-0.1.0 → pyevomotion-0.1.1}/PyEvoMotion/core/core.py

@@ -62,7 +62,9 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
         :type date_range: tuple[str] | None
         """
 
+        self._verify_dt(dt)
         self.dt = dt
+        self.dt_ratio = self._get_time_ratio(dt)
 
         # Parse the input fasta and metadata files
         super().__init__(
@@ -89,7 +91,8 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
     def plot_results(cls,
         stats: pd.DataFrame,
         regs: dict[str, dict[str, any]],
-        data_xlabel_units: str
+        data_xlabel_units: str,
+        dt_ratio: float
     ) -> None:
         """
         Plot the results of the analysis.
@@ -110,7 +113,7 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
             for k,v in regs.items()
             if k.startswith("mean")
         )
-        _mean_data = stats[stats.columns[1]]
+        _mean_data = stats[stats.columns[2]]
         cls.plot_single_data_and_model(
             stats.index,
             _mean_data,
@@ -118,7 +121,8 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
             _model["model"],
             r"$r^2$: " + f"{_model['r2']:.2f}",
             data_xlabel_units,
-            ax[0]
+            ax[0],
+            dt_ratio=dt_ratio
         )
 
         # Variance
@@ -127,7 +131,7 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
             for k,v in regs.items()
             if k.startswith("scaled var")
         )
-        _variance_data = stats[stats.columns[2]]
+        _variance_data = stats[stats.columns[3]]
         cls.plot_single_data_and_model(
             stats.index,
             _variance_data,
@@ -135,7 +139,8 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
             _model["model"],
             r"$r^2$: " + f"{_model['r2']:.2f}",
             data_xlabel_units,
-            ax[1]
+            ax[1],
+            dt_ratio=dt_ratio
         )
 
         # Dispersion index
@@ -147,6 +152,7 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
             "Poissonian regime",
             data_xlabel_units,
             ax[2],
+            dt_ratio=dt_ratio,
             line_linestyle="--",
             line_color="black"
         )
@@ -159,6 +165,7 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
         stats: pd.DataFrame,
         regs: dict[str, dict[str, any]],
         data_xlabel_units: str,
+        dt_ratio: float,
         output_ptr: str | None = None
     ) -> None:
         """
@@ -183,7 +190,7 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
             for k,v in regs.items()
             if k.startswith("mean")
         )
-        _mean_data = stats[stats.columns[1]]
+        _mean_data = stats[stats.columns[2]]
         cls.plot_single_data_and_model(
             stats.index,
             _mean_data,
@@ -191,7 +198,8 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
             _model["model"],
             r"$r^2$: " + f"{_model['r2']:.2f}",
             data_xlabel_units,
-            plt.gca()
+            plt.gca(),
+            dt_ratio=dt_ratio
         )
 
         plt.title(_mean_data.name)
@@ -205,7 +213,7 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
             for k,v in regs.items()
             if k.startswith("scaled var")
         )
-        _variance_data = stats[stats.columns[2]]
+        _variance_data = stats[stats.columns[3]]
         cls.plot_single_data_and_model(
             stats.index,
             _variance_data,
@@ -213,7 +221,8 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
             lambda x: _model["model"](x) + _variance_data.min(), # Adjust the model to the original variance
             r"$r^2$: " + f"{_model['r2']:.2f}",
             data_xlabel_units,
-            plt.gca()
+            plt.gca(),
+            dt_ratio=dt_ratio
         )
 
         plt.title(_variance_data.name)
@@ -232,6 +241,7 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
             "Poissonian regime",
             data_xlabel_units,
             plt.gca(),
+            dt_ratio=dt_ratio,
             line_linestyle="--",
             line_color="black"
         )
@@ -360,7 +370,6 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
     def compute_stats(self,
         DT: str,
         origin: str,
-        n_threshold: int | None = None,
         mutation_kind: str = "all"
     ) -> pd.DataFrame:
         """
@@ -372,31 +381,37 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
         :type DT: str
         :param origin: The string datetime that will be the origin of the grouping.
         :type origin: str
-        :param n_threshold: Minimum number of sequences required in a time interval to compute statistics.
-        :type n_threshold: int | None
         :param mutation_kind: The kind of mutation to compute the statistics for. Has to be one of ``all``, ``total``, ``substitutions``, ``insertions``, ``deletions`` or ``indels``. Default is ``all``.
         :return: The statistics of the data.
         :rtype: ``pd.DataFrame``
         """
 
-        grouped = self.date_grouper(self.data, DT, origin)
+        # Create a local copy of the data
+        _data = self.data.copy()
 
-        # Only keep weeks where the number of observations is greater than the threshold
-        if n_threshold:
+        # If the very first row's date is the same as the origin, and there happens to be only one entry for that date, duplicate that row; this way the stats for the first week can be computed (with variance = 0 of course)
+        if _data.iloc[0]["date"] == origin and len(_data[_data["date"] == origin]) == 1:
+            _data = pd.concat([_data, pd.DataFrame([_data.iloc[0]])], ignore_index=True)
+            _data.sort_values(by="date", inplace=True)
+            _data.reset_index(drop=True, inplace=True)
 
-            _filtered = grouped.filter(lambda x: len(x) >= n_threshold)
+        # Group the data by the datetime interval
+        grouped = self.date_grouper(_data, DT, origin)
 
-            if len(_filtered) == 0:
-                raise ValueError(
-                    f"No groups with at least {n_threshold} observations. Consider lowering the threshold."
-                )
+        # Only keep weeks where the number of observations is greater than 1
+        _filtered = grouped.filter(lambda x: len(x) >= 2)
 
-            grouped = self.date_grouper(
-                _filtered,
-                DT,
-                origin
+        if len(_filtered) == 0:
+            raise ValueError(
+                f"No groups with at least 2 observations. Consider widening the time interval."
             )
 
+        grouped = self.date_grouper(
+            _filtered,
+            DT,
+            origin
+        )
+
         levels = [
             f"number of {x}"
             for x in self._mutation_type_switch(mutation_kind)
@@ -416,7 +431,6 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
 
     def analysis(self,
         length: int,
-        n_threshold: int | None = None,
         show: bool = False,
         mutation_kind: str = "all",
         export_plots_filename: str | None = None
@@ -428,7 +442,6 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
         
         :param length: The length to filter by.
         :type length: int
-        :param n_threshold: Minimum number of sequences required in a time interval to compute statistics.
         :param show: Whether to show the plots or not. Default is False.
         :type show: bool
         :param mutation_kind: The kind of mutation to compute the statistics for. Has to be one of ``all``, ``total``, ``substitutions`` or ``indels``. Default is ``all``.
@@ -447,20 +460,22 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
         stats = self.compute_stats(
             self.dt,
             self.origin,
-            n_threshold,
             mutation_kind
         )
 
+        # Get weights for weighted fitting
+        weights = stats["size"]
 
         regs = {}
         # For each column in the statistics (except the date and the size), compute the corresponding regression model
         for col in stats.columns[1:-1]:
             if col.startswith("mean"):
                 _single_regression = {
-                    f"{col} per {self.dt} model": self.linear_regression(
+                    f"{col} model": self.linear_regression(
                         *self._remove_nan(
                             stats.index, # Regression is given by the index, so in time, it is the same as multiplying by dt days
-                            stats[col]
+                            stats[col],
+                            weights
                         )
                     )
                 }
@@ -468,33 +483,59 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
                 _single_regression = self.adjust_model(
                     stats.index,
                     stats[col] - stats[col].min(),
-                    name=f"scaled {col} per {self.dt} model"
+                    name=f"scaled {col} model",
+                    weights=weights.to_numpy().flatten()
                 )
             # Save the regression model
             regs.update(_single_regression)
 
+        # Add scaling correction to the regression models
+        for k, v in regs.items():
+            if v["expression"] == "mx + b":
+                m = v["parameters"]["m"]
+                b = v["parameters"]["b"]
+                regs[k]["parameters"]["m"] = m/self.dt_ratio
+                m = regs[k]["parameters"]["m"]
+                regs[k]["model"] = lambda x: m*x + b
+            elif v["expression"] == "mx":
+                m = v["parameters"]["m"]
+                regs[k]["parameters"]["m"] = m/self.dt_ratio
+                m = regs[k]["parameters"]["m"]
+                regs[k]["model"] = lambda x: m*x
+
+            elif v["expression"] == "d*x^alpha":
+                d = v["parameters"]["d"]
+                alpha = v["parameters"]["alpha"]
+                regs[k]["parameters"]["d"] = d/(self.dt_ratio**alpha)
+                d = regs[k]["parameters"]["d"]
+                regs[k]["model"] = lambda x: d*(x**alpha)
+
         # Sets of mutation types used in the analysis
         _sets = sorted({
             " ".join(x.split()[1:])
             for x in stats.columns[1:-1]
         })
 
+        stats["dt_idx"] = (stats["date"] - stats["date"].min()) / pd.Timedelta("7D")
+
         # Plot the results
         if show:
             # For each set of mutation types
             for _type in _sets:
                 self.plot_results(
-                    stats[["date", f"mean {_type}", f"var {_type}"]],
+                    stats[["date", "dt_idx", f"mean {_type}", f"var {_type}"]],
                     {
                         k: v
                         for k, v in regs.items()
                         if k in (
-                            f"mean {_type} per {self.dt} model",
-                            f"scaled var {_type} per {self.dt} model"
+                            f"mean {_type} model",
+                            f"scaled var {_type} model"
                         )
                     },
-                    f"in steps of {self.dt} since {self.origin}"
+                    "wk",
+                    self.dt_ratio
                 )
+
         # Export the plots
         if export_plots_filename:
             # Open pdf file pointer
@@ -502,19 +543,22 @@ class PyEvoMotion(PyEvoMotionParser, PyEvoMotionBase):
             # For each set of mutation types save the plots
             for _type in _sets:
                 self.export_plot_results(
-                    stats[["date", f"mean {_type}", f"var {_type}"]],
+                    stats[["date", "dt_idx", f"mean {_type}", f"var {_type}"]],
                     {
                         k: v
                         for k, v in regs.items()
                         if k in (
-                            f"mean {_type} per {self.dt} model",
-                            f"scaled var {_type} per {self.dt} model"
+                            f"mean {_type} model",
+                            f"scaled var {_type} model"
                         )
                     },
-                    f"in steps of {self.dt} since {self.origin}",
+                    "wk",
+                    self.dt_ratio,
                     pdf
                 )
             # Close pdf file pointer
             pdf.close()
 
         return stats, regs
+
+