X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=src%2Fcsolver.cc;h=c81e2f3e1c1941789dc0259467dc1f206881193e;hb=dbe12973cd2236f5e76a70c24f68a05aeb3660c5;hp=3c8fffa510f16b01b6be889703e84ea83a5b7972;hpb=ab88f3e4fab3b0823ff6c6bc908921af554e4155;p=satune.git

diff --git a/src/csolver.cc b/src/csolver.cc
index 3c8fffa..c81e2f3 100644
--- 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() {