mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 19:07:52 +00:00
Code Releases Activity

org-duration: Limit rounding errors when computing a duration

Browse source 
* lisp/org-duration.el (org-duration-from-minutes): Limit rounding
  errors.
This commit is contained in:
Nicolas Goaziou 2017-06-14 09:59:14 +02:00
parent ce21e0a8db
commit 2371548c2a
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lisp/org-duration.el
View file

@ -316,10 +316,11 @@ Raise an error if expected format is unknown."
(let ((minutes (floor minutes)))
(format "%d:%02d" (/ minutes 60) (mod minutes 60))))
(`h:mm:ss
(let ((seconds (floor (* 60 minutes)) ))
(let* ((whole-minutes (floor minutes))
(seconds (floor (* 60 (- minutes whole-minutes)))))
(format "%s:%02d"
(org-duration-from-minutes (/ seconds 60) 'h:mm)
(mod seconds 60))))
(org-duration-from-minutes whole-minutes 'h:mm)
seconds)))
((pred atom) (error "Invalid duration format specification: %S" fmt))
;; Mixed format. Call recursively the function on both parts.
((and duration-format
@ -349,7 +350,7 @@ Raise an error if expected format is unknown."
(org-duration-from-minutes minutes mode canonical)
;; Represent minutes above hour using provided units and H:MM
;; or H:MM:SS below.
(let* ((units-part (* min-modifier (floor (/ minutes min-modifier))))
(let* ((units-part (* min-modifier (/ (floor minutes) min-modifier)))
(minutes-part (- minutes units-part)))
(concat
(org-duration-from-minutes units-part truncated-format canonical)
@ -397,7 +398,9 @@ Raise an error if expected format is unknown."
(pcase-let* ((`(,unit . ,required?) units)
(modifier (org-duration--modifier unit canonical)))
(cond ((<= modifier minutes)
(let ((value (floor (/ minutes modifier))))
(let ((value (if (integerp modifier)
(/ (floor minutes) modifier)
(floor (/ minutes modifier)))))
(cl-decf minutes (* value modifier))
(format " %d%s" value unit)))
(required? (concat " 0" unit))
@ -408,11 +411,7 @@ Raise an error if expected format is unknown."
;; one anyway.
(t
(pcase-let ((`((,unit . ,_)) (last selected-units)))
(concat
(if (not fractional) "0"
(let ((modifier (org-duration--modifier unit canonical)))
(format fractional (/ (float minutes) modifier))))
unit))))))))
(concat "0" unit))))))))
;;;###autoload
(defun org-duration-h:mm-only-p (times)