mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-06-01 06:37:49 +00:00
Code Activity

fix merge conflict

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2025-10-30 08:30:14 -07:00
parent 98090fbf50
commit e958654946
1 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/model/model.cpp
View file

@ -111,14 +111,8 @@ value_factory* model::get_factory(sort* s) {
m_factories.register_plugin(alloc(arith_factory, m)); m_factories.register_plugin(alloc(arith_factory, m));
m_factories.register_plugin(alloc(seq_factory, m, su.get_family_id(), *this)); m_factories.register_plugin(alloc(seq_factory, m, su.get_family_id(), *this));
m_factories.register_plugin(alloc(fpa_value_factory, m, fu.get_family_id())); m_factories.register_plugin(alloc(fpa_value_factory, m, fu.get_family_id()));
<<<<<<< HEAD
<<<<<<< HEAD
m_factories.register_plugin(alloc(finite_set_factory, m, m.get_family_id("finite_set"), *this)); m_factories.register_plugin(alloc(finite_set_factory, m, m.get_family_id("finite_set"), *this));
=======
m_factories.register_plugin(alloc(finite_set_value_factory, m, m.mk_family_id("finite_set"), *this));
>>>>>>> 05ffc0a77 (Add finite_set_value_factory for creating finite set values in model generation (#7981))
=======
>>>>>>> 62ee7ccf6 (Revert "Add finite_set_value_factory for creating finite set values in model …" (#7985))
//m_factories.register_plugin(alloc(char_factory, m, char_decl_plugin(m).get_family_id()); //m_factories.register_plugin(alloc(char_factory, m, char_decl_plugin(m).get_family_id());
} }
family_id fid = s->get_family_id(); family_id fid = s->get_family_id();