diff --git a/build_tools/azure/install.sh b/build_tools/azure/install.sh index d07234806..5a140315b 100755 --- a/build_tools/azure/install.sh +++ b/build_tools/azure/install.sh @@ -75,10 +75,10 @@ elif [[ "$DISTRIB" == "conda-pip-latest-tensorflow" ]]; then python -m pip install numpy scipy scikit-learn pandas tensorflow elif [[ "$DISTRIB" == "conda-latest-tensorflow" ]]; then - make_conda " python=$PYTHON_VERSION numpy scipy scikit-learn pandas tensorflow" + make_conda "python=$PYTHON_VERSION numpy scipy scikit-learn pandas tensorflow" elif [[ "$DISTRIB" == "conda-minimum-tensorflow" ]]; then - TO_INSTALL="$python=$PYTHON_VERSION" + TO_INSTALL="python=$PYTHON_VERSION" TO_INSTALL="$TO_INSTALL $(get_dep numpy $NUMPY_VERSION)" TO_INSTALL="$TO_INSTALL $(get_dep scipy $SCIPY_VERSION)" TO_INSTALL="$TO_INSTALL $(get_dep scikit-learn $SKLEARN_VERSION)" @@ -87,7 +87,7 @@ elif [[ "$DISTRIB" == "conda-minimum-tensorflow" ]]; then make_conda $TO_INSTALL elif [[ "$DISTRIB" == "conda-pip-latest-keras" ]]; then - make_conda "=$PYTHON_VERSION" + make_conda "python=$PYTHON_VERSION" python -m pip install -U pip python -m pip install numpy scipy scikit-learn pandas keras @@ -96,7 +96,7 @@ elif [[ "$DISTRIB" == "conda-latest-keras" ]]; then make_conda "=$PYTHON_VERSION numpy scipy scikit-learn pandas keras" elif [[ "$DISTRIB" == "conda-minimum-keras" ]]; then - TO_INSTALL="=$PYTHON_VERSION" + TO_INSTALL="python=$PYTHON_VERSION" TO_INSTALL="$TO_INSTALL $(get_dep numpy $NUMPY_VERSION)" TO_INSTALL="$TO_INSTALL $(get_dep scipy $SCIPY_VERSION)" TO_INSTALL="$TO_INSTALL $(get_dep scikit-learn $SKLEARN_VERSION)" @@ -105,7 +105,7 @@ elif [[ "$DISTRIB" == "conda-minimum-keras" ]]; then make_conda $TO_INSTALL elif [[ "$DISTRIB" == "conda-pip-scipy-dev" ]]; then - make_conda "=$PYTHON_VERSION" + make_conda "python=$PYTHON_VERSION" python -m pip install -U pip echo "Installing numpy and scipy master wheels" dev_anaconda_url=https://pypi.anaconda.org/scipy-wheels-nightly/simple diff --git a/doc/metrics.rst b/doc/metrics.rst index e83bf792b..f7e249c02 100644 --- a/doc/metrics.rst +++ b/doc/metrics.rst @@ -65,10 +65,16 @@ each class and averaged over classes, giving an equal weight to each class. Summary of important metrics ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The :func:`classification_report_imbalanced` will compute a set of metrics -per class and summarize it in a table. The parameter `output_dict` allows -to get a string or a Python dictionary. This dictionary can be reused to create -a Pandas dataframe for instance. +The :func:`classification_report_imbalanced` will compute a set of metrics per +class and summarize it in a table. The parameter `output_dict` allows to get a +string or a Python dictionary. This dictionary can be reused to create a Pandas +dataframe for instance. + +The bottom row (i.e "avg/total") contains the weighted average by the support +(i.e column "sup") of each column. + +Note that the weighted average of the class recalls is also known as the +classification accuracy. .. _pairwise_metrics: