From: Malcolm Matalka <mmatalka@gmail.com>
To: emacs-orgmode@gnu.org
Subject: [PATCH] Support time units in est+
Date: Wed, 18 Jan 2017 20:33:38 +0000 [thread overview]
Message-ID: <861sw0az19.fsf@gmail.com> (raw)
Hey, this is my first elisp programming so I'm quite certain this is a
big hack. I just stole elements from elsewhere in the file. I'm hoping
this is good enough to get accepted then perhaps someone with more taste
would be able to refactor it to be a bit better.
Let me know if I need to change anything.
From 1167bd20e042ad2ae3f2712f596d76ad8b230336 Mon Sep 17 00:00:00 2001
From: orbitz <orbitz@gmail.com>
Date: Wed, 18 Jan 2017 21:18:23 +0100
Subject: [PATCH] org-colview.el: Add support for time units to est+
* lisp/org-colview.el: Add support for time units in est+. Ranges are interpreted just like non-range estimates.
TINYCHANGE
---
lisp/org-colview.el | 44 ++++++++++++++++++++++++++++++++------------
1 file changed, 32 insertions(+), 12 deletions(-)
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 45c71a028..2a5c067ac 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -1288,23 +1288,43 @@ When PRINTF is non-nil, use it to format the result."
(/ (apply #'+ (mapcar #'org-columns--age-to-seconds ages))
(float (length ages)))))
-(defun org-columns--summary-estimate (estimates printf)
+(defun org-columns--summary-estimate (estimates _)
"Combine a list of estimates, using mean and variance.
The mean and variance of the result will be the sum of the means
and variances (respectively) of the individual estimates."
(let ((mean 0)
- (var 0))
+ (var 0)
+ (hms-flag nil)
+ (duration-flag nil))
(dolist (e estimates)
- (pcase (mapcar #'string-to-number (split-string e "-"))
-(`(,low ,high)
- (let ((m (/ (+ low high) 2.0)))
- (cl-incf mean m)
- (cl-incf var (- (/ (+ (* low low) (* high high)) 2.0) (* m m)))))
-(`(,value) (cl-incf mean value))))
- (let ((sd (sqrt var)))
- (format "%s-%s"
- (format (or printf "%.0f") (- mean sd))
- (format (or printf "%.0f") (+ mean sd))))))
+ (pcase (split-string e "-")
+ (`(,low ,high)
+ (dolist (time (list high low))
+ (cond
+ (duration-flag)
+ ((string-match-p org-columns--duration-re time)
+ (setq duration-flag t))
+ (hms-flag)
+ ((string-match-p "\\`[0-9]+:[0-9]+:[0-9]+\\'" time)
+ (setq hms-flag t))))
+ (let* ((low-sec (org-columns--time-to-seconds low))
+ (high-sec (org-columns--time-to-seconds high))
+ (m (/ (+ low-sec high-sec) 2.0)))
+ (cl-incf mean m)
+ (cl-incf var (- (/ (+ (* low-sec low-sec) (* high-sec high-sec)) 2.0) (* m m)))))
+ (`(,value) (cl-incf mean (org-columns--time-to-seconds value)))))
+ (let* ((sd (sqrt var))
+ (low-second (truncate (- mean sd)))
+ (high-second (truncate (+ mean sd)))
+ (low
+ (cond (duration-flag (org-minutes-to-clocksum-string (/ low-second 60.0)))
+ (hms-flag (format-seconds "%h:%.2m:%.2s" low-second))
+ (t (format-seconds "%h:%.2m" low-second))))
+ (high
+ (cond (duration-flag (org-minutes-to-clocksum-string (/ high-second 60.0)))
+ (hms-flag (format-seconds "%h:%.2m:%.2s" high-second))
+ (t (format-seconds "%h:%.2m" high-second)))))
+ (format "%s-%s" low high))))
--
2.11.0
next reply other threads:[~2017-01-18 20:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-18 20:33 Malcolm Matalka [this message]
2017-01-18 21:13 ` [PATCH] Support time units in est+ Nick Dokos
[not found] ` <CAKziXDUDhHJWmfm2kN+tM2WmXPiqEXTfZtQYVriCBydRqiiW7g@mail.gmail.com>
[not found] ` <CAKziXDX_3=UTBLM8v=HZJSCR2p6tqiKwSgF+a-EXvRhsp+tAjw@mail.gmail.com>
2017-01-19 4:49 ` Malcolm Matalka
2017-01-19 15:44 ` Nick Dokos
2017-02-03 12:56 ` Malcolm Matalka
2017-02-04 14:30 ` Nicolas Goaziou
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=861sw0az19.fsf@gmail.com \
--to=mmatalka@gmail.com \
--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).