From bd0072e146a4ca2acc509af59f745dca7a69ef1d Mon Sep 17 00:00:00 2001 From: Tianyi Liang Date: Tue, 11 Feb 2014 17:10:06 -0600 Subject: [PATCH] resolve merge conflicts --- src/theory/strings/theory_strings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/theory/strings/theory_strings.cpp b/src/theory/strings/theory_strings.cpp index 43132b324..e75f1f34e 100644 --- a/src/theory/strings/theory_strings.cpp +++ b/src/theory/strings/theory_strings.cpp @@ -2051,7 +2051,7 @@ bool TheoryStrings::checkCardinality() { Node lr = lts[i]; Trace("strings-card") << "Number of strings with length equal to " << lr << " is " << cols[i].size() << std::endl; // size > c^k - double k = cols[i].size() < cardinality? 0.0 : ( std::log( cols[i].size() ) / log((double) cardinality) ); + double k = (int)cols[i].size() < cardinality ? 0.0 : (std::log((double) cols[i].size() ) / log((double) cardinality)); unsigned int int_k = (unsigned int) k; //double c_k = pow ( (double)cardinality, (double)lr ); if( cols[i].size() > 1 ) { -- 2.30.2