ndwarshuis
/
emacs-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX child scheds not being propagated in trees

This commit is contained in:
Nathan Dwarshuis 2022-06-07 19:12:09 -04:00
parent 94cefaa250
commit 4171bb788f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
local/lib/org-x/org-x-dag.el
View File

@ -682,7 +682,7 @@ used for optimization."
(`(:right ,r) (`(:right ,r)
(-let (((cur as) acc)) (-let (((cur as) acc))
(either>>= (funcall rank-fun cur r) (either>>= (funcall rank-fun cur r)
(let ((as* (append (funcall acc-fun it) as))) (let ((as* (append (funcall acc-fun r) as)))
(if (not it) (fold-rank `(,cur ,as*) rest) (if (not it) (fold-rank `(,cur ,as*) rest)
(if (funcall stop-fun r) (if (funcall stop-fun r)
;; if we encounter the stop condition, apply the ;; if we encounter the stop condition, apply the
@ -700,7 +700,6 @@ used for optimization."
(`(:right ,r) (`(:right ,r)
(if (funcall stop-fun r) (if (funcall stop-fun r)
(->> (funcall acc-fun r) (->> (funcall acc-fun r)
(list)
(funcall trans-fun r)) (funcall trans-fun r))
(either>>= (fold-rank (list r nil) (cdr bss)) (either>>= (fold-rank (list r nil) (cdr bss))
(-let (((cur as) it)) (-let (((cur as) it))
@ -714,7 +713,7 @@ used for optimization."
(org-x-dag-bs-rankfold-children bss default (org-x-dag-bs-rankfold-children bss default
(-on rank-fun #'get-local) (-on rank-fun #'get-local)
(-compose stop-fun #'get-local) (-compose stop-fun #'get-local)
acc-fun (-compose acc-fun #'get-local)
(lambda (x as) (lambda (x as)
(funcall trans-fun (get-local x) as))))) (funcall trans-fun (get-local x) as)))))
@ -898,7 +897,7 @@ deadline (eg via epoch time) or if it has a repeater."
(lambda (next) (lambda (next)
(pcase next (pcase next
(`(:sp-iter :iter-active ,d) (plist-get d :child-scheds)) (`(:sp-iter :iter-active ,d) (plist-get d :child-scheds))
(`(:sp-task :task-active ,d) (list (plist-get d :sched))) (`(:sp-task :task-active ,d) (-some-> (plist-get d :sched) (list)))
(`(:sp-proj :proj-active ,d) (plist-get d :child-scheds)) (`(:sp-proj :proj-active ,d) (plist-get d :child-scheds))
(_ nil))) (_ nil)))