From: Hamed <hamed.gorjiara@gmail.com>
Date: Tue, 22 Aug 2017 10:48:14 +0000 (-0700)
Subject: After merging with master branch ...
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=61a67ff71f36ea0f87ff69d1d43a27a5960eca26;p=satune.git

After merging with master branch ...
---

61a67ff71f36ea0f87ff69d1d43a27a5960eca26
diff --cc src/Encoders/orderencoder.c
index 3c840e7,00c6468..99f826b
--- a/src/Encoders/orderencoder.c
+++ b/src/Encoders/orderencoder.c
@@@ -391,12 -379,16 +380,18 @@@ void decomposeOrder(CSolver *This, Orde
  			addOrderConstraint(neworder, orderconstraint);
  		}
  	}
- 	for(uint i=0; i<getSizeVectorOrder(&ordervec); i++){
- 		Order* order = getVectorOrder(&ordervec, i);
- 		if(order!=NULL)
+ 
+ 	uint pcvsize=getSizeVectorOrder(&partialcandidatevec);
+ 	for(uint i=0;i<pcvsize;i++) {
+ 		Order * neworder=getVectorOrder(&partialcandidatevec, i);
 -		if (neworder != NULL)
++		if (neworder != NULL){
+ 			neworder->type = TOTAL;
 +			model_print("i=%u\t", i);
++		}
  	}
+ 	
  	deleteVectorArrayOrder(&ordervec);
+ 	deleteVectorArrayOrder(&partialcandidatevec);
  }
  
  void orderAnalysis(CSolver *This) {