cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bounds.

Browse Source
This commit is contained in:
chriseth 2022-04-01 19:17:16 +02:00
parent 2ef255bdab
commit 5e904872bd
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libsolutil/LP.cpp
View File

@ -605,6 +605,12 @@ SimplexWithBounds::SimplexWithBounds(SolvingState _state):
{ {
size_t varsNeeded = m_state.constraints.size(); size_t varsNeeded = m_state.constraints.size();
size_t row = 0; size_t row = 0;
// TODO the new method does not need zero as lower-bound on all variables,
// but we currently assume that in the BooleanLP at some places.
for (auto& bounds: m_state.bounds)
if (!bounds.lower)
bounds.lower = rational{0};
for (Constraint& c: m_state.constraints) for (Constraint& c: m_state.constraints)
{ {
c.data.resize(m_state.variableNames.size() + varsNeeded); c.data.resize(m_state.variableNames.size() + varsNeeded);
@ -613,13 +619,10 @@ SimplexWithBounds::SimplexWithBounds(SolvingState _state):
solAssert(m_state.variableNames.size() == m_state.bounds.size()); solAssert(m_state.variableNames.size() == m_state.bounds.size());
// TODO name needed unique? // TODO name needed unique?
m_state.variableNames.emplace_back("_s" + to_string(newVarIndex)); m_state.variableNames.emplace_back("_s" + to_string(newVarIndex));
// TODO we assume zero as lower bound here, but we do not have to. m_state.bounds.emplace_back();
m_state.bounds.emplace_back(SolvingState::Bounds{ if (c.equality)
{c.equality ? rational{c.data[0]} : rational{0}}, m_state.bounds.back().lower = c.data[0];
{c.data[0]}, m_state.bounds.back().upper = c.data[0];
{},
{}
});
c.equality = true; c.equality = true;
solAssert(c.data.size() > newVarIndex); solAssert(c.data.size() > newVarIndex);
c.data[newVarIndex] = -1; c.data[newVarIndex] = -1;