From ffab68d17a21c1bcd30b1394e964726085f45194 Mon Sep 17 00:00:00 2001 From: Anatoly Makarevich Date: Wed, 31 Oct 2012 11:55:24 +0300 Subject: [PATCH 1/5] Added time benchmark --- README.rdoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.rdoc b/README.rdoc index ed3f812..d2fe472 100644 --- a/README.rdoc +++ b/README.rdoc @@ -117,6 +117,9 @@ To install this extension as a gem type "pattern language".jarowinkler_similar("language of patterns") # => 0.672222222222222 +== Performance +![performance](http://cs304915.userapi.com/v304915401/5c97/BAzazF5E4Fo.jpg) + == Author Florian Frank mailto:flori@ping.de From b98f127bc76b1b3e03044b429202959ebf37b648 Mon Sep 17 00:00:00 2001 From: Anatoli Makarevich Date: Wed, 31 Oct 2012 10:56:14 +0300 Subject: [PATCH 2/5] Fix image link --- README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rdoc b/README.rdoc index d2fe472..cc7146d 100644 --- a/README.rdoc +++ b/README.rdoc @@ -118,7 +118,7 @@ To install this extension as a gem type # => 0.672222222222222 == Performance -![performance](http://cs304915.userapi.com/v304915401/5c97/BAzazF5E4Fo.jpg) +http://cs304915.userapi.com/v304915401/5c97/BAzazF5E4Fo.jpg == Author From 76a8817210adee835dec399991c458be13daae22 Mon Sep 17 00:00:00 2001 From: Anatoli Makarevich Date: Wed, 31 Oct 2012 10:59:42 +0300 Subject: [PATCH 3/5] Specified language to highlight code --- README.rdoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.rdoc b/README.rdoc index cc7146d..c96cebd 100644 --- a/README.rdoc +++ b/README.rdoc @@ -33,6 +33,7 @@ To install this extension as a gem type # gem install amatch == Examples +~~~ruby require 'amatch' # => true include Amatch @@ -116,7 +117,7 @@ To install this extension as a gem type # => 0.961904762046678 "pattern language".jarowinkler_similar("language of patterns") # => 0.672222222222222 - +~~~ == Performance http://cs304915.userapi.com/v304915401/5c97/BAzazF5E4Fo.jpg From 7b4db4e7f3980e13026f37f39685b939374610fb Mon Sep 17 00:00:00 2001 From: Anatoly Makarevich Date: Wed, 31 Oct 2012 12:14:39 +0300 Subject: [PATCH 4/5] Added markdown README for ruby highlighting --- README.rdoc => README.md | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) rename README.rdoc => README.md (85%) diff --git a/README.rdoc b/README.md similarity index 85% rename from README.rdoc rename to README.md index c96cebd..1cea8c7 100644 --- a/README.rdoc +++ b/README.md @@ -1,6 +1,6 @@ -= amatch - Approximate Matching Extension for Ruby +# amatch - Approximate Matching Extension for Ruby -== Description +## Description This is a collection of classes that can be used for Approximate matching, searching, and comparing of Strings. They implement algorithms @@ -8,31 +8,35 @@ that compute the Levenshtein edit distance, Sellers edit distance, the Hamming distance, the longest common subsequence length, the longest common substring length, the pair distance metric, the Jaro-Winkler metric. -== Download +## Download The latest version of amatch can be found at -* http://rubyforge.org/frs/?group_id=390 +* Online Documentation should be located at -* http://amatch.rubyforge.org +* -== Installation +## Installation Just type into the command line as root: - # ruby install.rb +`ruby install.rb` If you have installed rake (rake.rubyforge.org), you can also type: - # rake install +`rake install` To install this extension as a gem type - # gem install amatch +`gem install amatch` +<<<<<<< HEAD:README.rdoc == Examples +======= +## Examples +>>>>>>> Added markdown README for ruby highlighting:README.md ~~~ruby require 'amatch' # => true @@ -118,14 +122,15 @@ To install this extension as a gem type "pattern language".jarowinkler_similar("language of patterns") # => 0.672222222222222 ~~~ -== Performance -http://cs304915.userapi.com/v304915401/5c97/BAzazF5E4Fo.jpg -== Author +## Performance +![performance](http://cs304915.userapi.com/v304915401/5c97/BAzazF5E4Fo.jpg) -Florian Frank mailto:flori@ping.de +## Author -== License +Florian Frank + +## License This is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License Version 2 as published by From c55e331fd46525b2599e137b74c5812cd6f3747e Mon Sep 17 00:00:00 2001 From: Anatoli Makarevich Date: Wed, 31 Oct 2012 11:15:58 +0300 Subject: [PATCH 5/5] FIX bad merge --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 1cea8c7..55d07c0 100644 --- a/README.md +++ b/README.md @@ -32,11 +32,7 @@ To install this extension as a gem type `gem install amatch` -<<<<<<< HEAD:README.rdoc -== Examples -======= ## Examples ->>>>>>> Added markdown README for ruby highlighting:README.md ~~~ruby require 'amatch' # => true