Skip to content

Commit

Permalink
Backport most of 1dbd72a81dda00e from upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
addaleax committed Jan 2, 2017
1 parent 300605b commit 99edb35
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ See the docs in munkres.js for more details.
This module is a translation of a Python implementation by
[Brian Clapper](https://github.com/bmc/munkres).

The original implementation is based on
<http://csclab.murraystate.edu/~bob.pilgrim/445/munkres.html>.

It is available via `bower` and `npm` as `munkres-js`.

## Copyright
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "munkres-js",
"main": "munkres.js",
"version": "1.2.1",
"version": "1.2.2",
"homepage": "https://github.com/addaleax/munkres-js",
"authors": [
"sqrt <[email protected]>"
Expand Down
6 changes: 3 additions & 3 deletions munkres.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
* package provides an implementation of that algorithm.
*
* This version is based on
* http://www.public.iastate.edu/~ddoty/HungarianAlgorithm.html.
* http://csclab.murraystate.edu/~bob.pilgrim/445/munkres.html
*
* This version was originally written for Python by Brian Clapper from the (Ada)
* This version was originally written for Python by Brian Clapper from the
* algorithm at the above web site (The ``Algorithm::Munkres`` Perl version,
* in CPAN, was clearly adapted from the same web site.) and ported to
* JavaScript by Anna Henningsen (addaleax).
Expand Down Expand Up @@ -700,7 +700,7 @@ function computeMunkres(cost_matrix, options) {
return m.compute(cost_matrix, options);
}

computeMunkres.version = "1.2.1";
computeMunkres.version = "1.2.2";
computeMunkres.format_matrix = format_matrix;
computeMunkres.make_cost_matrix = make_cost_matrix;
computeMunkres.Munkres = Munkres; // backwards compatibility
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "munkres-js",
"main": "munkres.js",
"version": "1.2.1",
"version": "1.2.2",
"homepage": "https://github.com/addaleax/munkres-js",
"author": {
"name": "Anna Henningsen",
Expand Down

0 comments on commit 99edb35

Please sign in to comment.