FIX a bunch more typos

This commit is contained in:
Nathan Dwarshuis 2022-04-20 00:17:52 -04:00
parent be46904cc3
commit de24847d15
1 changed files with 18 additions and 18 deletions

View File

@ -1377,15 +1377,9 @@ used for optimization."
(defun org-x-dag-ns-dlp (sel-date adjlist links ns) (defun org-x-dag-ns-dlp (sel-date adjlist links ns)
(cl-flet (cl-flet
((add-planned ((get-planned-ht
(id htbl res) (htbl ids)
(->> (--mapcat (nth 1) res) (--mapcat (org-x-dag-ht-get-maybe htbl it :planned) ids))
(-uniq)
;; TODO ':planned' might not be the best name for these
(org-x-dag-ht-add-links id htbl :planned)))
(get-planned-ht
(htbl id)
(--mapcat (org-x-dag-ht-get-maybe htbl it :planned) c))
(get-sched (get-sched
(id) (id)
(-some->> (org-x-dag-adjlist-id-hl-meta-prop adjlist :planning id) (-some->> (org-x-dag-adjlist-id-hl-meta-prop adjlist :planning id)
@ -1393,7 +1387,13 @@ used for optimization."
(org-ml-timestamp-get-start-time))) (org-ml-timestamp-get-start-time)))
(to-valid (to-valid
(id key planning-ids) (id key planning-ids)
(either :right `(,id ,key ,planning-ids)))) (either :right `(,id ,key ,planning-ids)))
(add-planned
(id htbl res)
(->> (--mapcat (nth 1) res)
(-uniq)
;; TODO ':planned' might not be the best name for these
(org-x-dag-ht-add-links id htbl :planned))))
(-let* (((&alist :lifetime ht-l (-let* (((&alist :lifetime ht-l
:endpoint ht-e :endpoint ht-e
:survival ht-s :survival ht-s
@ -1402,11 +1402,11 @@ used for optimization."
:weekly ht-w) :weekly ht-w)
ns) ns)
(get-planned (get-planned
(lambda (id) (lambda (id committed-ids)
(let* ((c (org-x-dag-ht-get-maybe ht-a id :committed))) (->> (get-planned-ht ht-l committed-ids)
(-union (get-planned-ht ht-e c) (get-planned-ht ht-l c))))) (-union (get-planned-ht ht-e committed-ids)))))
(is-scheduled-action (is-scheduled-action
(lambda (adjlist id) (lambda (adjlist id committed-ids)
(-if-let (sched (get-sched id)) (-if-let (sched (get-sched id))
;; ASSUME if the node's timestamp does not coincide with ;; ASSUME if the node's timestamp does not coincide with
;; the actual day in the plan it will be reflected in the ;; the actual day in the plan it will be reflected in the
@ -1415,12 +1415,12 @@ used for optimization."
(if time (if time
(either :left "Linked to action with HH:MM timestamp") (either :left "Linked to action with HH:MM timestamp")
(if (org-x-dag-ht-get-maybe ht-a id :survivalp) (if (org-x-dag-ht-get-maybe ht-a id :survivalp)
(to-valid id survival c) (to-valid id survival committed-ids)
(-if-let (q (funcall get-planned id)) (-if-let (q (funcall get-planned id committed-ids))
(to-valid id :quarterly q) (to-valid id :quarterly q)
(->> "Linked to scheduled action that isn't on QTP" (->> "Linked to scheduled action that isn't on QTP"
(either :left)))))) (either :left))))))
(-if-let (w (->> (funcall get-planned id) (-if-let (w (->> (funcall get-planned id committed-ids)
(--mapcat (org-x-dag-ht-get-maybe ht-q it :planned)))) (--mapcat (org-x-dag-ht-get-maybe ht-q it :planned))))
(to-valid id :weekly w) (to-valid id :weekly w)
(->> "Linked to unscheduled action that isn't on WKP" (->> "Linked to unscheduled action that isn't on WKP"
@ -1428,7 +1428,7 @@ used for optimization."
(is-valid-action (is-valid-action
(lambda (adjlist id) (lambda (adjlist id)
(-if-let (c (org-x-dag-ht-get-maybe ht-a id :committed)) (-if-let (c (org-x-dag-ht-get-maybe ht-a id :committed))
(is-scheduled-action adjlist id) (funcall is-scheduled-action adjlist id c)
(either :left "Linked to uncommitted action"))))) (either :left "Linked to uncommitted action")))))
(org-x-dag-ns-with-valid ns adjlist :daily links (org-x-dag-ns-with-valid ns adjlist :daily links
`((:action ,is-valid-action)) `((:action ,is-valid-action))