From: "Nicolas Richard" <theonewiththeevillook@yahoo.fr>
To: emacs-orgmode@gnu.org
Subject: [patch] Incorrect result of org-babel-edit-distance
Date: Thu, 06 Dec 2012 16:46:40 +0100 [thread overview]
Message-ID: <877govfajj.fsf@yahoo.fr> (raw)
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
Hello,
(org-babel-edit-distance "foo" "ffoo") returns 0, whereas 1 seems
appropriate. I don't know much about computing the levenshtein distance,
but it seems that part of the algorithm (which i found explained on
fr.wikipedia) is missing from the code. Please find a patch below trying
to address the issue.
--
Nico.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-ob-Fix-org-babel-edit-distance-for-insertion-deletio.patch --]
[-- Type: text/x-patch, Size: 1686 bytes --]
From 448cecaf3d6618274719fc6fa96f278b7202b784 Mon Sep 17 00:00:00 2001
From: "nrichard (geodiff-mac3)" <nrichard@ulb.ac.be>
Date: Thu, 6 Dec 2012 16:38:44 +0100
Subject: [PATCH] ob: Fix org-babel-edit-distance for insertion/deletion
* lisp/ob.el (org-babel-edit-distance): When insertion or deletion are
needed, make sure the distance is incremented. In addition, the now
obsolete mmin function was removed.
---
lisp/ob.el | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/lisp/ob.el b/lisp/ob.el
index c030a7f..0aba523 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -629,16 +629,19 @@ arguments and pop open the results in a preview buffer."
(l2 (length s2))
(dist (vconcat (mapcar (lambda (_) (make-vector (1+ l2) nil))
(number-sequence 1 (1+ l1)))))
- (in (lambda (i j) (aref (aref dist i) j)))
- (mmin (lambda (&rest lst) (apply #'min (remove nil lst)))))
+ (in (lambda (i j) (aref (aref dist i) j))))
(setf (aref (aref dist 0) 0) 0)
+ (dolist (j (number-sequence 1 l2))
+ (setf (aref (aref dist 0) j) j))
(dolist (i (number-sequence 1 l1))
+ (setf (aref (aref dist i) 0) i)
(dolist (j (number-sequence 1 l2))
(setf (aref (aref dist i) j)
- (+ (if (equal (aref s1 (1- i)) (aref s2 (1- j))) 0 1)
- (funcall mmin (funcall in (1- i) j)
- (funcall in i (1- j))
- (funcall in (1- i) (1- j)))))))
+ (min
+ (1+ (funcall in (1- i) j))
+ (1+ (funcall in i (1- j)))
+ (+ (if (equal (aref s1 (1- i)) (aref s2 (1- j))) 0 1)
+ (funcall in (1- i) (1- j)))))))
(funcall in l1 l2)))
(defun org-babel-combine-header-arg-lists (original &rest others)
--
1.8.0
next reply other threads:[~2012-12-06 15:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-06 15:46 Nicolas Richard [this message]
2012-12-07 19:43 ` [patch] Incorrect result of org-babel-edit-distance Eric Schulte
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877govfajj.fsf@yahoo.fr \
--to=theonewiththeevillook@yahoo.fr \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).