}
void IntegerEncodingTransform::doTransform() {
- if(solver->isUnSAT()){
+ if (solver->isUnSAT()) {
return;
}
HashsetOrder *orders = solver->getActiveOrders()->copy();
SetIteratorOrder *orderit = orders->iterator();
while (orderit->hasNext()) {
Order *order = orderit->next();
- if (GETVARTUNABLE(solver->getTuner(), order->type, ORDERINTEGERENCODING, &offon))
+ if (order->type == SATC_PARTIAL)
+ continue;
+ if (GETVARTUNABLE(solver->getTuner(), order->set->type, ORDERINTEGERENCODING, &offon))
integerEncode(order);
}
delete orders;
void IntegerEncodingTransform::integerEncode(Order *currOrder) {
IntegerEncodingRecord *encodingRecord = new IntegerEncodingRecord(
- solver->createRangeSet(currOrder->set->getType(), 0, (uint64_t) currOrder->set->getSize() - 1));
+ solver->createRangeSet(currOrder->set->getType(), 0, (uint64_t) currOrder->getNumUsed() - 1));
currOrder->setOrderEncodingType( INTEGERENCODING );
- uint size = currOrder->constraints.getSize();
+
+ Vector<BooleanOrder *> *constraints = currOrder->getConstraints();
+ uint size = constraints->getSize();
for (uint i = 0; i < size; i++) {
- orderIntegerEncodingSATEncoder(currOrder->constraints.get(i), encodingRecord);
+ orderIntegerEncodingSATEncoder(constraints->get(i), encodingRecord);
}
currOrder->setOrderResolver(new IntegerEncOrderResolver(solver, encodingRecord));
solver->getActiveOrders()->remove(currOrder);