Skip to content

Commit

Permalink
update documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
yzhao062 committed Jul 30, 2019
1 parent b996f37 commit 8a0c9da
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 10 deletions.
13 changes: 9 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ combo: A Python Toolbox for Machine Learning Model Combination
----


**combo** is a comprehensive Python toolbox for combining machine
learning (ML) models and scores for various tasks, including **classification**,
**combo** is a comprehensive Python toolbox for **combining machine
learning (ML) models and scores** for various tasks, including **classification**,
**clustering**, and **anomaly detection**.

**Model combination** has been widely used in data science competitions and
Expand All @@ -78,7 +78,7 @@ It can be considered as a subtask of
`ensemble learning <https://en.wikipedia.org/wiki/Ensemble_learning>`_,
but is often beyond the scope of ensemble learning. For instance,
averaging the results of multiple runs of a ML model is deemed as
a reliable way of eliminating the randomness. See
a reliable way of reducing the randomness. See
figure below for basic combination approaches.

.. image:: https://raw.githubusercontent.com/yzhao062/combo/master/docs/figs/framework_demo.png
Expand Down Expand Up @@ -180,13 +180,18 @@ API Cheatsheet & Reference
^^^^^^^^^^^^^^^^^^^^^^^^^^

Full API Reference: (https://pycombo.readthedocs.io/en/latest/api.html).
The following APIs are consistent for most of the models
The following APIs are consistent for most of the models
(API Cheatsheet: https://pycombo.readthedocs.io/en/latest/api_cc.html).

* **fit(X)**\ : Fit estimator. y is optional for unsupervised methods.
* **predict(X)**\ : Predict on a particular sample once the estimator is fitted.
* **predict_proba(X)**\ : Predict the probability of a sample belonging to each class once the estimator is fitted.

For raw score combination (after the score matrix is generated),
use individual methods, e.g., average and median, directly in
`"score_comb.py" <https://github.com/yzhao062/combo/blob/master/models/score_comb.py>`_.
Raw score combination API: (https://pycombo.readthedocs.io/en/latest/api.html#score-combination).


----

Expand Down
10 changes: 7 additions & 3 deletions docs/api_cc.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
API CheatSheet
==============

Full API Reference: (https://pycombo.readthedocs.io/en/latest/api.html). The
following APIs are applicable for most models for easy use.
Full API Reference: (https://pycombo.readthedocs.io/en/latest/api.html).
The following APIs are consistent for most of the models
(API Cheatsheet: https://pycombo.readthedocs.io/en/latest/api_cc.html).

* :func:`combo.models.base.BaseAggregator.fit`: Fit estimator. y is optional for unsupervised methods.
* :func:`combo.models.base.BaseAggregator.predict`: Predict on a particular sample once the estimator is fitted.
Expand All @@ -14,7 +15,10 @@ Helpful functions:
* :func:`combo.models.base.BaseAggregator.set_params`: Set the parameters of the model.
* Each base estimator can be accessed by calling clf[i] where i is the estimator index.


For raw score combination (after the score matrix is generated),
use individual methods, e.g., average and median, directly in
`"score_comb.py" <https://github.com/yzhao062/combo/blob/master/models/score_comb.py>`_.
Raw score combination API: (https://pycombo.readthedocs.io/en/latest/api.html#score-combination).


See base class definition below:
Expand Down
6 changes: 3 additions & 3 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ Welcome to combo's documentation!
----


**combo** is a comprehensive Python toolbox for combining machine
learning (ML) models and scores for various tasks, including **classification**,
**combo** is a comprehensive Python toolbox for **combining machine
learning (ML) models and scores** for various tasks, including **classification**,
**clustering**, and **anomaly detection**.

**Model combination** has been widely used in data science competitions and
Expand All @@ -83,7 +83,7 @@ It can be considered as a subtask of
`ensemble learning <https://en.wikipedia.org/wiki/Ensemble_learning>`_,
but is often beyond the scope of ensemble learning. For instance,
averaging the results of multiple runs of a ML model is deemed as
a reliable way of eliminating the randomness. See
a reliable way of reducing the randomness. See
figure below for basic combination approaches.

.. image:: https://raw.githubusercontent.com/yzhao062/combo/master/docs/figs/framework_demo.png
Expand Down

0 comments on commit 8a0c9da

Please sign in to comment.