Skip to content

Fix file redirection in Maraboupy #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vbCrLf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix file redirection in Maraboupy #331

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions maraboupy/MarabouCore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,10 @@ std::pair<std::map<int, double>, Statistics> solve(InputQuery &inputQuery, Marab
Engine engine;
engine.setVerbosity(verbosity);

if(!engine.processInputQuery(inputQuery)) return std::make_pair(ret, *(engine.getStatistics()));
if(!engine.processInputQuery(inputQuery)) {
retStats = *(engine.getStatistics());
goto cleanup;
}
if ( dnc )
{
unsigned initialDivides = options._initialDivides;
Expand All @@ -177,14 +180,17 @@ std::pair<std::map<int, double>, Statistics> solve(InputQuery &inputQuery, Marab
{
retStats = Statistics();
retStats.timeout();
return std::make_pair( ret, retStats );
}
default:
return std::make_pair( ret, Statistics() ); // TODO: meaningful DnCStatistics
retStats = Statistics(); // TODO: meaningful DnCStatistics
goto cleanup;
}
} else
{
if(!engine.solve(timeoutInSeconds)) return std::make_pair(ret, *(engine.getStatistics()));
if(!engine.solve(timeoutInSeconds)) {
retStats = *(engine.getStatistics());
goto cleanup;
}

if (engine.getExitCode() == Engine::SAT)
engine.extractSolution(inputQuery);
Expand All @@ -195,10 +201,11 @@ std::pair<std::map<int, double>, Statistics> solve(InputQuery &inputQuery, Marab
}
catch(const MarabouError &e){
printf( "Caught a MarabouError. Code: %u. Message: %s\n", e.getCode(), e.getUserMessage() );
return std::make_pair(ret, retStats);
goto cleanup;
}
if(output != -1)
restoreOutputStream(output);

cleanup:
if(output != -1) restoreOutputStream(output);
return std::make_pair(ret, retStats);
}

Expand Down