projects
/
tatoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finish renaming Move constructor to Atom.
[tatoo.git]
/
src
/
formula.ml
diff --git
a/src/formula.ml
b/src/formula.ml
index
f4022f9
..
7bd8ca6
100644
(file)
--- a/
src/formula.ml
+++ b/
src/formula.ml
@@
-14,7
+14,7
@@
(***********************************************************************)
(*
(***********************************************************************)
(*
- Time-stamp: <Last modified on 2013-0
1-30 19:04:05 CET by Kim Nguye
n>
+ Time-stamp: <Last modified on 2013-0
2-04 16:03:28 CET by Kim Nguyễ
n>
*)
INCLUDE "utils.ml"
*)
INCLUDE "utils.ml"
@@
-48,7
+48,7
@@
module rec Node : Hcons.S
| a,b when a == b -> true
| Or(xf1, xf2), Or(yf1, yf2)
| And(xf1, xf2), And(yf1,yf2) -> (xf1 == yf1) && (xf2 == yf2)
| a,b when a == b -> true
| Or(xf1, xf2), Or(yf1, yf2)
| And(xf1, xf2), And(yf1,yf2) -> (xf1 == yf1) && (xf2 == yf2)
- |
Move(d1, p1, s1), Move
(d2 ,p2 ,s2) -> d1 == d2 && p1 == p2 && s1 == s2
+ |
Atom(d1, p1, s1), Atom
(d2 ,p2 ,s2) -> d1 == d2 && p1 == p2 && s1 == s2
| _ -> false
let hash f =
| _ -> false
let hash f =
@@
-60,7
+60,7
@@
module rec Node : Hcons.S
| And (f1, f2) ->
HASHINT3(PRIME3, Uid.to_int f1.Node.id, Uid.to_int f2.Node.id)
| And (f1, f2) ->
HASHINT3(PRIME3, Uid.to_int f1.Node.id, Uid.to_int f2.Node.id)
- |
Move
(d, p, s) -> HASHINT4(PRIME5, hash_const_variant d,vb p,s)
+ |
Atom
(d, p, s) -> HASHINT4(PRIME5, hash_const_variant d,vb p,s)
end
type t = Node.t
end
type t = Node.t
@@
-73,7
+73,7
@@
let compare f1 f2 = compare f1.Node.id f2.Node.id
let prio f =
match expr f with
| True | False -> 10
let prio f =
match expr f with
| True | False -> 10
- |
Move
_ -> 8
+ |
Atom
_ -> 8
| And _ -> 6
| Or _ -> 1
| And _ -> 6
| Or _ -> 1
@@
-90,7
+90,7
@@
let rec print ?(parent=false) ppf f =
(print ppf f1);
fprintf ppf " %s " Pretty.vee;
(print ppf f2);
(print ppf f1);
fprintf ppf " %s " Pretty.vee;
(print ppf f2);
- |
Move
(dir, b, s) ->
+ |
Atom
(dir, b, s) ->
let _ = flush_str_formatter() in
let fmt = str_formatter in
let a_str, d_str =
let _ = flush_str_formatter() in
let fmt = str_formatter in
let a_str, d_str =
@@
-125,7
+125,7
@@
let cons pos neg =
let true_,false_ = cons True False
let atom_ d p s =
let true_,false_ = cons True False
let atom_ d p s =
- fst (cons (
Move(d,p,s)) (Move
(d,not p,s)))
+ fst (cons (
Atom(d,p,s)) (Atom
(d,not p,s)))
let not_ f = f.Node.node.neg
let not_ f = f.Node.node.neg