From: bdemsky <bdemsky@uci.edu>
Date: Tue, 23 Oct 2018 02:44:44 +0000 (-0700)
Subject: merge
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dbe7026b532cfa05d36c4c0585d51e2bad7e03ff;p=satune.git

merge
---

dbe7026b532cfa05d36c4c0585d51e2bad7e03ff
diff --cc src/Backend/satelemencoder.cc
index 00eadc8,c586caa..3391e1d
--- a/src/Backend/satelemencoder.cc
+++ b/src/Backend/satelemencoder.cc
@@@ -227,7 -227,8 +227,8 @@@ void SATEncoder::generateBinaryIndexEnc
  	if (encoding->element->anyValue) {
  		uint setSize = encoding->element->getRange()->getSize();
  		int maxIndex = getMaximumUsedIndex(encoding);
- 		if (maxIndex != -1 && (maxIndex - setSize) != 0 && (setSize / (maxIndex - setSize)) <  pow(1.9, (uint)solver->getTuner()->getTunable(MUSTVALUE, &mustValueBinaryIndex) - 4)) {
+ //		model_print("maxIndex=%d\tsetSize=%u\tmetric=%f\n", maxIndex, setSize, (maxIndex - setSize) == 0? -1.0 : (setSize*1.0/(maxIndex-setSize)) );
 -		if (maxIndex !=-1 && (maxIndex - setSize) != 0 && (setSize*1.0/(maxIndex-setSize)) <  pow(1.9, (uint)solver->getTuner()->getTunable(MUSTVALUE, &mustValueBinaryIndex) - 4)) {
++		if (maxIndex != -1 && (maxIndex - setSize) != 0 && (setSize * 1.0 / (maxIndex - setSize)) <  pow(1.9, (uint)solver->getTuner()->getTunable(MUSTVALUE, &mustValueBinaryIndex) - 4)) {
  			generateAnyValueBinaryIndexEncodingPositive(encoding);
  		} else {
  			generateAnyValueBinaryIndexEncoding(encoding);