Project

General

Profile

Revision 1a213985

View differences:

src/lib/Nom2fix.ml
50 50
    let add = match funct with
51 51
    | CoAlgMisc.MultiModalK
52 52
    | CoAlgMisc.MultiModalKD -> CoAlgFormula.IMP(CoAlgFormula.EF(CoAlgFormula.AND(subf, aktnom)),CoAlgFormula.AG(CoAlgFormula.IMP(aktnom, subf)))
53
    (*| CoAlgMisc.Monotone ->*)
54
    (*| CoAlgMisc.CoalitionLogic -> CoAlgFormula.IMP(CoAlgFormula.MU(x, CoAlgFormula.OR(CoAlgFormula.AND(subf, aktnom), )))
55
    | CoAlgMisc.GML ->
56
    | CoAlgMisc.PML ->*)
53
    | CoAlgMisc.CoalitionLogic -> CA.IMP(CA.MU("X", CA.OR(CA.AND(aktnom, subf),CA.ALLOWS([], VAR "X"))),CA.NU("X", CA.AND(CA.IMP(aktnom, subf),CA.ENFORCES([], VAR "X"))))
54
    | CoAlgMisc.Constant sl -> CA.IMP(CA.AND(aktnom, subf), CA.IMP(aktnom, subf))
55
    | CoAlgMisc.Identity -> CA.IMP(CA.MU("X", CA.OR(CA.AND(aktnom, subf),CA.ID(VAR "X"))),CA.NU("X", CA.AND(CA.IMP(aktnom, subf),CA.ID(VAR "X"))))
57 56
    in
58 57
        ret := AND(!ret, add);
59 58
  done;
......
129 128
  for i = 0 to (List.length !formulaList) - 1 do
130 129
    for j = i + 1 to (List.length !formulaList) - 1 do
131 130
      rem := if CoAlgFormula.equals (List.nth !formulaList i) (CoAlgFormula.nnfNeg (List.nth !formulaList j)) then true else !rem;
132
      print_endline (if !rem == true then "true" else "false");
131
      (*print_endline (if !rem == true then "true" else "false");
133 132
      print_endline (CoAlgFormula.exportFormula (CoAlgFormula.nnf (List.nth !formulaList i)));
134
      print_endline (CoAlgFormula.exportFormula (CoAlgFormula.nnfNeg (List.nth !formulaList j)));
133
      print_endline (CoAlgFormula.exportFormula (CoAlgFormula.nnfNeg (List.nth !formulaList j)));*)
135 134
    done;
136 135
    if !rem == false then formulaListSmall := (List.nth !formulaList i) :: !formulaListSmall;
137 136
    rem := false;

Also available in: Unified diff