projects
/
satune.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into brian
[satune.git]
/
src
/
csolver.c
diff --git
a/src/csolver.c
b/src/csolver.c
index 68fb39fc3855f4ed3472b677e1daa07a5bca7f2a..d90304431634c30faf0d4fbfad73dd81f6af2743 100644
(file)
--- a/
src/csolver.c
+++ b/
src/csolver.c
@@
-171,12
+171,13
@@
Boolean * orderConstraint(CSolver *solver, Order * order, uint64_t first, uint64
return constraint;
}
return constraint;
}
-void
encode
(CSolver* solver){
+void
startEncoding
(CSolver* solver){
naiveEncodingDecision(solver);
SATEncoder* satEncoder = allocSATEncoder();
naiveEncodingDecision(solver);
SATEncoder* satEncoder = allocSATEncoder();
-// initializeConstraintVars(solver, satEncoder);
encodeAllSATEncoder(solver, satEncoder);
encodeAllSATEncoder(solver, satEncoder);
+ int result= solveCNF(satEncoder->cnf);
+ model_print("sat_solver's result:%d\n", result);
//For now, let's just delete it, and in future for doing queries
//we may need it.
deleteSATEncoder(satEncoder);
//For now, let's just delete it, and in future for doing queries
//we may need it.
deleteSATEncoder(satEncoder);
-}
\ No newline at end of file
+}