From: Hamed Gorjiara <hgorjiar@uci.edu>
Date: Tue, 23 Jan 2018 21:11:18 +0000 (-0800)
Subject: Resolving conflicts after merging with altgen
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=commitdiff_plain;h=e80028bf761f04dd410b45d1dadc0b8b5fd5817e

Resolving conflicts after merging with altgen
---

e80028bf761f04dd410b45d1dadc0b8b5fd5817e
diff --cc src/Backend/satfunctableencoder.cc
index b226cc1,ea77e99..07cfe88
--- a/src/Backend/satfunctableencoder.cc
+++ b/src/Backend/satfunctableencoder.cc
@@@ -89,7 -93,10 +93,11 @@@ Edge SATEncoder::encodeEnumTablePredica
  	}
  	bool generateNegation = constraint->encoding.type == ENUMERATEIMPLICATIONSNEGATE;
  	uint numDomains = predicate->table->numDomains();
+ 
+ 	if (generateNegation)
+ 		polarity = negatePolarity(polarity);
+ 	
 +        ASSERT(numDomains != 0);
  	VectorEdge *clauses = allocDefVectorEdge();
  
  	uint indices[numDomains];	//setup indices