equal
deleted
inserted
replaced
249 |
249 |
250 fun relevant_clauses max_new thy ctab p rel_consts = |
250 fun relevant_clauses max_new thy ctab p rel_consts = |
251 let fun relevant ([],_) [] = [] : (thm * (string * int)) list (*Nothing added this iteration*) |
251 let fun relevant ([],_) [] = [] : (thm * (string * int)) list (*Nothing added this iteration*) |
252 | relevant (newpairs,rejects) [] = |
252 | relevant (newpairs,rejects) [] = |
253 let val (newrels,more_rejects) = take_best max_new newpairs |
253 let val (newrels,more_rejects) = take_best max_new newpairs |
254 val new_consts = List.concat (map #2 newrels) |
254 val new_consts = maps #2 newrels |
255 val rel_consts' = List.foldl add_const_typ_table rel_consts new_consts |
255 val rel_consts' = List.foldl add_const_typ_table rel_consts new_consts |
256 val newp = p + (1.0-p) / convergence |
256 val newp = p + (1.0-p) / convergence |
257 in |
257 in |
258 Output.debug (fn () => ("relevant this iteration: " ^ Int.toString (length newrels))); |
258 Output.debug (fn () => ("relevant this iteration: " ^ Int.toString (length newrels))); |
259 (map #1 newrels) @ |
259 (map #1 newrels) @ |
423 |
423 |
424 (***************************************************************) |
424 (***************************************************************) |
425 (* Type Classes Present in the Axiom or Conjecture Clauses *) |
425 (* Type Classes Present in the Axiom or Conjecture Clauses *) |
426 (***************************************************************) |
426 (***************************************************************) |
427 |
427 |
428 fun add_classes (sorts, cset) = List.foldl setinsert cset (List.concat sorts); |
428 fun add_classes (sorts, cset) = List.foldl setinsert cset (flat sorts); |
429 |
429 |
430 (*Remove this trivial type class*) |
430 (*Remove this trivial type class*) |
431 fun delete_type cset = Symtab.delete_safe "HOL.type" cset; |
431 fun delete_type cset = Symtab.delete_safe "HOL.type" cset; |
432 |
432 |
433 fun tvar_classes_of_terms ts = |
433 fun tvar_classes_of_terms ts = |