Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/source/collective_decision_procedures.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Overview

We have three types of collective decision procedures:

1. Voting Method: given edata, outputs a sorted list of candidates, representing tied winners;
1. Voting Method: given edata, outputs a sorted list of candidates, representing tied winners (aka "social choice function");
2. Probabilistic Voting Method: given edata, outputs a dictionary whose keys are candidates and whose values are probabilities;
2. Social Welfare Function: given edata, outputs a [Ranking](ballots.md#ranking-class) of the candidates.
2. Social Welfare Function: given edata, outputs a [Ranking](ballots.md#ranking-class) of the candidates (aka "social ordering function").

We further categorize collective decision procedures based on the input from the voters:

Expand Down Expand Up @@ -72,4 +72,4 @@ We further categorize collective decision procedures based on the input from the
.. autofunction:: pref_voting.helper.vm_from_swf


```
```