Skip to content

Commit

Permalink
review
Browse files Browse the repository at this point in the history
  • Loading branch information
@pet-mit
pet-mit committed Feb 25, 2025
1 parent 816e1e4 commit 4227996
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
8 changes: 4 additions & 4 deletions docs/user-guide/solver/04-parameters.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,16 +487,16 @@ _**This section is under construction**_
- **Expected value:** a string
- **Required:** **no**
- **Default value:** empty
- **Usage:** Set solver-specific parameters for linear problems, for instance `--solver-parameters="THREADS 1 PRESOLVE 1"`
for XPRESS or `--solver-parameters="parallel/maxnthreads 1, lp/presolving TRUE"` for SCIP. Syntax is solver-dependent, and only supported for SCIP & XPRESS.
- **Usage:** Set solver-specific parameters for linear problems, for instance `--linear-solver-parameters="THREADS 1 PRESOLVE 1"`
for XPRESS or `--linear-solver-parameters="parallel/maxnthreads 1, lp/presolving TRUE"` for SCIP. Syntax is solver-dependent, and only supported for SCIP & XPRESS.

---
#### quadratic-solver-parameters
- **Expected value:** a string
- **Required:** **no**
- **Default value:** empty
- **Usage:** Set solver-specific parameters for quadratic problems, for instance `--solver-parameters="THREADS 1 PRESOLVE 1"`
for XPRESS or `--solver-parameters="parallel/maxnthreads 1, lp/presolving TRUE"` for SCIP. Syntax is solver-dependent, and only supported for SCIP & XPRESS.
- **Usage:** Set solver-specific parameters for quadratic problems, for instance `--quadratic-solver-parameters="THREADS 1 PRESOLVE 1"`
for XPRESS or `--quadratic-solver-parameters="parallel/maxnthreads 1, lp/presolving TRUE"` for SCIP. Syntax is solver-dependent, and only supported for SCIP & XPRESS.

---
## Adequacy-patch parameters
Expand Down
20 changes: 10 additions & 10 deletions docs/user-guide/solver/09-command-line.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ hide:

## Optimization

| command | usage |
|:-------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| --optimization-range | Force the [simplex optimization range](04-parameters.md#simplex-range) ('day' or 'week') |
| --no-constraints | Ignore all binding constraints |
| --no-ts-import | Do not import timeseries into the input folder (this option may be useful for running old studies without upgrade) |
| -m, --mps-export | Export anonymous MPS, weekly or daily optimal UC+dispatch linear (MPS will be named if the problem is infeasible) |
| -s, --named-mps-problems | Export named MPS, weekly or daily optimal UC+dispatch linear |
| --solver-logs | Print solver logs |
| --linear-solver-parameters | Set solver-specific parameters for linear problems, for instance `--solver-parameters="THREADS 1 PRESOLVE 1"` for XPRESS or `--solver-parameters="parallel/maxnthreads 1, lp/presolving TRUE"` for SCIP. Syntax is solver-dependent, and only supported for SCIP & XPRESS. |
| --quadratic-solver-parameters | Set solver-specific parameters for quadratic problems. |
| command | usage |
|:-------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| --optimization-range | Force the [simplex optimization range](04-parameters.md#simplex-range) ('day' or 'week') |
| --no-constraints | Ignore all binding constraints |
| --no-ts-import | Do not import timeseries into the input folder (this option may be useful for running old studies without upgrade) |
| -m, --mps-export | Export anonymous MPS, weekly or daily optimal UC+dispatch linear (MPS will be named if the problem is infeasible) |
| -s, --named-mps-problems | Export named MPS, weekly or daily optimal UC+dispatch linear |
| --solver-logs | Print solver logs |
| --linear-solver-parameters | Set solver-specific parameters for linear problems, for instance `--linear-solver-parameters="THREADS 1 PRESOLVE 1"` for XPRESS or `--linear-solver-parameters="parallel/maxnthreads 1, lp/presolving TRUE"` for SCIP. Syntax is solver-dependent, and only supported for SCIP & XPRESS. |
| --quadratic-solver-parameters | Set solver-specific parameters for quadratic problems. |

## Misc.

Expand Down
8 changes: 4 additions & 4 deletions src/solver/misc/options.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ std::unique_ptr<Yuni::GetOpt::Parser> CreateParser(Settings& settings, StudyLoad
"linear-solver-parameters",
"Set linear solver-specific parameters, for instance --linear-solver-parameters=\"THREADS 1 "
"PRESOLVE 1\""
"for XPRESS or --solver-parameters=\"parallel/maxnthreads 1, lp/presolving TRUE\" for SCIP."
"for XPRESS or --linear-solver-parameters=\"parallel/maxnthreads 1, lp/presolving TRUE\" for SCIP."
"Syntax is solver-dependent, and only supported for SCIP & XPRESS.");

//--solver-parameters
//--linear-solver-parameters
parser->add(options.solverOptions.linearSolverParameters,
' ',
"solver-parameters",
Expand All @@ -112,8 +112,8 @@ std::unique_ptr<Yuni::GetOpt::Parser> CreateParser(Settings& settings, StudyLoad
' ',
"quadratic-solver-parameters",
"Set quadratic solver-specific parameters, for instance "
"--quadratic-solver-parameters=\"THREADS 1 PRESOLVE 1\""
"for XPRESS or --solver-parameters=\"parallel/maxnthreads 1, lp/presolving TRUE\" for SCIP."
"--quadratic-solver-parameters=\"THREADS 8\""
"for XPRESS or --quadratic-solver-parameters=\"parallel/maxnthreads 8\" for SCIP."
"Syntax is solver-dependent.");

parser->addParagraph("\nParameters");
Expand Down
2 changes: 1 addition & 1 deletion src/tools/batchrun/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ int main(int argc, const char* argv[])
// Wrap spaces around quotes, if any
// example
// antares-batchrun directory --solver xpress
// --solver-parameters "PRESOLVE 1"
// --linear-solver-parameters "PRESOLVE 1"
cmd << " \"" << arg << "\"";
}
}
Expand Down

0 comments on commit 4227996

Please sign in to comment.