Permalink
Browse files

new hierarchy date_compose

  • Loading branch information...
michael.gruninger
michael.gruninger committed Mar 21, 2015
1 parent 8cfa238 commit 6b6613b10d15c016436fa97703f57306165ad4b0
@@ -8,5 +8,10 @@
(exists (z)
(apply z x y))))
(forall (x z)
(iff (word_color x z)
(exists (y)
(apply x y z))))
)
@@ -0,0 +1,53 @@
(cl-text http://colore.oor.net/duration/date_compose.clif
(cl-imports http://colore.oor.net/duration/date_periodic.clif)
(cl-imports http://colore.oor.net/psl_actocc/actocc.clif)
(forall (a1 a2)
(if (and (date a1)
(subactivity a2 a1))
(date a2)))
(forall (a1 a2 o2)
(if (and (date a1)
(subactivity a2 a1)
(occurrence_of o1 a1))
(exists (o2)
(and (occurrence_of o2 a2)
(subactivity_occurrence o2 o1)))))
(forall (a s1 s2 s3 s4)
(if (and (date a)
(min_precedes s1 s2 a)
(mono s1 s3 a)
(mono s2 s4 a))
(min_precedes s3 s4 a)))
(forall (a1 a2 o1 o2 o3)
(if (and (date a)
(occurrence_of o1 a1)
(subactivity_occurrence o2 o1)
(subactivity_occurrence o3 o1)
(occurrence_of o2 a2)
(occurrence_of o3 a2)
(not (= o2 o3)))
(exists (a3)
(and (subactivity a3 a1)
(subactivity a2 a3)
(not (= a3 a1))
(not (= a3 a2))))))
(forall (a a1 a2 s s1 s2 s3 s4)
(if (and (date a)
(subactivity a1 a)
(subactivity a2 a)
(root s1 a1)
(leaf s3 a1)
(root s2 a2)
(leaf s4 a2)
(min_precedes s1 s2 a)
(min_precedes s2 s3 a))
(min_precedes s4 s3 a)))
)
@@ -9,4 +9,38 @@
(exists (d)
(freq a d))))
(forall (a d1 d2)
(if (and (freq a d1)
(freq a d2))
(= d1 d2)))
(forall (a d t o1 o2)
(if (and (freq a d)
(occurrence_of o1 a)
(occurrence_of o2 a)
(= d (duration (beginof o1) t)))
(not (between (beginof o1) (beginof o2) t))))
(forall a d t o1 o2)
(if (and (date a)
(occurrence_of o1 a)
(occurrence_of o2 a))
(= (duration (beginof o1) (endof o1)) (duration (beginof o2) (endof o2)))))
(forall (a t)
(iff (occurs a t)
(forall (o)
(if (between (beginof o) t (endof o))
(occurrence_of o a)))))
(forall (a d)
(iff (freq a d)
(and (activity a)
(timeduration d)
(forall (o)
(if (occurrence o a)
(exists (t)
(and (= d (duration (beginof o) t)))
(occurs a t))))))))
)

0 comments on commit 6b6613b

Please sign in to comment.