diff --git a/Makefile b/Makefile index 814656e9009..49bfe9242d4 100644 --- a/Makefile +++ b/Makefile @@ -632,7 +632,7 @@ $(eval $(call add_include_file,kernel/yosys.h)) $(eval $(call add_include_file,kernel/yw.h)) $(eval $(call add_include_file,libs/ezsat/ezsat.h)) $(eval $(call add_include_file,libs/ezsat/ezminisat.h)) -$(eval $(call add_include_file,libs/ezsat/ezcommand.h)) +$(eval $(call add_include_file,libs/ezsat/ezcmdlinesat.h)) ifeq ($(ENABLE_ZLIB),1) $(eval $(call add_include_file,libs/fst/fstapi.h)) endif @@ -673,7 +673,7 @@ OBJS += libs/json11/json11.o OBJS += libs/ezsat/ezsat.o OBJS += libs/ezsat/ezminisat.o -OBJS += libs/ezsat/ezcommand.o +OBJS += libs/ezsat/ezcmdlinesat.o OBJS += libs/minisat/Options.o OBJS += libs/minisat/SimpSolver.o diff --git a/libs/ezsat/ezcommand.cc b/libs/ezsat/ezcmdlinesat.cc similarity index 90% rename from libs/ezsat/ezcommand.cc rename to libs/ezsat/ezcmdlinesat.cc index c2925b6472f..3c2ac5af6e1 100644 --- a/libs/ezsat/ezcommand.cc +++ b/libs/ezsat/ezcmdlinesat.cc @@ -1,13 +1,13 @@ -#include "ezcommand.h" +#include "ezcmdlinesat.h" #include "../../kernel/yosys.h" -ezSATCommand::ezSATCommand(const std::string &cmd) : command(cmd) {} +ezCmdLineSAT::ezCmdLineSAT(const std::string &cmd) : command(cmd) {} -ezSATCommand::~ezSATCommand() {} +ezCmdLineSAT::~ezCmdLineSAT() {} -bool ezSATCommand::solver(const std::vector &modelExpressions, std::vector &modelValues, const std::vector &assumptions) +bool ezCmdLineSAT::solver(const std::vector &modelExpressions, std::vector &modelValues, const std::vector &assumptions) { const std::string tempdir_name = Yosys::make_temp_dir(Yosys::get_base_tmpdir() + "/yosys-sat-XXXXXX"); const std::string cnf_filename = Yosys::stringf("%s/problem.cnf", tempdir_name.c_str()); @@ -81,4 +81,4 @@ bool ezSATCommand::solver(const std::vector &modelExpressions, std::vector< modelValues[i] = (values.at(idx - 1) == refvalue); } return true; -} \ No newline at end of file +} diff --git a/libs/ezsat/ezcommand.h b/libs/ezsat/ezcmdlinesat.h similarity index 92% rename from libs/ezsat/ezcommand.h rename to libs/ezsat/ezcmdlinesat.h index a0e3de4ed59..0b01a4f93c4 100644 --- a/libs/ezsat/ezcommand.h +++ b/libs/ezsat/ezcmdlinesat.h @@ -22,14 +22,14 @@ #include "ezsat.h" -class ezSATCommand : public ezSAT +class ezCmdLineSAT : public ezSAT { private: std::string command; public: - ezSATCommand(const std::string &cmd); - virtual ~ezSATCommand(); + ezCmdLineSAT(const std::string &cmd); + virtual ~ezCmdLineSAT(); bool solver(const std::vector &modelExpressions, std::vector &modelValues, const std::vector &assumptions) override; };