Skip to content

Commit 75c013f

Browse files
committed
use myers as default & update readme/comment
1 parent 3403cbb commit 75c013f

File tree

5 files changed

+28
-3
lines changed

5 files changed

+28
-3
lines changed

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ diff-merge
33

44
diff & merge algorithm realized with Javascript
55

6+
There are two compare methods: simple/myers(used as default), while the latter performs better in most situations(O(ND)).
7+
68
### Usage
79

810
- nodejs
@@ -13,7 +15,7 @@ diff & merge algorithm realized with Javascript
1315

1416
- browser
1517

16-
<script type="text/javascript" src="../lib/compare.js"></script>
18+
<script type="text/javascript" src="../lib/myers-compare.js"></script>
1719
<script type="text/javascript" src="../lib/merge.js"></script>
1820

1921
### Compare
@@ -34,4 +36,6 @@ diff &amp; merge algorithm realized with Javascript
3436

3537
### Algorithm
3638

37-
http://en.wikipedia.org/wiki/Levenshtein_distance
39+
SIMPLE: http://en.wikipedia.org/wiki/Levenshtein_distance
40+
41+
MYERS': https://neil.fraser.name/software/diff_match_patch/myers.pdf

index.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1+
/*
2+
* Diff & Merge methods
3+
4+
*/
5+
16
module.exports = {
2-
compare: require('./lib/compare'),
7+
compare: require('./lib/myers-compare'),
38
merge: require('./lib/merge')
49
};

lib/compare.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Simple compare
3+
4+
*/
5+
16
(function(global, undefined){
27

38
var compare = function(cnt1, cnt2, splitter){

lib/merge.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Merge diff results to origin scequence
3+
4+
*/
5+
16
(function(global, undefined){
27

38
var merge = function(cnt, compareResult){

lib/myers-compare.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/*
2+
* Compare using myers' LCS/SES algorithm
3+
* ( https://neil.fraser.name/software/diff_match_patch/myers.pdf )
4+
5+
*/
6+
17
(function(global, undefined){
28

39
var compare = function(cnt1, cnt2, splitter){

0 commit comments

Comments
 (0)