Skip to content

Commit

Permalink
Merge pull request #37 from quatrope/dev
Browse files Browse the repository at this point in the history
Dev 0.7
  • Loading branch information
leliel12 authored May 7, 2022
2 parents 8d7597c + 2629dad commit 228f4d6
Show file tree
Hide file tree
Showing 25 changed files with 907 additions and 671 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,28 @@

<!-- BODY -->

## Version 0.7

- **New method**: `ELECTRE2`.
- **New preprocessin strategy:** A new way to transform from minimization to
maximization criteria: `NegateMinimize()` which reverses the sign of the
values of the criteria to be minimized (useful for not breaking distance
relations in methods like *TOPSIS*). Additionally the previous we rename the
`MinimizeToMaximize()` transformer to `InvertMinimize()`.
- Now the `RankingResult`, support repeated/tied rankings and some were
implemented to deal with these cases.

- `RankingResult.has_ties_` to see if there are tied values.
- `RankingResult.ties_` to see how often values are repeated.
- `RankingResult.untided_rank_` to get a ranking with no repeated values.
repeated values.
- `KernelResult` now implements several new properties:

- `kernel_alternatives_` to know which alternatives are in the kernel.
- `kernel_size_` to know the number of alternatives in the kernel.
- `kernel_where_` was replaced by `kernel_where_` to standardize the api.


## Version 0.6

- Support for Python 3.10.
Expand Down
79 changes: 79 additions & 0 deletions docs/source/_dynamic/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
.. FILE AUTO GENERATED !!
Version 0.7
-----------


* **New method**\ : ``ELECTRE2``.
* **New preprocessin strategy:** A new way to transform from minimization to
maximization criteria: ``NegateMinimize()`` which reverses the sign of the
values of the criteria to be minimized (useful for not breaking distance
relations in methods like *TOPSIS*\ ). Additionally the previous we rename the
``MinimizeToMaximize()`` transformer to ``InvertMinimize()``.
*
Now the ``RankingResult``\ , support repeated/tied rankings and some were
implemented to deal with these cases.


* ``RankingResult.has_ties_`` to see if there are tied values.
* ``RankingResult.ties_`` to see how often values are repeated.
* ``RankingResult.untided_rank_`` to get a ranking with no repeated values.
repeated values.

*
``KernelResult`` now implements several new properties:


* ``kernel_alternatives_`` to know which alternatives are in the kernel.
* ``kernel_size_`` to know the number of alternatives in the kernel.
* ``kernel_where_`` was replaced by ``kernel_where_`` to standardize the api.

Version 0.6
-----------


* Support for Python 3.10.
* All the objects of the project are now immutable by design, and can only
be mutated troughs the ``object.copy()`` method.
* Dominance analysis tools (\ ``DecisionMatrix.dominance``\ ).
* The method ``DecisionMatrix.describe()`` was deprecated and will be removed
in version *1.0*.
* New statistics functionalities ``DecisionMatrix.stats`` accessor.
*
The accessors are now cached in the ``DecisionMatrix``.

*
Tutorial for dominance and satisfaction analysis.

*
TOPSIS now support hyper-parameters to select different metrics.

* Generalize the idea of accessors in scikit-criteria througth a common
framework (\ ``skcriteria.utils.accabc`` module).
* New deprecation mechanism through the
* ``skcriteria.utils.decorators.deprecated`` decorator.

Version 0.5
-----------

In this version scikit-criteria was rewritten from scratch. Among other things:


* The model implementation API was simplified.
* The ``Data`` object was removed in favor of ``DecisionMatrix`` which implements many more useful features for MCDA.
* Plots were completely re-implemented using `Seaborn <http://seaborn.pydata.org/>`_.
* Coverage was increased to 100%.
* Pipelines concept was added (Thanks to `Scikit-learn <https://scikit-learn.org/stable/modules/generated/sklearn.pipeline.Pipeline.html>`_\ ).
* New documentation. The quick start is totally rewritten!

**Full Changelog**\ : https://github.com/quatrope/scikit-criteria/commits/0.5

Version 0.2
-----------

First OO stable version.

Version 0.1
-----------

Only functions.
2 changes: 0 additions & 2 deletions docs/source/api/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,3 @@
:maxdepth: 2

utils/index


8 changes: 6 additions & 2 deletions docs/source/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
.. _changelog:

==========================
Changelog
============
==========================

.. include:: _dynamic/CHANGELOG.rst
.. Here we render the CHANGELOG.md of the repository as a main page
.. include:: _dynamic/CHANGELOG.rst
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"sphinx.ext.autosummary",
"nbsphinx",
"sphinxcontrib.bibtex",
"sphinx_copybutton"
"sphinx_copybutton",
]
# =============================================================================
# EXTRA CONF
Expand Down Expand Up @@ -97,7 +97,7 @@

# General information about the project.
project = skcriteria.NAME
copyright = "2016-2021, Juan B. Cabral - Nadia A. Luczywo"
copyright = "2016-2022, Juan B. Cabral - Nadia A. Luczywo"
author = "Juan BC"

# The version info for the project you're documenting, acts as replacement for
Expand Down
29 changes: 29 additions & 0 deletions docs/source/refs.bib
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,35 @@ @article{roy1968classement
publisher = {EDP Sciences}
}

@book{gomez2004tomada,
author = {Gomes, Luiz and González-Araya, Marcela and Carignano, Claudia},
year = {2004},
month = {11},
pages = {},
title = {Tomada de decisões em cenários complexos},
isbn = {85-221-0354-2},
publisher = {Thomson}
}


@article{roy1971methode,
title = {La m{\'e}thode Electre II},
author = {Roy, Bernard and Bertier, Patrice},
journal = {Note de travail},
volume = {142},
year = {1971}
}

@article{roy1973methode,
title = {La M{\'e}thode ELECTRE II(Une application au m{\'e}dia-planning...)},
author = {Roy, Bertier and Bertier, Patrice},
year = {1973},
journal = {VII {\`e}me Conf{\`e}rence internationale de recherch{\'e} op{\'e}rationalle},
publisher = {Metra international}
}



% skcriteria.madm.moora
@article{brauers2006moora,
Expand Down
74 changes: 41 additions & 33 deletions docs/source/tutorial/quickstart.ipynb

Large diffs are not rendered by default.

Loading

0 comments on commit 228f4d6

Please sign in to comment.