remove cooperate

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

src/tactic/aig/aig.cpp

@@ -19,7 +19,6 @@ Notes:
 #include "tactic/aig/aig.h"
 #include "tactic/goal.h"
 #include "ast/ast_smt2_pp.h"
-#include "util/cooperate.h"
 
 #define USE_TWO_LEVEL_RULES
 #define FIRST_NODE_ID (UINT_MAX/2)
@@ -129,7 +128,6 @@ struct aig_manager::imp {
             throw aig_exception(TACTIC_MAX_MEMORY_MSG);
         if (m().canceled())
             throw aig_exception(m().limit().get_cancel_msg());
-        cooperate("aig");
     }
 
     void dec_ref_core(aig_lit const & r) { dec_ref_core(r.ptr()); }

src/tactic/arith/card2bv_tactic.cpp

@@ -17,7 +17,6 @@ Notes:
 
 --*/
 #include "tactic/tactical.h"
-#include "util/cooperate.h"
 #include "ast/ast_smt2_pp.h"
 #include "tactic/arith/card2bv_tactic.h"
 #include "ast/rewriter/pb2bv_rewriter.h"

src/tactic/arith/degree_shift_tactic.cpp

@@ -21,7 +21,6 @@ Revision History:
 --*/
 #include "tactic/tactical.h"
 #include "tactic/generic_model_converter.h"
-#include "util/cooperate.h"
 #include "ast/arith_decl_plugin.h"
 #include "tactic/core/simplify_tactic.h"
 #include "ast/ast_smt2_pp.h"
