diff --git a/.all-contributorsrc b/.all-contributorsrc
index b5a1e9d0..c888d999 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -85,6 +85,24 @@
"contributions": [
"doc"
]
+ },
+ {
+ "login": "dantrim",
+ "name": "Daniel Antrim",
+ "avatar_url": "https://avatars.githubusercontent.com/u/7841565?v=4",
+ "profile": "http://dantrim.github.io",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "nsmith-",
+ "name": "Nicholas Smith",
+ "avatar_url": "https://avatars.githubusercontent.com/u/6587412?v=4",
+ "profile": "https://github.com/nsmith-",
+ "contributions": [
+ "code"
+ ]
}
],
"contributorsPerLine": 7,
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 332b9464..83d87e73 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -4,11 +4,36 @@ detailed description of best practices for developing Scikit-HEP packages.
[skhep-dev-intro]: https://scikit-hep.org/developer/intro
-# Setting up a development environment
+# Contributing
+
+## Setting up a development environment
+
+### Nox
+
+The fastest way to start with development is to use nox. If you don't have nox,
+you can use `pipx run nox` to run it without installing, or `pipx install nox`.
+If you don't have pipx (pip for applications), then you can install with with
+`pip install pipx` (the only case were installing an application with regular
+pip is reasonable). If you use macOS, then pipx and nox are both in brew, use
+`brew install pipx nox`.
+
+To use, run `nox`. This will lint and test using every installed version of
+Python on your system, skipping ones that are not installed. You can also run
+specific jobs:
+
+```console
+$ nox -s lint # Lint only
+$ nox -s tests-3.9 # Python 3.9 tests only
+$ nox -s docs -- serve # Build and serve the docs
+$ nox -s build # Make an SDist and wheel
+```
+
+Nox handles everything for you, including setting up an temporary virtual
+environment for each run.
### PyPI
-You can set up a development environment using PyPI.
+For extended development, you can set up a development environment using PyPI.
```bash
$ python3 -m venv venv
@@ -29,7 +54,7 @@ $ conda activate hist
(hist)$ python -m ipykernel install --name hist
```
-# Post setup
+## Post setup
You should prepare pre-commit, which will help you by checking that commits
pass required checks:
@@ -42,7 +67,7 @@ pre-commit install # Will install a pre-commit hook into the git repo
You can also/alternatively run `pre-commit run` (changes only) or `pre-commit
run --all-files` to check even without installing the hook.
-# Testing
+## Testing
Use PyTest to run the unit checks:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f7e6183d..a0279dfa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
strategy:
matrix:
python-version:
- - 3.6
+ - 3.7
- 3.8
- 3.9
name: Check Python ${{ matrix.python-version }}
@@ -40,8 +40,11 @@ jobs:
- name: Test package
run: python -m pytest
+ - name: Temporarily pin mplhep
+ run: echo "mplhep<=0.3.7" >> constraints.txt
+
- name: Install plotting requirements too
- run: python -m pip install -e ".[test,plot]"
+ run: python -m pip install -e ".[test,plot]" -c constraints.txt
- name: Test plotting too
run: python -m pytest --mpl
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8a66a33d..907e5f0e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/psf/black
- rev: 21.5b2
+ rev: 21.7b0
hooks:
- id: black
@@ -19,15 +19,15 @@ repos:
- id: trailing-whitespace
- repo: https://github.com/PyCQA/isort
- rev: 5.8.0
+ rev: 5.9.3
hooks:
- id: isort
- repo: https://github.com/asottile/pyupgrade
- rev: v2.19.0
+ rev: v2.23.3
hooks:
- id: pyupgrade
- args: [--py36-plus]
+ args: [--py37-plus]
- repo: https://github.com/asottile/setup-cfg-fmt
rev: v1.17.0
@@ -36,13 +36,13 @@ repos:
# Notebook formatting
- repo: https://github.com/nbQA-dev/nbQA
- rev: 0.10.0
+ rev: 1.1.0
hooks:
- id: nbqa-black
additional_dependencies: [black==20.8b1]
- id: nbqa-pyupgrade
- additional_dependencies: [pyupgrade==2.7.4]
- args: ["--py36-plus"]
+ additional_dependencies: [pyupgrade==2.12.0]
+ args: ["--py37-plus"]
- repo: https://github.com/pycqa/flake8
rev: 3.9.2
@@ -52,11 +52,12 @@ repos:
additional_dependencies: [flake8-bugbear]
- repo: https://github.com/pre-commit/mirrors-mypy
- rev: v0.812
+ rev: v0.910
hooks:
- id: mypy
files: ^src
- additional_dependencies: ["numpy>=1.20", "matplotlib>=3.3", "boost-histogram~=1.0.1"]
+ args: []
+ additional_dependencies: ["numpy==1.21.*", "matplotlib>=3.3", "boost-histogram~=1.0.1", "uhi~=0.3.0"]
- repo: https://github.com/mgedmin/check-manifest
rev: "0.46"
diff --git a/README.md b/README.md
index f74b8188..ada56787 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,6 @@
[![pre-commit.ci status][pre-commit-badge]][pre-commit-link]
[![Code style: black][black-badge]][black-link]
-
[![PyPI version][pypi-version]][pypi-link]
[![Conda-Forge][conda-badge]][conda-link]
[![PyPI platforms][pypi-platforms]][pypi-link]
@@ -19,7 +18,7 @@
Hist is an analyst-friendly front-end for
[boost-histogram](https://github.com/scikit-hep/boost-histogram), designed for
-Python 3.7+ (3.6 users get version 2.3). See [what's new](https://hist.readthedocs.io/en/latest/changelog.html).
+Python 3.7+ (3.6 users get version 2.4). See [what's new](https://hist.readthedocs.io/en/latest/changelog.html).
## Installation
@@ -110,7 +109,7 @@ From a git checkout, run:
python -m pip install -e .[dev]
```
-See [CONTRIBUTING.md](./.github/CONTRIBUTING.md) for information on setting up a development environment.
+See [Contributing](https://hist.readthedocs.io/en/latest/contributing.html) guidelines for information on setting up a development environment.
## Contributors
@@ -130,6 +129,8 @@ We would like to acknowledge the contributors that made this project possible ([
@@ -138,14 +139,12 @@ We would like to acknowledge the contributors that made this project possible ([
-
-
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification.
## Talks
-* [2020-07-07 SciPy Proceedings](https://www.youtube.com/watch?v=ERraTfHkPd0&list=PLYx7XA2nY5GfY4WWJjG5cQZDc7DIUmn6Z&index=4)
-* [2020-07-17 PyHEP2020](https://indico.cern.ch/event/882824/contributions/3931299/)
+- [2020-07-07 SciPy Proceedings](https://www.youtube.com/watch?v=ERraTfHkPd0&list=PLYx7XA2nY5GfY4WWJjG5cQZDc7DIUmn6Z&index=4)
+- [2020-07-17 PyHEP2020](https://indico.cern.ch/event/882824/contributions/3931299/)
---
@@ -155,7 +154,6 @@ This library was primarily developed by Henry Schreiner and Nino Lau.
Support for this work was provided by the National Science Foundation cooperative agreement OAC-1836650 (IRIS-HEP) and OAC-1450377 (DIANA/HEP). Any opinions, findings, conclusions or recommendations expressed in this material are those of the authors and do not necessarily reflect the views of the National Science Foundation.
-
[actions-badge]: https://github.com/scikit-hep/hist/workflows/CI/badge.svg
[actions-link]: https://github.com/scikit-hep/hist/actions
[black-badge]: https://img.shields.io/badge/code%20style-black-000000.svg
diff --git a/docs/_images/axis_category.png b/docs/_images/axis_category.png
new file mode 100644
index 00000000..10c937a0
Binary files /dev/null and b/docs/_images/axis_category.png differ
diff --git a/docs/_images/axis_circular.png b/docs/_images/axis_circular.png
new file mode 100644
index 00000000..bb158448
Binary files /dev/null and b/docs/_images/axis_circular.png differ
diff --git a/docs/_images/axis_integer.png b/docs/_images/axis_integer.png
new file mode 100644
index 00000000..cb3e3f3e
Binary files /dev/null and b/docs/_images/axis_integer.png differ
diff --git a/docs/_images/axis_regular.png b/docs/_images/axis_regular.png
new file mode 100644
index 00000000..a556c49a
Binary files /dev/null and b/docs/_images/axis_regular.png differ
diff --git a/docs/_images/axis_variable.png b/docs/_images/axis_variable.png
new file mode 100644
index 00000000..60fc1b79
Binary files /dev/null and b/docs/_images/axis_variable.png differ
diff --git a/docs/_images/ex_hist_density.png b/docs/_images/ex_hist_density.png
new file mode 100644
index 00000000..37afdbe4
Binary files /dev/null and b/docs/_images/ex_hist_density.png differ
diff --git a/docs/_images/histogram_design.png b/docs/_images/histogram_design.png
new file mode 100644
index 00000000..a08a079f
Binary files /dev/null and b/docs/_images/histogram_design.png differ
diff --git a/docs/_src/images/.gitignore b/docs/_src/images/.gitignore
new file mode 100644
index 00000000..ecf5e870
--- /dev/null
+++ b/docs/_src/images/.gitignore
@@ -0,0 +1,2 @@
+*.pdf
+*.png
diff --git a/docs/_src/images/Makefile b/docs/_src/images/Makefile
new file mode 100644
index 00000000..893bed72
--- /dev/null
+++ b/docs/_src/images/Makefile
@@ -0,0 +1,14 @@
+SRC = $(wildcard *.tex)
+PDFs = $(patsubst %.tex, %.pdf, $(SRC))
+PNGs = $(patsubst %.tex, %.png, $(SRC))
+
+.PHONY: all
+
+all: $(PNGs)
+
+%.pdf: %.tex Makefile
+ pdflatex $<
+ @rm $*.aux $*.log
+
+%.png: %.pdf
+ convert -density 150 $< -quality 95 -colorspace Gray $@
diff --git a/docs/_src/images/axis_category.tex b/docs/_src/images/axis_category.tex
new file mode 100644
index 00000000..507a1366
--- /dev/null
+++ b/docs/_src/images/axis_category.tex
@@ -0,0 +1,39 @@
+\documentclass{article}
+\usepackage{tikz}
+\usetikzlibrary{arrows, calc, decorations.pathreplacing}
+\usepackage{units}
+\usepackage[graphics, active, tightpage]{preview}
+\usepackage{pgfplots}
+\usepackage{amsmath}
+\usepackage[outline]{contour}
+\contourlength{1.2pt}
+\usepackage{ocr}
+\PreviewEnvironment{tikzpicture}
+
+\pgfplotsset{compat=1.16}
+
+\definecolor{presDark}{RGB}{39,1,136}
+\definecolor{presDark2}{RGB}{87,80,149}
+\definecolor{presLight}{RGB}{139,131,215}
+\definecolor{presLight2}{RGB}{0,129,203}
+
+\definecolor{presHighlight}{RGB}{215,50,50}
+
+\begin{document}
+
+\begin{tikzpicture}[
+ xscale=4,
+ every path/.style={thick}]
+\draw (0,0) -- (1,0);
+\foreach \i in {0, .2, ..., 1} {
+ \draw (\i,0) -- (\i,.2);
+}
+\node at (.1, 0) [above] {2};
+\node at (.3, 0) [above] {5};
+\node at (.5, 0) [above] {8};
+\node at (.7, 0) [above] {3};
+\node at (.9, 0) [above] {7};
+\node at (.5,0) [below] {\verb|hist.axis.IntCategory([2,5,8,3,7])|};
+\end{tikzpicture}
+
+\end{document}
diff --git a/docs/_src/images/axis_circular.tex b/docs/_src/images/axis_circular.tex
new file mode 100644
index 00000000..a5ff07e4
--- /dev/null
+++ b/docs/_src/images/axis_circular.tex
@@ -0,0 +1,37 @@
+\documentclass{article}
+\usepackage{tikz}
+\usetikzlibrary{arrows, calc, decorations.pathreplacing}
+\usepackage{units}
+\usepackage[graphics, active, tightpage]{preview}
+\usepackage{pgfplots}
+\usepackage{amsmath}
+\usepackage[outline]{contour}
+\contourlength{1.2pt}
+\usepackage{ocr}
+\PreviewEnvironment{tikzpicture}
+
+\pgfplotsset{compat=1.16}
+
+\definecolor{presDark}{RGB}{39,1,136}
+\definecolor{presDark2}{RGB}{87,80,149}
+\definecolor{presLight}{RGB}{139,131,215}
+\definecolor{presLight2}{RGB}{0,129,203}
+
+\definecolor{presHighlight}{RGB}{215,50,50}
+
+\begin{document}
+
+\begin{tikzpicture}[
+ every path/.style={thick}]
+\draw (0,0) circle (.75);
+\foreach \i in {0, 45, ..., 360} {
+ \draw (\i:.75) -- (\i:.95);
+}
+\node at (0:.95) [right] {$\pi/2$};
+\node at (90:.95) [above] {0, $2\pi$};
+\node at (180:.95) [left] {$\pi$};
+\node at (270:.95) [below] {$3\pi/3$};
+\node at (0,-1.3) [below] {\verb|hist.axis.Regular(8,0,2*np.pi, circular=True)|};
+\end{tikzpicture}
+
+\end{document}
diff --git a/docs/_src/images/axis_integer.tex b/docs/_src/images/axis_integer.tex
new file mode 100644
index 00000000..01803492
--- /dev/null
+++ b/docs/_src/images/axis_integer.tex
@@ -0,0 +1,37 @@
+\documentclass{article}
+\usepackage{tikz}
+\usetikzlibrary{arrows, calc, decorations.pathreplacing}
+\usepackage{units}
+\usepackage[graphics, active, tightpage]{preview}
+\usepackage{pgfplots}
+\usepackage{amsmath}
+\usepackage[outline]{contour}
+\contourlength{1.2pt}
+\usepackage{ocr}
+\PreviewEnvironment{tikzpicture}
+
+\pgfplotsset{compat=1.16}
+
+\definecolor{presDark}{RGB}{39,1,136}
+\definecolor{presDark2}{RGB}{87,80,149}
+\definecolor{presLight}{RGB}{139,131,215}
+\definecolor{presLight2}{RGB}{0,129,203}
+
+\definecolor{presHighlight}{RGB}{215,50,50}
+
+\begin{document}
+
+\begin{tikzpicture}[
+ xscale=4,
+ every path/.style={thick}]
+\draw (0,0) -- (1,0);
+\foreach \i in {0, .2, ..., 1} {
+ \draw (\i,0) -- (\i,.2);
+}
+\foreach \i in {0,...,4} {
+ \node at (\i/5 + .1, 0) [above] {\i};
+}
+\node at (.5,0) [below] {\verb|hist.axis.Integer(0,5)|};
+\end{tikzpicture}
+
+\end{document}
diff --git a/docs/_src/images/axis_regular.tex b/docs/_src/images/axis_regular.tex
new file mode 100644
index 00000000..ce621c75
--- /dev/null
+++ b/docs/_src/images/axis_regular.tex
@@ -0,0 +1,37 @@
+\documentclass{article}
+\usepackage{tikz}
+\usetikzlibrary{arrows, calc, decorations.pathreplacing}
+\usepackage{units}
+\usepackage[graphics, active, tightpage]{preview}
+\usepackage{pgfplots}
+\usepackage{amsmath}
+\usepackage[outline]{contour}
+\contourlength{1.2pt}
+\usepackage{ocr}
+\PreviewEnvironment{tikzpicture}
+
+\pgfplotsset{compat=1.16}
+
+\definecolor{presDark}{RGB}{39,1,136}
+\definecolor{presDark2}{RGB}{87,80,149}
+\definecolor{presLight}{RGB}{139,131,215}
+\definecolor{presLight2}{RGB}{0,129,203}
+
+\definecolor{presHighlight}{RGB}{215,50,50}
+
+\begin{document}
+
+\begin{tikzpicture}[
+ xscale=4,
+ every path/.style={thick}]
+\draw (0,0) -- (1,0);
+\foreach \i in {0, .1, ..., 1.1} {
+ \draw (\i,0) -- (\i,.2);
+}
+\node at (0,.2) [above] {0};
+\node at (.5,.2) [above] {0.5};
+\node at (1,.2) [above] {1};
+\node at (.5,0) [below] {\verb|hist.axis.Regular(10,0,1)|};
+\end{tikzpicture}
+
+\end{document}
diff --git a/docs/_src/images/axis_variable.tex b/docs/_src/images/axis_variable.tex
new file mode 100644
index 00000000..27dcb346
--- /dev/null
+++ b/docs/_src/images/axis_variable.tex
@@ -0,0 +1,38 @@
+\documentclass{article}
+\usepackage{tikz}
+\usetikzlibrary{arrows, calc, decorations.pathreplacing}
+\usepackage{units}
+\usepackage[graphics, active, tightpage]{preview}
+\usepackage{pgfplots}
+\usepackage{amsmath}
+\usepackage[outline]{contour}
+\contourlength{1.2pt}
+\usepackage{ocr}
+\PreviewEnvironment{tikzpicture}
+
+\pgfplotsset{compat=1.16}
+
+\definecolor{presDark}{RGB}{39,1,136}
+\definecolor{presDark2}{RGB}{87,80,149}
+\definecolor{presLight}{RGB}{139,131,215}
+\definecolor{presLight2}{RGB}{0,129,203}
+
+\definecolor{presHighlight}{RGB}{215,50,50}
+
+\begin{document}
+
+\begin{tikzpicture}[
+ xscale=4,
+ every path/.style={thick}]
+\draw (0,0) -- (1,0);
+\foreach \i in {0, .3, .5, 1} {
+ \draw (\i,0) -- (\i,.2);
+}
+\node at (0,.2) [above] {0};
+\node at (.3,.2) [above] {0.3};
+\node at (.5,.2) [above] {0.5};
+\node at (1,.2) [above] {1};
+\node at (.5,0) [below] {\verb|hist.axis.Variable([0,.3,.5,1])|};
+\end{tikzpicture}
+
+\end{document}
diff --git a/docs/changelog.rst b/docs/changelog.rst
index c7226173..e55bf980 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,65 @@
Changelog
====================
+Version 2.5.0
+--------------------
+
+* Dropped Python 3.6 support.
+ `#194 `_
+
+* Add ``"efficiency"`` ``uncertainty_type`` option for ``ratio_plot`` API.
+ `#266 `_
+ `#278 `_
+
+* Improve and clarify treatment of confidence intervals in ``intervals`` submodule.
+ `#281 `_
+
+
+Version 2.4.0
+--------------------
+
+* Support ``.stack(axis)`` and stacked histograms.
+ `#244 `_
+ `#257 `_
+ `#258 `_
+
+* Support selection lists (experimental with boost-histogram 1.1.0).
+ `#255 `_
+
+* Support full names for QuickConstruct, and support mistaken usage in constructor.
+ `#256 `_
+
+* Add ``.sort(axis)`` for quickly sorting a categorical axis.
+ `#243 `_
+
+
+Smaller features or fixes:
+
+* Support nox for easier contributor setup.
+ `#228 `_
+
+* Better name axis error.
+ `#232 `_
+
+* Fix for issue plotting size 0 axes.
+ `#238 `_
+
+* Fix issues with repr information missing.
+ `#241 `_
+
+* Fix issues with wrong plot shortcut being triggered by Integer axes.
+ `#247 `_
+
+* Warn and better error if overlapping keyword used as axis name.
+ `#250 `_
+
+Along with lots of smaller docs updates.
+
+
+
+
+
+
Version 2.3.0
--------------------
diff --git a/docs/conf.py b/docs/conf.py
index 2ea652b5..35518219 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -4,13 +4,22 @@
# list see the documentation:
# https://www.sphinx-doc.org/en/master/usage/configuration.html
+from __future__ import annotations
+
# Warning: do not change the path here. To use autodoc, you need to install the
# package first.
-
-from typing import List
+import os
+import shutil
+import sys
+from pathlib import Path
from pkg_resources import get_distribution
+DIR = Path(__file__).parent.resolve()
+BASEDIR = DIR.parent
+
+sys.path.append(str(BASEDIR / "src/hist"))
+
# -- Project information -----------------------------------------------------
project = "Hist"
@@ -30,6 +39,7 @@
"sphinx.ext.mathjax",
"sphinx.ext.napoleon",
"sphinx_copybutton",
+ "myst_parser",
]
# Add any paths that contain templates here, relative to this directory.
@@ -63,7 +73,7 @@
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path: List[str] = []
+html_static_path: list[str] = []
# -- Options for Notebook input ----------------------------------------------
@@ -81,3 +91,24 @@
]
nbsphinx_kernel_name = "python3"
+
+
+def prepare(app):
+ outer = BASEDIR / ".github"
+ inner = DIR
+ contributing = "CONTRIBUTING.md"
+ shutil.copy(outer / contributing, inner / "contributing.md")
+
+
+def clean_up(app, exception):
+ inner = DIR
+ os.unlink(inner / "contributing.md")
+
+
+def setup(app):
+
+ # Copy the file in
+ app.connect("builder-inited", prepare)
+
+ # Clean up the generated file
+ app.connect("build-finished", clean_up)
diff --git a/docs/development.rst b/docs/development.rst
deleted file mode 100644
index f0e59235..00000000
--- a/docs/development.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-Development
-===========================
-
-We welcome you to contribute to this project. If you want to develop this package, you can
-use the following methods.
-
-Pip
-------------------------
-
-You can set up a development environment using pip.
-
-.. code-block:: bash
-
- python3 -m venv .env # Make a new environment in ./.env/
- source .env/bin/activate # Use the new environment
- (.env)$ pip install -e .[dev]
- (.env)$ python -m ipykernel install --user --name hist
-
-*You should have pip 10 or later*.
-
-Conda
--------------------------
-
-You can also set up a development environment using Conda. With Conda, you can search some channels for development.
-
-.. code-block:: bash
-
- $ conda env create -f dev-environment.yml -n hist
- $ conda activate hist
- (hist)$ python -m ipykernel install --name hist
diff --git a/docs/examples/index.rst b/docs/examples/index.rst
deleted file mode 100644
index 4d5ff29c..00000000
--- a/docs/examples/index.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-.. _examples:
-
-Examples
-========
-
-.. toctree::
- :maxdepth: 2
- :titlesonly:
- :glob:
-
- HistDemo
diff --git a/docs/index.rst b/docs/index.rst
index bc0c8876..25d50c27 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,29 +1,58 @@
+.. image:: _images/histlogo.png
+ :width: 60%
+ :alt: Hist logo
+ :align: center
Welcome to Hist's documentation!
================================
+|Actions Status| |Documentation Status| |pre-commit.ci Status| |Code style: black| |PyPI version|
+|Conda-Forge| |PyPI platforms| |DOI| |GitHub Discussion| |Gitter| |Scikit-HEP|
Introduction
------------
`Hist `_ is a powerful Histogramming tool for analysis based on `boost-histogram `_ (the Python binding of the Histogram library in Boost). It is a friendly analysis-focused project that uses `boost-histogram `_ as a backend to do the work, but provides plotting tools, shortcuts, and new ideas.
-To get an idea of creating histograms in Hist looks like, you can take a look at the :doc:`Examples `. Once you have a feel for what is involved in using Hist, we recommend you start by following the instructions in :doc:`Installation `. Then, go through the :doc:`User Guide `, and read the :doc:`Reference ` documentation. We value your contributions and you can follow the instructions in :doc:`Development `. Finally, if you’re having problems, please do let us know at our :doc:`Support ` page.
+To get an idea of creating histograms in Hist looks like, you can take a look at the :doc:`Examples `. Once you have a feel for what is involved in using Hist, we recommend you start by following the instructions in :doc:`Installation `. Then, go through the :doc:`User Guide `, and read the :doc:`Reference ` documentation. We value your contributions and you can follow the instructions in :doc:`Contributing `. Finally, if you’re having problems, please do let us know at our :doc:`Support ` page.
.. toctree::
:maxdepth: 2
:titlesonly:
- :caption: Contents
+ :caption: User Guide
:glob:
installation
- user-guide/index
- examples/index
- development
+ user-guide/quickstart
+ user-guide/axes
+ user-guide/storages
+ user-guide/accumulators
+ user-guide/notebooks/Transform
+ user-guide/notebooks/Reprs
+ user-guide/notebooks/Plots
+ user-guide/analyses
+ user-guide/notebooks/Histogram
+ user-guide/notebooks/Stack
+
+.. toctree::
+ :maxdepth: 2
+ :titlesonly:
+ :caption: Developers
+ :glob:
+
+ contributing
support
changelog
+.. toctree::
+ :maxdepth: 2
+ :titlesonly:
+ :caption: Examples
+ :glob:
+
+ examples/HistDemo
+
.. toctree::
:maxdepth: 2
:titlesonly:
@@ -40,3 +69,26 @@ Indices and tables
* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`
+
+.. |Actions Status| image:: https://github.com/scikit-hep/hist/workflows/CI/badge.svg
+ :target: https://github.com/scikit-hep/hist/actions
+.. |Documentation Status| image:: https://readthedocs.org/projects/hist/badge/?version=latest
+ :target: https://hist.readthedocs.io/en/latest/?badge=latest
+.. |pre-commit.ci Status| image:: https://results.pre-commit.ci/badge/github/scikit-hep/hist/main.svg
+ :target: https://results.pre-commit.ci/repo/github/scikit-hep/hist
+.. |Code style: black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
+ :target: https://github.com/psf/black
+.. |PyPI version| image:: https://badge.fury.io/py/hist.svg
+ :target: https://pypi.org/project/hist/
+.. |Conda-Forge| image:: https://img.shields.io/conda/vn/conda-forge/hist
+ :target: https://github.com/conda-forge/hist-feedstock
+.. |PyPI platforms| image:: https://img.shields.io/pypi/pyversions/hist
+ :target: https://pypi.org/project/hist/
+.. |DOI| image:: https://zenodo.org/badge/239605861.svg
+ :target: https://zenodo.org/badge/latestdoi/239605861
+.. |GitHub Discussion| image:: https://img.shields.io/static/v1?label=Discussions&message=Ask&color=blue&logo=github
+ :target: https://github.com/scikit-hep/hist/discussions
+.. |Gitter| image:: https://badges.gitter.im/HSF/PyHEP-histogramming.svg
+ :target: https://gitter.im/HSF/PyHEP-histogramming?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge
+.. |Scikit-HEP| image:: https://scikit-hep.org/assets/images/Scikit--HEP-Project-blue.svg
+ :target: https://scikit-hep.org/
diff --git a/docs/installation.rst b/docs/installation.rst
index 098f277a..fd120bd5 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -1,10 +1,21 @@
Installation
===========================
-Hist is now available on PyPI. You can install this library from PyPI with pip:
+Hist is available on PyPI. You can install this library from PyPI with pip:
.. code-block:: bash
python3 -m pip install "hist[plot]"
If you do not need the plotting features, you can skip the ``[plot]`` extra.
+
+You can also install it with Conda from conda-forge.
+
+.. code-block:: bash
+
+ conda install -c conda-forge hist
+
+
+Supported platforms are identical to
+`boost-histogram `_,
+though for the latest version of Hist you need Python 3.7+.
diff --git a/docs/reference/hist.rst b/docs/reference/hist.rst
index 4ae78a58..26d6054e 100644
--- a/docs/reference/hist.rst
+++ b/docs/reference/hist.rst
@@ -76,6 +76,14 @@ hist.numpy module
:undoc-members:
:show-inheritance:
+hist.stack module
+-------------------
+
+.. automodule:: hist.stack
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
hist.storage module
-------------------
diff --git a/docs/user-guide/accumulators.rst b/docs/user-guide/accumulators.rst
new file mode 100644
index 00000000..d2924c52
--- /dev/null
+++ b/docs/user-guide/accumulators.rst
@@ -0,0 +1,162 @@
+.. _usage-accumulators:
+
+Accumulators
+============
+
+Common properties
+-----------------
+
+All accumulators can be filled like a histogram. You just call `.fill` with
+values, and this looks and behaves like filling a single-bin or "scalar"
+histogram. Like histograms, the fill is inplace.
+
+All accumulators have a `.value` property as well, which gives the primary
+value being accumulated.
+
+Types
+-----
+
+There are several accumulators.
+
+Sum
+^^^
+
+This is the simplest accumulator, and is never returned from a histogram. This
+is internally used by the Double and Unlimited storages to perform sums when
+needed. It uses a highly accurate Neumaier sum to compute the floating point
+sum with a correction term. Since this accumulator is never returned by a
+histogram, it is not available in a view form, but only as a single accumulator
+for comparison and access to the algorithm. Usage example in Python 3.8,
+showing how non-accurate sums fail to produce the obvious answer, 2.0::
+
+ import math
+ import numpy as np
+ import hist
+
+ values = [1.0, 1e100, 1.0, -1e100]
+ print(f"{sum(values) = } (simple)")
+ print(f"{math.fsum(values) = }")
+ print(f"{np.sum(values) = } (pairwise)")
+ print(f"{hist.accumulators.Sum().fill(values) = }")
+
+.. code:: text
+
+ sum(values) = 0.0 (simple)
+ math.fsum(values) = 2.0
+ np.sum(values) = 0.0 (pairwise)
+ hist.accumulators.Sum().fill(values) = Sum(0 + 2)
+
+
+Note that this is still intended for performance and does not guarantee
+correctness as ``math.fsum`` does. In general, you must not have more than two
+orders of values::
+
+ values = [1., 1e100, 1e50, 1., -1e50, -1e100]
+ print(f"{math.fsum(values) = }")
+ print(f"{hist.accumulators.Sum().fill(values) = }")
+
+.. code:: text
+
+ math.fsum(values) = 2.0
+ hist.accumulators.Sum().fill(values) = Sum(0 + 0)
+
+You should note that this is a highly contrived example and the Sum accumulator
+should still outperform simple and pairwise summation methods for a minimal
+performance cost. Most notably, you have to have large cancellations with
+negative values, which histograms generally do not have.
+
+You can use ``+=`` with a float value or a Sum to fill as well.
+
+WeightedSum
+^^^^^^^^^^^
+
+This accumulator is contained in the Weight storage, and supports Views. It
+provides two values; ``.value``, and ``.variance``. The value is the sum of the
+weights, and the variance is the sum of the squared weights.
+
+For example, you could sum the following values::
+
+ import hist
+
+ values = [10]*10
+ smooth = hist.accumulators.WeightedSum().fill(values)
+ print(f"{smooth = }")
+
+ values = [1]*9 + [91]
+ rough = hist.accumulators.WeightedSum().fill(values)
+ print(f"{rough = }")
+
+.. code:: text
+
+ smooth = WeightedSum(value=100, variance=1000)
+ rough = WeightedSum(value=100, variance=8290)
+
+When filling, you can optionally provide a ``variance=`` keyword, with either a
+single value or a matching length array of values.
+
+You can also fill with ``+=`` on a value or another WeighedSum.
+
+Mean
+^^^^
+
+This accumulator is contained in the Mean storage, and supports Views. It
+provides three values; ``.count``, ``.value``, and ``.variance``. Internally,
+the variance is stored as ``_sum_of_deltas_squared``, which is used to compute
+``variance``.
+
+For example, you could compute the mean of the following values::
+
+ import hist
+
+ values = [10]*10
+ smooth = hist.accumulators.Mean().fill(values)
+ print(f"{smooth = }")
+
+ values = [1]*9 + [91]
+ rough = hist.accumulators.Mean().fill(values)
+ print(f"{rough = }")
+
+.. code:: text
+
+ smooth = Mean(count=10, value=10, variance=0)
+ rough = Mean(count=10, value=10, variance=810)
+
+You can add a `weight=` keyword when filling, with either a single value
+or a matching length array of values.
+
+You can call a Mean with a value or with another Mean to fill inplace, as well.
+
+WeightedMean
+^^^^^^^^^^^^
+
+This accumulator is contained in the WeightedMean storage, and supports Views.
+It provides four values; ``.sum_of_weights``, ``sum_of_weights_squared``,
+``.value``, and ``.variance``. Internally, the variance is stored as
+``_sum_of_weighted_deltas_squared``, which is used to compute ``variance``.
+
+For example, you could compute the mean of the following values::
+
+ import hist
+
+ values = [1]*9 + [91]
+ wm = hist.accumulators.WeightedMean().fill(values, weight=2)
+ print(f"{wm = }")
+
+.. code:: text
+
+ wm = WeightedMean(sum_of_weights=20, sum_of_weights_squared=40, value=10, variance=810)
+
+You can add a `weight=` keyword when filling, with either a single value or a
+matching length array of values.
+
+You can call a WeightedMean with a value or with another WeightedMean to fill
+inplace, as well.
+
+Views
+-----
+
+Most of the accumulators (except Sum) support a View. This is what is returned from
+a histogram when ``.view()`` is requested. This is a structured Numpy ndarray, with a few small
+additions to make them easier to work with. Like a Numpy recarray, you can access the fields with
+attributes; you can even access (but not set) computed attributes like ``.variance``. A view will
+also return an accumulator instance if you select a single item.
diff --git a/docs/user-guide/analyses.rst b/docs/user-guide/analyses.rst
new file mode 100644
index 00000000..49bc618e
--- /dev/null
+++ b/docs/user-guide/analyses.rst
@@ -0,0 +1,42 @@
+.. _usage-analyses:
+
+Analyses examples
+=================
+
+Bool and category axes
+----------------------
+
+Taken together, the flexibility in axes and the tools to easily sum over
+axes can be applied to transform the way you approach analysis with
+histograms. For example, let’s say you are presented with the following
+data in a 3xN table:
+
+============== ========================
+Data Details
+============== ========================
+``value``
+``is_valid`` True or False
+``run_number`` A collection of integers
+============== ========================
+
+In a traditional analysis, you might bin over ``value`` where
+``is_valid`` is True, and then make a collection of histograms, one for
+each run number. With hist, you can make a single histogram,
+and use an axis for each:
+
+.. code:: python3
+
+ value_ax = hist.axis.Regular(100, -5, 5)
+ bool_ax = hist.axis.Integer(0, 2, underflow=False, overflow=False)
+ run_number_ax = hist.axis.IntCategory([], growth=True)
+
+Now, you can use these axes to create a single histogram that you can
+fill. If you want to get a histogram of all run numbers and just the
+True ``is_valid`` selection, you can use a ``sum``:
+
+.. code:: python3
+
+ h1 = hist[:, True, sum]
+
+You can expand this example to any number of dimensions, boolean flags,
+and categories.
diff --git a/docs/user-guide/axes.rst b/docs/user-guide/axes.rst
new file mode 100644
index 00000000..ea288a19
--- /dev/null
+++ b/docs/user-guide/axes.rst
@@ -0,0 +1,214 @@
+.. _usage-axes:
+
+Axes
+====
+
+In hist, a histogram is collection of Axis objects and a
+storage. Based on `boost-histogram `_’s
+Axis, hist support six types of axis, ``Regular``, ``Boolean``, ``Variable``, ``Integer``, ``IntCategory``
+and ``StrCategory`` with additional names and labels.
+
+Axis names
+----------
+
+Names are pretty useful for some histogramming shortcuts, thus
+greatly facilitate HEP’s studies. Note that the name is the identifier
+for an axis in a histogram and must be unique.
+
+.. code:: python3
+
+ import hist
+ from hist import Hist
+
+.. code:: python3
+
+ axis0 = hist.axis.Regular(10, -5, 5, overflow=False, underflow=False, name="A")
+ axis1 = hist.axis.Boolean(name="B")
+ axis2 = hist.axis.Variable(range(10), name="C")
+ axis3 = hist.axis.Integer(-5, 5, overflow=False, underflow=False, name="D")
+ axis4 = hist.axis.IntCategory(range(10), name="E")
+ axis5 = hist.axis.StrCategory(["T", "F"], name="F")
+
+Histogram’s Axis
+----------------
+
+Histogram is consisted with various axes, there are two ways to create a histogram,
+currently. You can either fill a histogram object with axes or add axes to a
+histogram object. You cannot add axes to an existing histogram. *Note that to distinguish
+these two method, the second way has different axis type names (abbr.).*
+
+.. code:: python3
+
+ # fill the axes
+ h = Hist(axis0, axis1, axis2, axis3, axis4, axis5)
+
+.. code:: python3
+
+ # add the axes using the shortcut method
+ h = (
+ Hist.new.Reg(10, -5, 5, overflow=False, underflow=False, name="A")
+ .Bool(name="B")
+ .Var(range(10), name="C")
+ .Int(-5, 5, overflow=False, underflow=False, name="D")
+ .IntCat(range(10), name="E")
+ .StrCat(["T", "F"], name="F")
+ .Double()
+ )
+
+Hist adds a new ``flow=False`` shortcut to axes that take ``underflow`` and ``overflow``.
+
+AxesTuple is a new feature since boost-histogram 0.8.0, which provides you free access to axis properties in a histogram.
+
+.. code:: python3
+
+ assert h.axes[0].name == axis0.name
+ assert h.axes[1].label == axis1.name # label will be returned as name if not provided
+ assert all(h.axes[2].widths == axis2.widths)
+ assert all(h.axes[3].edges == axis3.edges)
+ assert h.axes[4].metadata == axis4.metadata
+ assert all(h.axes[5].centers == axis5.centers)
+
+
+Axis types
+----------
+
+There are several axis types to choose from.
+
+Regular axis
+^^^^^^^^^^^^
+
+.. image:: ../_images/axis_regular.png
+ :alt: Regular axis illustration
+ :align: center
+
+.. py:function:: hist.axis.Regular(bins, start, stop, name, label, *, metadata="", underflow=True, overflow=True, circular=False, growth=False, transform=None)
+ :noindex:
+
+The regular axis can have overflow and/or underflow bins (enabled by
+default). It can also grow if ``growth=True`` is given. In general, you
+should not mix options, as growing axis will already have the correct
+flow bin settings. The exception is ``underflow=False, overflow=False``, which
+is quite useful together to make an axis with no flow bins at all.
+
+There are some other useful axis types based on regular axis:
+
+.. image:: ../_images/axis_circular.png
+ :alt: Regular axis illustration
+ :align: center
+
+.. py:function:: hist.axis.Regular(..., circular=True)
+ :noindex:
+
+ This wraps around, so that out-of-range values map back into the valid range circularly.
+
+Regular axis: Transforms
+""""""""""""""""""""""""
+
+Regular axes support transforms, as well; these are functions that convert from an external,
+non-regular bin spacing to an internal, regularly spaced one. A transform is made of two functions,
+a ``forward`` function, which converts external to internal (and for which the transform is usually named),
+and a ``inverse`` function, which converts from the internal space back to the external space. If you
+know the functional form of your spacing, you can get the benefits of a constant performance scaling
+just like you would with a normal regular axis, rather than falling back to a variable axis and a poorer
+scaling from the bin edge lookup required there.
+
+You can define your own functions for transforms, see :ref:`usage-transforms`. If you use compiled/numba
+functions, you can keep the high performance you would expect from a Regular axis. There are also several
+precompiled transforms:
+
+.. py:function:: hist.axis.Regular(..., transform=hist.axis.transform.sqrt)
+ :noindex:
+
+ This is an axis with bins transformed by a sqrt.
+
+.. py:function:: hist.axis.Regular(..., transform=hist.axis.transform.log)
+ :noindex:
+
+ Transformed by log.
+
+.. py:function:: hist.axis.Regular(..., transform=hist.axis.transform.Power(v))
+ :noindex:
+
+ Transformed by a power (the argument is the power).
+
+
+Variable axis
+^^^^^^^^^^^^^
+
+.. image:: ../_images/axis_variable.png
+ :alt: Regular axis illustration
+ :align: center
+
+.. py:function:: hist.axis.Variable([edge1, ...], name, label, *, metadata="", underflow=True, overflow=True, circular=False, growth=False)
+ :noindex:
+
+ You can set the bin edges explicitly with a variable axis. The options are mostly the same as the Regular axis.
+
+Integer axis
+^^^^^^^^^^^^
+
+.. image:: ../_images/axis_integer.png
+ :alt: Regular axis illustration
+ :align: center
+
+.. py:function:: hist.axis.Integer(start, stop, name, label, *, metadata="", underflow=True, overflow=True, circular=False, growth=False)
+ :noindex:
+
+ This could be mimicked with a regular axis, but is simpler and slightly faster. Bins are whole integers only,
+ so there is no need to specify the number of bins.
+
+One common use for an integer axis could be a true/false axis:
+
+.. code:: python3
+
+ bool_axis = hist.axis.Integer(0, 2, underflow=False, overflow=False)
+
+
+Another could be for an IntEnum (Python 3 or backport) if the values are contiguous.
+
+Category axis
+^^^^^^^^^^^^^
+
+.. image:: ../_images/axis_category.png
+ :alt: Regular axis illustration
+ :align: center
+
+.. py:function:: hist.axis.IntCategory([value1, ...], name, label, metadata="", grow=False)
+ :noindex:
+
+ You should put integers in a category axis; but unlike an integer axis, the integers do not need to be adjacent.
+
+One use for an IntCategory axis is for an IntEnum:
+
+.. code:: python3
+
+ import enum
+
+ class MyEnum(enum.IntEnum):
+ a = 1
+ b = 5
+
+ my_enum_axis = hist.axis.IntEnum(list(MyEnum), underflow=False, overflow=False)
+
+
+You can sort the Categorty axes via ``.sort()`` method:
+
+.. code:: python3
+
+ h = Hist(axis.IntCategory([3, 1, 2], label="Number"), axis.StrCategory(["Teacher", "Police", "Artist"], label="Profession"))
+ h.sort(0).axes[0] # IntCategory([1, 2, 3], label='Number')
+ h.sort(1, reverse=True).axes[1] # StrCategory(['Teacher', 'Police', 'Artist'], label='Profession')
+
+
+.. py:function:: hist.axis.StrCategory([str1, ...], name, label, metadata="", grow=False)
+ :noindex:
+
+ You can put strings in a category axis as well. The fill method supports lists or arrays of strings
+ to allow this to be filled.
+
+Manipulating Axes
+-----------------
+
+Axes have a variety of methods and properties that are useful. When inside a histogram, you can also access
+these directly on the ``hist.axes`` object, and they return a tuple of valid results. If the property or method
+normally returns an array, the ``axes`` version returns a broadcasting-ready version in the output tuple.
diff --git a/docs/user-guide/index.rst b/docs/user-guide/index.rst
deleted file mode 100644
index 74ce499b..00000000
--- a/docs/user-guide/index.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-.. _userguide:
-
-User Guide
-==========
-
-.. toctree::
- :maxdepth: 2
- :titlesonly:
- :glob:
-
- notebooks/Axis
- notebooks/Storage
- notebooks/Transform
- notebooks/Reprs
- notebooks/Plots
- notebooks/Histogram
diff --git a/docs/user-guide/notebooks/Axis.ipynb b/docs/user-guide/notebooks/Axis.ipynb
deleted file mode 100644
index 01be2631..00000000
--- a/docs/user-guide/notebooks/Axis.ipynb
+++ /dev/null
@@ -1,132 +0,0 @@
-{
- "cells": [
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "# Axis\n"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "## Axis Types\n",
- "\n",
- "Based on [boost-histogram](https://github.com/scikit-hep/boost-histogram)'s Axis, hist support six types of axis, `Regular`, `Boolean`, `Variable`, `Integer`, `IntCategory` and `StrCategory` with additional names and labels. \n",
- "\n",
- "Names are pretty useful for some histogramming shortcuts, thus greatly facilitate HEP's studies. Note that the name is the identifier for an axis in a histogram and must be unique."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": [
- "import hist\n",
- "from hist import Hist"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": [
- "axis0 = hist.axis.Regular(10, -5, 5, overflow=False, underflow=False, name=\"A\")\n",
- "axis1 = hist.axis.Boolean(name=\"B\")\n",
- "axis2 = hist.axis.Variable(range(10), name=\"C\")\n",
- "axis3 = hist.axis.Integer(-5, 5, overflow=False, underflow=False, name=\"D\")\n",
- "axis4 = hist.axis.IntCategory(range(10), name=\"E\")\n",
- "axis5 = hist.axis.StrCategory([\"T\", \"F\"], name=\"F\")"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "## Histogram's Axis\n",
- "\n",
- "Histogram is consisted with various axes, there are two ways to create a histogram, currently. You can either fill a histogram object with axes or add axes to a histogram object. You cannot add axes to an existing histogram. *Note that to distinguish these two method, the second way has different axis type names (abbr.).*"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": [
- "# fill the axes\n",
- "h = Hist(axis0, axis1, axis2, axis3, axis4, axis5)"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": [
- "# add the axes using the shortcut method\n",
- "h = (\n",
- " Hist.new.Reg(10, -5, 5, overflow=False, underflow=False, name=\"A\")\n",
- " .Bool(name=\"B\")\n",
- " .Var(range(10), name=\"C\")\n",
- " .Int(-5, 5, overflow=False, underflow=False, name=\"D\")\n",
- " .IntCat(range(10), name=\"E\")\n",
- " .StrCat([\"T\", \"F\"], name=\"F\")\n",
- " .Double()\n",
- ")"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "Hist adds a new `flow=False` shortcut to axes that take `underflow` and `overflow`."
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "AxesTuple is a new feature since boost-histogram 0.8.0, which provides you free access to axis properties in a histogram."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": [
- "assert h.axes[0].name == axis0.name\n",
- "assert h.axes[1].label == axis1.name # label will be returned as name if not provided\n",
- "assert all(h.axes[2].widths == axis2.widths)\n",
- "assert all(h.axes[3].edges == axis3.edges)\n",
- "assert h.axes[4].metadata == axis4.metadata\n",
- "assert all(h.axes[5].centers == axis5.centers)"
- ]
- }
- ],
- "metadata": {
- "kernelspec": {
- "display_name": "hist",
- "language": "python",
- "name": "hist"
- },
- "language_info": {
- "codemirror_mode": {
- "name": "ipython",
- "version": 3
- },
- "file_extension": ".py",
- "mimetype": "text/x-python",
- "name": "python",
- "nbconvert_exporter": "python",
- "pygments_lexer": "ipython3",
- "version": "3.9.4"
- }
- },
- "nbformat": 4,
- "nbformat_minor": 4
-}
diff --git a/docs/user-guide/notebooks/Histogram.ipynb b/docs/user-guide/notebooks/Histogram.ipynb
index 582f6f4f..52e8719e 100644
--- a/docs/user-guide/notebooks/Histogram.ipynb
+++ b/docs/user-guide/notebooks/Histogram.ipynb
@@ -38,7 +38,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 1,
"metadata": {},
"outputs": [],
"source": [
@@ -55,7 +55,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 2,
"metadata": {},
"outputs": [],
"source": [
@@ -81,7 +81,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 3,
"metadata": {},
"outputs": [],
"source": [
@@ -111,9 +111,2558 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 4,
"metadata": {},
- "outputs": [],
+ "outputs": [
+ {
+ "data": {
+ "text/html": [
+ "\n",
+ "
