Project

General

Profile

Revision b1a97ade src/clocks.ml

View differences:

src/clocks.ml
354 354
  in
355 355
  let (a,b) = aux ck in
356 356
  simplify_rat (a,b)
357
    
357

  
358
let eq_carrier cr1 cr2 =
359
  match (carrier_repr cr1).carrier_desc, (carrier_repr cr2).carrier_desc with
360
 | Carry_const id1, Carry_const id2 -> id1 = id2
361
 | _                                -> cr1.carrier_id = cr2.carrier_id
362

  
358 363
(* Returns the clock root of a clock *)
359 364
let rec root ck =
360 365
  match (repr ck).cdesc with
......
379 384
 match br1, br2 with
380 385
 | []          , _
381 386
 | _           , []           -> false
382
 | (cr1,l1)::q1, (cr2,l2)::q2 -> cr1 = cr2 && ((l1 <> l2) || disjoint_branches q1 q2);;
387
 | (cr1,l1)::q1, (cr2,l2)::q2 -> eq_carrier cr1 cr2 && ((l1 <> l2) || disjoint_branches q1 q2);;
383 388

  
384 389
(* Disjunction relation between variables based upon their static clocks. *)
385 390
let disjoint ck1 ck2 =

Also available in: Unified diff