Resolving conflicts after merging with altgen
authorHamed Gorjiara <hgorjiar@uci.edu>
Tue, 23 Jan 2018 21:11:18 +0000 (13:11 -0800)
committerHamed Gorjiara <hgorjiar@uci.edu>
Tue, 23 Jan 2018 21:11:18 +0000 (13:11 -0800)
1  2 
src/Backend/satfunctableencoder.cc

index b226cc17e4cf359ed9ef2d20232bd536a608317f,ea77e990f0f33f2290ae5a8afcb7e28c60cf1670..07cfe88bd93e5672c94a729f86e88d2111edd00a
@@@ -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