Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
gchabert committed Oct 22, 2020
2 parents 25ec0ed + e520b20 commit 55d50dd
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/bin/ibexsolve.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ int main(int argc, char** argv) {
}

if (forced_params) {
if (!quiet)
cout << " forced params:\t";
SymbolMap<const ExprSymbol*> symbols;
for (int i=0; i<sys.args.size(); i++)
symbols.insert_new(sys.args[i].name, &sys.args[i]);
Expand All @@ -205,8 +207,11 @@ int main(int argc, char** argv) {
} else {
params.push_back(&parse_indexed_symbol(symbols,vars));
}
if (!quiet) cout << *params.back() << ' ';
} while (j!=-1);

if (!quiet) cout << endl;

if (!params.empty()) {
s.set_params(VarSet(sys.f_ctrs,params,false)); //Array<const ExprNode>(params)));
for (vector<const ExprNode*>::iterator it=params.begin(); it!=params.end(); it++) {
Expand Down

0 comments on commit 55d50dd

Please sign in to comment.