@@ -100,7 +99,6 @@ class degree_shift_tactic : public tactic {
         void checkpoint() {
             if (m.canceled())
                 throw tactic_exception(m.limit().get_cancel_msg());
-            cooperate("degree_shift");
         }
 
         void visit(expr * t, expr_fast_mark1 & visited) {

src/tactic/arith/eq2bv_tactic.cpp

@@ -18,7 +18,6 @@ Notes:
 
 --*/
 #include "tactic/tactical.h"
-#include "util/cooperate.h"
 #include "tactic/arith/bound_manager.h"
 #include "ast/ast_pp.h"
 #include "ast/arith_decl_plugin.h"

src/tactic/arith/fm_tactic.cpp

@@ -25,7 +25,6 @@ Revision History:
 #include "tactic/tactical.h"
 #include "ast/arith_decl_plugin.h"
 #include "ast/for_each_expr.h"
-#include "util/cooperate.h"
 #include "ast/ast_smt2_pp.h"
 #include "ast/ast_pp.h"
 #include "util/id_gen.h"
@@ -1543,7 +1542,6 @@ class fm_tactic : public tactic {
         }
         
         void checkpoint() {
-            cooperate("fm");
             if (m.canceled())
                 throw tactic_exception(m.limit().get_cancel_msg());
             if (memory::get_allocation_size() > m_max_memory)

src/tactic/arith/lia2card_tactic.cpp

@@ -16,7 +16,6 @@ Author:
 Notes:
 
 --*/
-#include "util/cooperate.h"
 #include "ast/ast_pp.h"
 #include "ast/pb_decl_plugin.h"
 #include "ast/arith_decl_plugin.h"

src/tactic/arith/pb2bv_tactic.cpp

@@ -17,7 +17,6 @@ Notes:
 
 --*/
 #include "tactic/tactical.h"
-#include "util/cooperate.h"
 #include "tactic/arith/bound_manager.h"
 #include "ast/rewriter/bool_rewriter.h"
 #include "ast/rewriter/rewriter_def.h"
@@ -182,7 +181,6 @@ private:
         };
 
         void checkpoint() {
-            cooperate("pb2bv");
             if (memory::get_allocation_size() > m_max_memory)
                 throw tactic_exception(TACTIC_MAX_MEMORY_MSG);
         }
@@ -209,7 +207,6 @@ private:
             }
 
             bool max_steps_exceeded(unsigned num_steps) const { 
-                cooperate("pb2bv");
                 if (memory::get_allocation_size() > owner.m_max_memory)
                     throw tactic_exception(TACTIC_MAX_MEMORY_MSG);
                 return false;

src/tactic/bv/bv1_blaster_tactic.cpp

@@ -27,7 +27,6 @@ Notes:
 #include "ast/bv_decl_plugin.h"
 #include "ast/rewriter/rewriter_def.h"
 #include "ast/for_each_expr.h"
-#include "util/cooperate.h"
 #include "ast/rewriter/bv_rewriter.h"
 
 class bv1_blaster_tactic : public tactic {
@@ -73,7 +72,6 @@ class bv1_blaster_tactic : public tactic {
         bool rewrite_patterns() const { UNREACHABLE(); return false; }
         
         bool max_steps_exceeded(unsigned num_steps) const { 
-            cooperate("bv1 blaster");
             if (memory::get_allocation_size() > m_max_memory)
                 throw tactic_exception(TACTIC_MAX_MEMORY_MSG);
             return num_steps > m_max_steps;

src/tactic/bv/bv_bound_chk_tactic.cpp

@@ -21,7 +21,6 @@
 #include "ast/rewriter/bv_bounds.h"
 #include "ast/rewriter/rewriter_params.hpp"
 #include "ast/rewriter/bool_rewriter.h"
-#include "util/cooperate.h"
 
 struct bv_bound_chk_stats {
     unsigned            m_unsats;
@@ -80,7 +79,6 @@ struct bv_bound_chk_rewriter_cfg : public default_rewriter_cfg {
     }
 
     bool max_steps_exceeded(unsigned long long num_steps) const {
-        cooperate("bv-bound-chk");
         if (num_steps > m_max_steps)
             return true;
         if (memory::get_allocation_size() > m_max_memory)

src/tactic/bv/bvarray2uf_rewriter.cpp

@@ -18,7 +18,6 @@ Notes:
 
 --*/
 
-#include "util/cooperate.h"
 #include "ast/bv_decl_plugin.h"
 #include "ast/array_decl_plugin.h"
 #include "util/params.h"

src/tactic/bv/elim_small_bv_tactic.cpp

@@ -19,7 +19,6 @@ Revision History:
 #include "tactic/tactical.h"
 #include "ast/rewriter/rewriter_def.h"
 #include "tactic/generic_model_converter.h"
-#include "util/cooperate.h"
 #include "ast/bv_decl_plugin.h"
 #include "ast/used_vars.h"
 #include "ast/well_sorted.h"
@@ -56,7 +55,6 @@ class elim_small_bv_tactic : public tactic {
         }
 
         bool max_steps_exceeded(unsigned long long num_steps) const {
-            cooperate("elim-small-bv");
             if (num_steps > m_max_steps)
                 return true;
             if (memory::get_allocation_size() > m_max_memory)

src/tactic/bv/max_bv_sharing_tactic.cpp

@@ -24,7 +24,6 @@ Revision History:
 #include "ast/rewriter/rewriter_def.h"
 #include "util/obj_pair_hashtable.h"
 #include "ast/ast_lt.h"
-#include "util/cooperate.h"
 
 class max_bv_sharing_tactic : public tactic {
     
@@ -61,7 +60,6 @@ class max_bv_sharing_tactic : public tactic {
         }
 
         bool max_steps_exceeded(unsigned num_steps) const { 
-            cooperate("max bv sharing");
             if (memory::get_allocation_size() > m_max_memory)
                 throw tactic_exception(TACTIC_MAX_MEMORY_MSG);
             return num_steps > m_max_steps;

src/tactic/core/blast_term_ite_tactic.cpp

@@ -16,7 +16,6 @@ Author:
 Notes:
 
 --*/
-#include "util/cooperate.h"
 #include "ast/normal_forms/defined_names.h"
 #include "ast/rewriter/rewriter_def.h"
 #include "ast/scoped_proof.h"
@@ -60,7 +59,6 @@ class blast_term_ite_tactic : public tactic {
         
 
         bool max_steps_exceeded(unsigned num_steps) const { 
-            cooperate("blast term ite");
             // if (memory::get_allocation_size() > m_max_memory) 
             //    throw tactic_exception(TACTIC_MAX_MEMORY_MSG);
             return num_steps >= m_max_steps;

src/tactic/core/cofactor_elim_term_ite.cpp

@@ -19,7 +19,6 @@ Revision History:
 #include "tactic/core/cofactor_elim_term_ite.h"
 #include "ast/rewriter/mk_simplified_app.h"
 #include "ast/rewriter/rewriter_def.h"
-#include "util/cooperate.h"
 #include "ast/for_each_expr.h"
 #include "ast/ast_smt2_pp.h"
 #include "ast/ast_ll_pp.h"
@@ -32,7 +31,6 @@ struct cofactor_elim_term_ite::imp {
     bool               m_cofactor_equalities;
 
     void checkpoint() { 
-        cooperate("cofactor ite");
         if (memory::get_allocation_size() > m_max_memory)
             throw tactic_exception(TACTIC_MAX_MEMORY_MSG);
         if (m.canceled())

src/tactic/core/ctx_simplify_tactic.cpp

@@ -18,7 +18,6 @@ Notes:
 --*/
 #include "tactic/core/ctx_simplify_tactic.h"
 #include "ast/rewriter/mk_simplified_app.h"
-#include "util/cooperate.h"
 #include "ast/ast_ll_pp.h"
 #include "ast/ast_pp.h"
 
@@ -202,7 +201,6 @@ struct ctx_simplify_tactic::imp {
     }
 
     void checkpoint() {
-        cooperate("ctx_simplify_tactic");
         if (memory::get_allocation_size() > m_max_memory)
             throw tactic_exception(TACTIC_MAX_MEMORY_MSG);
         if (m.canceled())

src/tactic/core/elim_term_ite_tactic.cpp

@@ -21,7 +21,6 @@ Notes:
 #include "ast/normal_forms/defined_names.h"
 #include "ast/rewriter/rewriter_def.h"
 #include "tactic/generic_model_converter.h"
-#include "util/cooperate.h"
 
 class elim_term_ite_tactic : public tactic {
 
@@ -35,7 +34,6 @@ class elim_term_ite_tactic : public tactic {
         unsigned                    m_num_fresh;
 
         bool max_steps_exceeded(unsigned num_steps) const { 
-            cooperate("elim term ite");
             if (memory::get_allocation_size() > m_max_memory)
                 throw tactic_exception(TACTIC_MAX_MEMORY_MSG);
             return false;

src/tactic/core/elim_uncnstr_tactic.cpp

@@ -24,7 +24,6 @@ Notes:
 #include "ast/array_decl_plugin.h"
 #include "ast/datatype_decl_plugin.h"
 #include "tactic/core/collect_occs.h"
-#include "util/cooperate.h"
 #include "ast/ast_smt2_pp.h"
 #include "ast/ast_ll_pp.h"
 
@@ -67,7 +66,6 @@ class elim_uncnstr_tactic : public tactic {
         ast_manager & m() const { return m_a_util.get_manager(); }
         
         bool max_steps_exceeded(unsigned num_steps) const { 
-            cooperate("elim-uncnstr-vars");
             if (memory::get_allocation_size() > m_max_memory)
                 throw tactic_exception(TACTIC_MAX_MEMORY_MSG);
             return num_steps > m_max_steps;

src/tactic/core/occf_tactic.cpp

@@ -24,7 +24,6 @@ Revision History:
 #include "tactic/tactical.h"
 #include "tactic/core/occf_tactic.h"
 #include "tactic/generic_model_converter.h"
-#include "util/cooperate.h"
 
 class occf_tactic : public tactic {
     struct     imp {
@@ -38,7 +37,6 @@ class occf_tactic : public tactic {
         void checkpoint() {
             if (m.canceled())
                 throw tactic_exception(TACTIC_CANCELED_MSG);
-            cooperate("occf");
         }
 
         bool is_literal(expr * t) const {

src/tactic/core/reduce_args_tactic.cpp

@@ -17,7 +17,6 @@ Notes:
 
 --*/
 #include "tactic/tactical.h"
-#include "util/cooperate.h"
 #include "ast/ast_smt2_pp.h"
 #include "ast/has_free_vars.h"
 #include "util/map.h"
@@ -115,7 +114,6 @@ struct reduce_args_tactic::imp {
     void checkpoint() { 
         if (m_manager.canceled())
             throw tactic_exception(m_manager.limit().get_cancel_msg());
-        cooperate("reduce-args");
     }
     
     struct find_non_candidates_proc {

src/tactic/core/reduce_invertible_tactic.cpp

@@ -20,7 +20,6 @@ Notes:
 
 --*/
 
-#include "util/cooperate.h"
 #include "ast/bv_decl_plugin.h"
 #include "ast/arith_decl_plugin.h"
 #include "ast/ast_pp.h"
@@ -97,7 +96,6 @@ private:
     void checkpoint() { 
         if (m.canceled())
             throw tactic_exception(m.limit().get_cancel_msg());
-        cooperate("reduce-invertible");
     }
 
     expr_mark        m_inverted;

src/tactic/core/solve_eqs_tactic.cpp

@@ -17,7 +17,6 @@ Revision History:
 
 --*/
 #include "ast/rewriter/expr_replacer.h"
-#include "util/cooperate.h"
 #include "ast/occurs.h"
 #include "ast/ast_util.h"
 #include "ast/ast_pp.h"
@@ -87,7 +86,6 @@ class solve_eqs_tactic : public tactic {
         void checkpoint() {
             if (m().canceled())
                 throw tactic_exception(m().limit().get_cancel_msg());
-            cooperate("solve-eqs");
         }
         
         // Check if the number of occurrences of t is below the specified threshold :solve-eqs-max-occs

src/tactic/core/tseitin_cnf_tactic.cpp

@@ -54,7 +54,6 @@ Notes:
 #include "tactic/generic_model_converter.h"
 #include "ast/rewriter/bool_rewriter.h"
 #include "tactic/core/simplify_tactic.h"
-#include "util/cooperate.h"
 
 static void swap_if_gt(expr * & n1, expr * & n2) {
     if (n1->get_id() > n2->get_id())
@@ -785,7 +784,6 @@ class tseitin_cnf_tactic : public tactic {
         
         
         void checkpoint() {
-            cooperate("tseitin cnf");
             if (m.canceled())
                 throw tactic_exception(TACTIC_CANCELED_MSG);
             if (memory::get_allocation_size() > m_max_memory)

src/tactic/sls/sls_engine.cpp

@@ -24,7 +24,6 @@ Notes:
 #include "ast/rewriter/var_subst.h"
 #include "model/model_pp.h"
 #include "tactic/tactic.h"
-#include "util/cooperate.h"
 #include "util/luby.h"
 
 #include "tactic/sls/sls_params.hpp"
@@ -96,7 +95,6 @@ void sls_engine::collect_statistics(statistics& st) const {
 void sls_engine::checkpoint() {
     if (m_manager.canceled())
         throw tactic_exception(m_manager.limit().get_cancel_msg());
-    cooperate("sls");
 }
 
 bool sls_engine::full_eval(model & mdl) {

src/tactic/smtlogics/qfufbv_tactic.cpp

@@ -30,7 +30,6 @@ Notes:
 #include "tactic/smtlogics/qfufbv_tactic_params.hpp"
 ///////////////
 #include "model/model_smt2_pp.h"
-#include "util/cooperate.h"
 #include "ackermannization/lackr.h"
 #include "ackermannization/ackermannization_params.hpp"
 #include "tactic/smtlogics/qfufbv_ackr_model_converter.h"