Calling alloy first when deserializing

[satune.git] / src / csolver.cc

diff --git a/src/csolver.cc b/src/csolver.cc
index 3c8fffa510f16b01b6be889703e84ea83a5b7972..c81e2f3e1c1941789dc0259467dc1f206881193e 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -158,9 +158,9 @@ CSolver *CSolver::clone() {
        return copy;
 }
 
-CSolver *CSolver::deserialize(const char *file) {
+CSolver *CSolver::deserialize(const char *file, bool alloy) {
        model_print("deserializing %s ...\n", file);
-       Deserializer deserializer(file);
+       Deserializer deserializer(file, alloy);
        return deserializer.deserialize();
 }
 
@@ -676,7 +676,9 @@ int CSolver::solve() {
 }
 
 void CSolver::setAlloyEncoder(){
-       alloyEncoder = new AlloyEnc(this);
+       if(alloyEncoder == NULL){
+               alloyEncoder = new AlloyEnc(this);
+       }
 }
 
 void CSolver::printConstraints() {