plot-misc 2.1.0__tar.gz → 2.2.1__tar.gz

{plot_misc-2.1.0/plot_misc.egg-info → plot_misc-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plot-misc
-Version: 2.1.0
+Version: 2.2.1
 Summary: Various plotting templates built on top of matplotlib
 Author-email: A Floriaan Schmidt <floriaanschmidt@gmail.com>
 License-Expression: GPL-3.0-or-later
@@ -18,7 +18,6 @@ License-File: LICENSE
 Requires-Dist: pandas>=1.3
 Requires-Dist: numpy>=1.21
 Requires-Dist: matplotlib>=3.5
-Requires-Dist: seaborn>=0.11
 Requires-Dist: scipy>=1.5
 Requires-Dist: statsmodels>=0.1
 Requires-Dist: scikit-learn>=1.4
@@ -32,13 +31,24 @@ Requires-Dist: pytest>=6; extra == "dev"
 Requires-Dist: pytest-mock>=3; extra == "dev"
 Requires-Dist: pytest-dependency>=0.5; extra == "dev"
 Requires-Dist: bump2version>=1; extra == "dev"
+Requires-Dist: codespell; extra == "dev"
 Requires-Dist: jupyter; extra == "dev"
+Requires-Dist: sphinx_rtd_theme; extra == "dev"
+Requires-Dist: sphinx-bootstrap-theme; extra == "dev"
+Requires-Dist: furo; extra == "dev"
+Requires-Dist: myst-parser; extra == "dev"
+Requires-Dist: notebook; extra == "dev"
+Requires-Dist: nbsphinx; extra == "dev"
+Requires-Dist: nbsphinx-link; extra == "dev"
+Requires-Dist: sphinx-argparse; extra == "dev"
+Requires-Dist: numpydoc; extra == "dev"
+Requires-Dist: docutils<0.21; extra == "dev"
 Dynamic: license-file
 
 <img src="https://schmidtaf.gitlab.io/plot-misc/_images/icon.png" alt="plot-misc icon" width="250"/>
 
 # A collection of plotting functions
-__version__: `2.1.0`
+__version__: `2.2.1`
 
 This repository collects plotting modules written on top of `matplotlib`.
 The functions are intended to set up light-touch, basic illustrations that
@@ -48,7 +58,8 @@ covering forest plots, volcano plots, incidence matrices/bubble charts,
 illustrations to evaluate prediction models (e.g. feature importance, net benefit, calibration plots),
 and more.
 
-The documentation for plot-misc can be found [here](https://SchmidtAF.gitlab.io/plot-misc/). 
+Please consult the **[documentation](https://SchmidtAF.gitlab.io/plot-misc/)** 
+for plot-misc.
 
 ## Installation 
 The package is available on PyPI, and conda, with the latest source code 
@@ -58,7 +69,7 @@ available on gitlab.
 
 To install the package from PyPI, run:
 
-```sh
+```bash
 pip install plot-misc
 ```
 
@@ -69,50 +80,94 @@ This installs the latest stable release along with its dependencies.
 A Conda package is maintained in my personal Conda channel.
 To install from this channel, run:
 
-
-```sh
+```bash
 conda install afschmidt::plot-misc
 ```
 
 ### Installation using gitlab
 
-If you require the latest updates, potentially not yet formally released, you can install the package directly from GitLab.
+If you require the latest updates, potentially not yet formally released,
+you can install the package directly from GitLab.
 
 First, clone the repository and move into its root directory:
 
-```sh
+```bash
 git clone git@gitlab.com:SchmidtAF/plot-misc.git
 cd plot-misc
 ```
 
 Install the dependencies:
 
-```sh
+```bash
 # From the root of the repository
 conda env create --file ./resources/conda/envs/conda_create.yaml
 ```
 
 To add to an existing environment use:
 
-```sh
+```bash
 # From the root of the repository
 conda env update --file ./resources/conda/envs/conda_update.yaml
 ```
 
 Next the package can be installed: 
 
-```sh
-python -m pip install .
+```bash
+make install
 ```
 
-Or for an editable (developer) install run the command below from the 
-root of the repository.
-The difference with this is that you can just run `git pull` to 
-update repository, or switch branches without re-installing:
+#### Development
+For development work, install the package in editable mode with Git commit 
+hooks configured:
+
+```bash
+make install-dev
+```
+This command installs the package in editable mode and configures Git commit 
+hooks, allowing you to run `git pull` to update the repository or switch 
+branches without reinstalling.
 
-```sh
+Alternatively, you can install manually:
+```bash
 python -m pip install -e .
+python .setup_git_hooks.py
+```
+
+#### Git Hooks Configuration
+
 
+When setting up a development environment, the `setup-hooks` command 
+configures Git hooks to enforce conventional commit message formatting and 
+spell check using `codespell`.
+
+To view the commit message format requirements, run:
+
+```bash
+./.githooks/commit-msg -help
+```
+
+For frequent use, add this function to your shell configuration (`~/.bashrc` 
+or `~/.zshrc`):
+
+```bash
+commit-format-help() {
+    local git_root
+    git_root=$(git rev-parse --show-toplevel 2>/dev/null)
+    
+    if [ -z "$git_root" ]; then
+        echo "Error: Not inside a git repository"
+        return 1
+    fi
+    
+    local hook_path="$git_root/.githooks/commit-msg"
+    
+    if [ ! -f "$hook_path" ]; then
+        echo "Error: commit-msg hook not found"
+        return 1
+    fi
+    
+    "$hook_path" --help
+}
 ```
 
 #### Validating the package
@@ -120,7 +175,7 @@ python -m pip install -e .
 After installing the package from GitLab, you may wish to run the test
 suite to confirm everything is working as expected:
 
-```sh
+```bash
 # From the root of the repository
 pytest tests
 ```
@@ -131,3 +186,4 @@ Please have a look at the examples in
 [resources](https://gitlab.com/SchmidtAF/plot-misc/-/tree/master/resources/examples)
 for some possible recipes. 
 
+

{plot_misc-2.1.0 → plot_misc-2.2.1}/README.md

@@ -1,7 +1,7 @@
 <img src="https://schmidtaf.gitlab.io/plot-misc/_images/icon.png" alt="plot-misc icon" width="250"/>
 
 # A collection of plotting functions
-__version__: `2.1.0`
+__version__: `2.2.1`
 
 This repository collects plotting modules written on top of `matplotlib`.
 The functions are intended to set up light-touch, basic illustrations that
@@ -11,7 +11,8 @@ covering forest plots, volcano plots, incidence matrices/bubble charts,
 illustrations to evaluate prediction models (e.g. feature importance, net benefit, calibration plots),
 and more.
 
-The documentation for plot-misc can be found [here](https://SchmidtAF.gitlab.io/plot-misc/). 
+Please consult the **[documentation](https://SchmidtAF.gitlab.io/plot-misc/)** 
+for plot-misc.
 
 ## Installation 
 The package is available on PyPI, and conda, with the latest source code 
@@ -21,7 +22,7 @@ available on gitlab.
 
 To install the package from PyPI, run:
 
-```sh
+```bash
 pip install plot-misc
 ```
 
@@ -32,50 +33,94 @@ This installs the latest stable release along with its dependencies.
 A Conda package is maintained in my personal Conda channel.
 To install from this channel, run:
 
-
-```sh
+```bash
 conda install afschmidt::plot-misc
 ```
 
 ### Installation using gitlab
 
-If you require the latest updates, potentially not yet formally released, you can install the package directly from GitLab.
+If you require the latest updates, potentially not yet formally released,
+you can install the package directly from GitLab.
 
 First, clone the repository and move into its root directory:
 
-```sh
+```bash
 git clone git@gitlab.com:SchmidtAF/plot-misc.git
 cd plot-misc
 ```
 
 Install the dependencies:
 
-```sh
+```bash
 # From the root of the repository
 conda env create --file ./resources/conda/envs/conda_create.yaml
 ```
 
 To add to an existing environment use:
 
-```sh
+```bash
 # From the root of the repository
 conda env update --file ./resources/conda/envs/conda_update.yaml
 ```
 
 Next the package can be installed: 
 
-```sh
-python -m pip install .
+```bash
+make install
 ```
 
-Or for an editable (developer) install run the command below from the 
-root of the repository.
-The difference with this is that you can just run `git pull` to 
-update repository, or switch branches without re-installing:
+#### Development
+For development work, install the package in editable mode with Git commit 
+hooks configured:
+
+```bash
+make install-dev
+```
+This command installs the package in editable mode and configures Git commit 
+hooks, allowing you to run `git pull` to update the repository or switch 
+branches without reinstalling.
 
-```sh
+Alternatively, you can install manually:
+```bash
 python -m pip install -e .
+python .setup_git_hooks.py
+```
+
+#### Git Hooks Configuration
+
 
+When setting up a development environment, the `setup-hooks` command 
+configures Git hooks to enforce conventional commit message formatting and 
+spell check using `codespell`.
+
+To view the commit message format requirements, run:
+
+```bash
+./.githooks/commit-msg -help
+```
+
+For frequent use, add this function to your shell configuration (`~/.bashrc` 
+or `~/.zshrc`):
+
+```bash
+commit-format-help() {
+    local git_root
+    git_root=$(git rev-parse --show-toplevel 2>/dev/null)
+    
+    if [ -z "$git_root" ]; then
+        echo "Error: Not inside a git repository"
+        return 1
+    fi
+    
+    local hook_path="$git_root/.githooks/commit-msg"
+    
+    if [ ! -f "$hook_path" ]; then
+        echo "Error: commit-msg hook not found"
+        return 1
+    fi
+    
+    "$hook_path" --help
+}
 ```
 
 #### Validating the package
@@ -83,7 +128,7 @@ python -m pip install -e .
 After installing the package from GitLab, you may wish to run the test
 suite to confirm everything is working as expected:
 
-```sh
+```bash
 # From the root of the repository
 pytest tests
 ```
@@ -94,3 +139,4 @@ Please have a look at the examples in
 [resources](https://gitlab.com/SchmidtAF/plot-misc/-/tree/master/resources/examples)
 for some possible recipes. 
 
+

plot_misc-2.2.1/plot_misc/_version.py

@@ -0,0 +1 @@
+__version__ = '2.2.1'

{plot_misc-2.1.0 → plot_misc-2.2.1}/plot_misc/barchart.py

@@ -30,11 +30,12 @@ from plot_misc.errors import (
     is_df,
     Error_MSG,
 )
-from typing import Any, Optional
+from typing import Any
 from plot_misc.constants import Real
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 def bar(data:pd.DataFrame, label:str, column:str,
+        positions:np.ndarray | list[Real] | None = None,
         error_max:str | None = None, error_min:str | None = None,
         colours:list[str]=['tab:blue', 'tab:pink'], transparency:float=0.7,
         wd:Real=1.0, edgecolour:str='black',
@@ -54,9 +55,13 @@ def bar(data:pd.DataFrame, label:str, column:str,
         The column name for the axes labels.
     column : `str`
         The column name for the bar height values.
-    error_max : `str`, default `NoneType`
+    positions : `np.ndarray` or `list` or `None`, default `None`
+        Numeric positions for the bars along the category axis. If None,
+        bars are placed at integer positions 0, 1, 2, ... with tick
+        labels taken from the `label` column.
+    error_max : `str`, default `None`
         column name for the upper value of the error line segment.
-    error_min : `str`, default `NoneType`
+    error_min : `str`, default `None`
         column name for the lower value of the error line segment.
     colours : `list` [`str`], default ['tab:blue', 'tab:pink']
         Colours for the bars; recycled if shorter than the number of bars.
@@ -68,7 +73,7 @@ def bar(data:pd.DataFrame, label:str, column:str,
         The bar edgecolour.
     horizontal : `bool`, default `False`
         Whether plot a horizontal bar chart.
-    ax : `plt.ax`, default `NoneType`
+    ax : `plt.ax`, default `None`
         The pyplot.axes object.
     figsize : `tuple` [`float`, `float`], default (2, 2),
         The figure size in inches, when ax is set to None.
@@ -96,6 +101,7 @@ def bar(data:pd.DataFrame, label:str, column:str,
     is_df(data)
     is_type(label, str)
     is_type(column, str)
+    is_type(positions, (type(None), np.ndarray, list))
     is_type(colours, list)
     is_type(transparency, float)
     is_type(wd, (float, int))
@@ -117,10 +123,19 @@ def bar(data:pd.DataFrame, label:str, column:str,
     # ### check input
     if any(data.isna().any()):
         raise ValueError(Error_MSG.MISSING_DF.format('data'))
-    # ### get labels
+    # ### get labels and positions
     labels = data[label]
+    if positions is None:
+        pos = np.arange(len(labels))
+    else:
+        pos = np.asarray(positions)
+        if len(pos) != len(labels):
+            raise ValueError(
+                f'Length of positions ({len(pos)}) does not match '
+                f'number of rows in data ({len(labels)}).'
+            )
     # ### plotting
-    if horizontal == False:
+    if not horizontal:
         # plotting vertical bar chart
         new_kwargs = _update_kwargs(update_dict=kwargs_bar,
                                     edgecolor=edgecolour,
@@ -128,8 +143,10 @@ def bar(data:pd.DataFrame, label:str, column:str,
                                     alpha=transparency,
                                     zorder=2,
                                     )
-        bars = ax.bar(labels, height=data[column], **new_kwargs,
+        bars = ax.bar(pos, height=data[column], **new_kwargs,
                       )
+        ax.set_xticks(pos)
+        ax.set_xticklabels(labels)
     else:
         # plotting horizontal bar chart
         new_kwargs = _update_kwargs(update_dict=kwargs_bar,
@@ -138,13 +155,15 @@ def bar(data:pd.DataFrame, label:str, column:str,
                                     alpha=transparency,
                                     zorder=2,
                                     )
-        bars = ax.barh(labels, width=data[column], **new_kwargs,
+        bars = ax.barh(pos, width=data[column], **new_kwargs,
                        )
+        ax.set_yticks(pos)
+        ax.set_yticklabels(labels)
     # do we need to plot error bars
     if error_min is not None or error_max is not None:
         # finding the mid points of the bars and
         # initialising the bounds, allowing for one-sided limits.
-        if horizontal == False:
+        if not horizontal:
             min_l = [b.get_y() + b.get_height() for b in bars]
             max_l = min_l.copy()
         else:
@@ -164,7 +183,7 @@ def bar(data:pd.DataFrame, label:str, column:str,
                                     color='black',
                                     zorder=1,
                                     )
-        if horizontal == False:
+        if not horizontal:
             mids = [b.get_x() + b.get_width() / 2 for b in bars]
             ax.vlines(mids, min_l, max_l, **new_kwargs_error,)
         else:
@@ -178,10 +197,11 @@ def bar(data:pd.DataFrame, label:str, column:str,
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 def stack_bar(data:pd.DataFrame, label:str, columns:list[str],
+              positions:np.ndarray | list[Real] | None = None,
               colours:list[str]=['tab:blue', 'tab:pink'],
               transparency:float=0.7, wd:Real=1.0, edgecolour:str='black',
               horizontal:bool = False, figsize:tuple[Real,Real] = (2,2),
-              ax:plt.Axes | None = None, **kwargs:Optional[Any],
+              ax:plt.Axes | None = None, **kwargs:Any,
               ) -> tuple[plt.Figure, plt.Axes]:
     """
     Plot a stacked bar chart with each bar divided into segments.
@@ -194,6 +214,9 @@ def stack_bar(data:pd.DataFrame, label:str, columns:list[str],
         Column name used for bar labels.
     columns : `list` [`str`]
         Column names representing bar segments to stack.
+    positions : `np.ndarray` or `list` or `None`, default `None`
+        Numeric positions for the bars along the category axis. If None,
+        bars are placed at integer positions 0, 1, 2, ...
     colours : `list` [`str`]
         List of colours for each stack segment.
     transparency : `float`, default 0.7
@@ -204,7 +227,7 @@ def stack_bar(data:pd.DataFrame, label:str, columns:list[str],
         Colour for bar borders.
     horizontal : `bool`, default `False`
         Whether plot a horizontal barchart.
-    ax : `plt.ax`, default `NoneType`
+    ax : `plt.ax`, default `None`
         The pyplot.axes object.
     figsize : `tuple` [`float`, `float`], default (2, 2),
         The figure size in inches, when ax is set to None.
@@ -222,6 +245,7 @@ def stack_bar(data:pd.DataFrame, label:str, columns:list[str],
     is_df(data)
     is_type(label, str)
     is_type(columns, list)
+    is_type(positions, (type(None), np.ndarray, list))
     is_type(colours, list)
     is_type(transparency, float)
     is_type(wd, (float, int))
@@ -233,7 +257,7 @@ def stack_bar(data:pd.DataFrame, label:str, columns:list[str],
         f, ax = plt.subplots(figsize=figsize)
     else:
         f = ax.figure
-    # ### should not be any missings
+    # ### should not be any missing
     # NOTE consider making this into a function
     if any(data.isna().any()):
         raise ValueError(Error_MSG.MISSING_DF.format('data'))
@@ -254,17 +278,17 @@ def stack_bar(data:pd.DataFrame, label:str, columns:list[str],
                                     color=colours[idx],
                                     alpha=transparency,
                                     )
-        if horizontal == False:
+        if not horizontal:
             new_kwargs = _update_kwargs(new_kwargs, bottom=left,
                                         )
         else:
             new_kwargs = _update_kwargs(new_kwargs, left=left,
                                         )
         # The actual plotting
-        # NOTE adding wd here because it bar assigns it to either width or
+        # NOTE adding wd here because bar assigns it to either width or
         # height depending on horizontal.
-        _, ax = bar(data=data, label=label, column=name, horizontal=horizontal,
-                    wd=wd, ax=ax, kwargs_bar=new_kwargs,
+        _, ax = bar(data=data, label=label, column=name, positions=positions,
+                    horizontal=horizontal, wd=wd, ax=ax, kwargs_bar=new_kwargs,
                     )
         # updating the coordinate where the last bar stops
         left = left + data[name]
@@ -277,6 +301,7 @@ def stack_bar(data:pd.DataFrame, label:str, columns:list[str],
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 def subtotal_bar(data:pd.DataFrame, label:str, total_col:str,
                  subtotal_col: str | None = None,
+                 positions:np.ndarray | list[Real] | None = None,
                  colours:tuple[str,str]=('grey','tab:blue'),
                  transparency:tuple[float,float]=(0.7,0.9),
                  wd:tuple[float,float]=(1,0.6),
@@ -299,8 +324,11 @@ def subtotal_bar(data:pd.DataFrame, label:str, total_col:str,
         Column name for axis labels.
     total_col : `str`
         Column containing values for the base (total) bars.
-    subtotal_col : `str` or `None`, default `NoneType`
+    subtotal_col : `str` or `None`, default `None`
         Column containing values for (smaller) overlaid subtotal bars.
+    positions : `np.ndarray` or `list` or `None`, default `None`
+        Numeric positions for the bars along the category axis. If None,
+        bars are placed at integer positions 0, 1, 2, ...
     colours : `tuple` [`str`,`str`], default ("grey", "tab:blue")
         Colours for the total and subtotal bars.
     transparency : `tuple` [`float`,`float`], default (0.7, 0.9)
@@ -339,6 +367,7 @@ def subtotal_bar(data:pd.DataFrame, label:str, total_col:str,
     is_type(ax, (type(None), plt.Axes))
     is_type(total_col, str)
     is_type(subtotal_col, (str, type(None)))
+    is_type(positions, (type(None), np.ndarray, list))
     is_type(zorder, tuple)
     is_type(colours, tuple)
     is_type(transparency, tuple)
@@ -370,6 +399,7 @@ def subtotal_bar(data:pd.DataFrame, label:str, total_col:str,
         ax=ax,
         label=label,
         column=total_col,
+        positions=positions,
         colours=[colours[0]],
         transparency=transparency[0],
         wd=wd[0],
@@ -378,7 +408,7 @@ def subtotal_bar(data:pd.DataFrame, label:str, total_col:str,
         kwargs_bar=new_total_kwargs_bar,
     )
     # plot subtotal
-    if not subtotal_col is None:
+    if subtotal_col is not None:
         subtotal = data[subtotal_col]
         # updating kwargs
         new_subtotal_kwargs_bar = _update_kwargs(
@@ -390,6 +420,7 @@ def subtotal_bar(data:pd.DataFrame, label:str, total_col:str,
             ax=ax,
             label=label,
             column=subtotal_col,
+            positions=positions,
             colours=[colours[1]],
             transparency=transparency[1],
             wd=wd[1],
@@ -405,6 +436,7 @@ def subtotal_bar(data:pd.DataFrame, label:str, total_col:str,
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 def group_bar(data:pd.DataFrame, label:str, columns:list[str],
+              group_positions:np.ndarray | list[Real] | None = None,
               errors_max:list[str] | None = None,
               errors_min:list[str] | None = None,
               colours:list[str]=['tab:blue', 'tab:pink'],
@@ -433,10 +465,14 @@ def group_bar(data:pd.DataFrame, label:str, columns:list[str],
         Column name for group labels.
     column : `list` [`str`]
         Value columns to plot as grouped bars.
-    errors_max : `list` [`str`] or `None`, default `NoneType`
+    group_positions : `np.ndarray` or `list` or `None`, default `None`
+        Numeric positions for the group centres along the category axis.
+        If None, groups are placed at positions determined by
+        `group_spacing` (0, group_spacing, 2*group_spacing, ...).
+    errors_max : `list` [`str`] or `None`, default `None`
         Column names in `data` containing the upper values of the error bars.
         Should be structured similarly to `columns` if used.
-    errors_min : `list` [`str`] or `None` default `NoneType`
+    errors_min : `list` [`str`] or `None` default `None`
         Column names in `data` containing the lower values of the error bars.
     colours : `list` [`str`], default ['tab:blue', 'tab:pink']
         Colours for the bars. Recycled if fewer colours than `columns`.
@@ -448,7 +484,7 @@ def group_bar(data:pd.DataFrame, label:str, columns:list[str],
         The bar edge colours.
     horizontal : `bool`, default `False`
         Whether plot a horizontal barchart.
-    ax : `plt.ax`, default `NoneType`
+    ax : `plt.ax`, default `None`
         The pyplot.axes object.
     figsize : `tuple` [`float`, `float`], default (2, 2),
         The figure size in inches, when ax is set to None.
@@ -464,11 +500,10 @@ def group_bar(data:pd.DataFrame, label:str, columns:list[str],
     ax : plt.Axes
         The matplotlib Axes object with the plot.
     """
-    # constants
-    OFFSET_COL = "__offset__"
     # check input - most will be done by bar, just keeping the minimum
     is_df(data)
     is_type(columns, list)
+    is_type(group_positions, (type(None), np.ndarray, list))
     is_type(errors_max, (type(None),list))
     is_type(errors_min, (type(None),list))
     is_type(horizontal, bool)
@@ -483,8 +518,16 @@ def group_bar(data:pd.DataFrame, label:str, columns:list[str],
     # ### prepare the loop
     # the number of bars for each group
     n_bars = len(columns)
-    # the number of groups
-    base = np.arange(data.shape[0]) * group_spacing
+    # the base position of each group
+    if group_positions is None:
+        base = np.arange(data.shape[0]) * group_spacing
+    else:
+        base = np.asarray(group_positions)
+        if len(base) != data.shape[0]:
+            raise ValueError(
+                f'Length of group_positions ({len(base)}) does not '
+                f'match number of rows in data ({data.shape[0]}).'
+            )
     # the total width of all the bars in a single group
     spacing_per_bar = bar_spacing * wd
     total_spacing = spacing_per_bar * (n_bars - 1)
@@ -494,20 +537,19 @@ def group_bar(data:pd.DataFrame, label:str, columns:list[str],
     group_width = wd * n_bars + total_spacing
     tick_pos = base + (group_width - wd) / 2
     # looping
-    df_offset = data.copy()
     for i, column in enumerate(columns):
         # the location of the bar
         offset = base + i * (wd + spacing_per_bar)
-        df_offset[OFFSET_COL] = offset
         # cycling the colours
         col = colours[i % len(colours)]
         # the limits
         err_max = errors_max[i] if errors_max else None
         err_min = errors_min[i] if errors_min else None
         _ = bar(
-            data=df_offset,
-            label=OFFSET_COL,
+            data=data,
+            label=label,
             column=column,
+            positions=offset,
             error_max=err_max,
             error_min=err_min,
             colours=[col],

{plot_misc-2.1.0 → plot_misc-2.2.1}/plot_misc/constants.py

@@ -42,9 +42,9 @@ class ForestNames(object):
     PVALUE                         = 'p-value'
     CI                             = 'confidence_interval'
     data_table                     = 'data_table'
-    EmpericalSupport_Coverage      = 'coverage'
-    EmpericalSupport_Compatability = 'compatibility'
-    EmpericalSupportResults        = 'results_'
+    EmpiricalSupport_Coverage      = 'coverage'
+    EmpiricalSupport_Compatibility = 'compatibility'
+    EmpiricalSupportResults        = 'results_'
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Utils Names
@@ -103,7 +103,7 @@ class NamesIncidenceMatrix(object):
     GRID_POS_O   = 'outline'
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class NamesMachineLearnig(object):
+class NamesMachineLearning(object):
     '''
     Names used by machinelearning.py
     '''