Skip to content

Commit 9792cc6

Browse files
scip-ciscip-ci
committed
Merge remote-tracking branch 'origin/v10-minor'
2 parents 3564f69 + fbf6547 commit 9792cc6

File tree

8 files changed

+435
-426
lines changed

8 files changed

+435
-426
lines changed

‎CHANGELOG‎

Lines changed: 384 additions & 384 deletions
Large diffs are not rendered by default.

‎check/check_cluster.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,12 @@ do
218218
# find out the solver that should be used
219219
SOLVER=$(stripversion "${BINNAME}")
220220

221+
# xpress executable is called optimizer
222+
if test "${SOLVER}" = "optimizer"
223+
then
224+
SOLVER="xpress"
225+
fi
226+
221227
CONFFILE="configuration_tmpfile_setup_${SOLVER}.sh"
222228

223229
# call tmp file configuration for the solver

‎check/configuration_tmpfile_setup_cbc.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ VISUALIZE="${18}" # - true, if the branch-and-bound search should be visualiz
4949
SOLUFILE="${19}" # - solu file, only necessary if "${SETCUTOFF}" is 1
5050
EMPHBENCHMARK="${20}" # - use set emphasis benchmark
5151
CLOCKTYPE="${21}" # - clocktype (1 = CPU, 2 = wallclock) - currently ignored by CBC
52+
WITHCERTIFICATE="${22}" # - true, if a certificate file should be created - currently ignored by CBC
5253

5354
# new environment variables after running this script
5455
# -None
@@ -58,31 +59,31 @@ SOLFILE="${CLIENTTMPDIR}/${USER}-tmpdir/${SOLBASENAME}.sol"
5859

5960
if test "${p}" -gt 0
6061
then
61-
echo "Warning: CBC configuration currently cannot handle instance permutation"
62+
echo "Error: CBC configuration currently cannot handle instance permutation"
6263
exit 1
6364
fi
6465

6566
if test "${SETNAME}" != "default"
6667
then
67-
echo "Warning: CBC configuration currently cannot handle non-default settings"
68+
echo "Error: CBC configuration currently cannot handle non-default settings"
6869
exit 1
6970
fi
7071

7172
if test "${REOPT}" = true
7273
then
73-
echo "Warning: CBC configuration currently cannot handle reoptimization"
74+
echo "Error: CBC configuration currently cannot handle reoptimization"
7475
exit 1
7576
fi
7677

7778
if test "${VISUALIZE}" = true
7879
then
79-
echo "Warning: CBC configuration currently cannot handle visualization"
80+
echo "Error: CBC configuration currently cannot handle visualization"
8081
exit 1
8182
fi
8283

8384
if test "${SETCUTOFF}" = 1 || test "${SETCUTOFF}" = true
8485
then
85-
echo "Warning: Setting a cutoff is currently not supported for CBC configuration"
86+
echo "Error: Setting a cutoff is currently not supported for CBC configuration"
8687
exit 1
8788
fi
8889

‎check/configuration_tmpfile_setup_cplex.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ VISUALIZE=${18} # - true, if the branch-and-bound search should be visualized
4949
SOLUFILE=${19} # - solu file, only necessary if ${SETCUTOFF} is 1
5050
EMPHBENCHMARK="${20}" # - use set emphasis benchmark
5151
CLOCKTYPE="${21}" # - clocktype (1 = CPU, 2 = wallclock)
52-
52+
WITHCERTIFICATE="${22}" # - true, if a certificate file should be created - currently ignored by CPLEX
5353

5454
#args=("$@")
5555
#for ((i=0; i < $#; i++)) {
@@ -84,29 +84,29 @@ fi
8484
# if permutation counter is positive add permutation seed (0 = default)
8585
if test ${p} -gt 0
8686
then
87-
echo "Warning: CPlex configuration currently cannot handle instance permutation"
87+
echo "Error: CPlex configuration currently cannot handle instance permutation"
8888
exit 1
8989
fi
9090

9191
if test "${REOPT}" = true
9292
then
9393
# exit because reoptimization feature is not supported here
94-
echo "Warning: CPlex configuration currently cannot handle reoptimization"
94+
echo "Error: CPlex configuration currently cannot handle reoptimization"
9595
exit 1
9696
fi
9797

9898
if test "${VISUALIZE}" = true
9999
then
100100
# exit because visualization feature is not supported here
101-
echo "Warning: CPlex configuration currently cannot handle visualization"
101+
echo "Error: CPlex configuration currently cannot handle visualization"
102102
exit 1
103103
fi
104104

105105
# set objective limit: optimal solution value from solu file, if existent
106106
if test "${SETCUTOFF}" = 1 || test "${SETCUTOFF}" = true
107107
then
108108
# TODO setting cutoff requires knowledge about whether the objective sense is minimization or maximization
109-
echo "Warning: Setting a cutoff is currently not supported for Cplex configuration"
109+
echo "Error: Setting a cutoff is currently not supported for Cplex configuration"
110110
exit 1
111111
fi
112112

‎check/configuration_tmpfile_setup_gurobi_cl.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ VISUALIZE="${18}" # - true, if the branch-and-bound search should be visual
4949
SOLUFILE="${19}" # - solu file, only necessary if ${SETCUTOFF} is 1
5050
EMPHBENCHMARK="${20}" # - use set emphasis benchmark
5151
CLOCKTYPE="${21}" # - clocktype (1 = CPU, 2 = wallclock) - currently ignored by Gurobi
52+
WITHCERTIFICATE="${22}" # - true, if a certificate file should be created - currently ignored by Gurobi
5253

5354
# new environment variables after running this script
5455
# -None

‎check/configuration_tmpfile_setup_xpress.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ VISUALIZE="${18}" # - true, if the branch-and-bound search should be visual
4949
SOLUFILE="${19}" # - solu file, only necessary if ${SETCUTOFF} is 1
5050
EMPHBENCHMARK="${20}" # - use set emphasis benchmark
5151
CLOCKTYPE="${21}" # - clocktype (1 = CPU, 2 = wallclock) - currently ignored by XPRESS
52+
WITHCERTIFICATE="${22}" # - true, if a certificate file should be created - currently ignored by XPRESS
5253

5354
# new environment variables after running this script
5455
# -None
@@ -58,31 +59,31 @@ SOLFILE="${CLIENTTMPDIR}/${USER}-tmpdir/${SOLBASENAME}.sol"
5859

5960
if test "${p}" -gt 0
6061
then
61-
echo "Warning: XPRESS configuration currently cannot handle instance permutation"
62+
echo "Error: XPRESS configuration currently cannot handle instance permutation"
6263
exit 1
6364
fi
6465

6566
if test "${SETNAME}" != "default"
6667
then
67-
echo "Warning: XPRESS configuration currently cannot handle non-default settings"
68+
echo "Error: XPRESS configuration currently cannot handle non-default settings"
6869
exit 1
6970
fi
7071

7172
if test "${REOPT}" = true
7273
then
73-
echo "Warning: XPRESS configuration currently cannot handle reoptimization"
74+
echo "Error: XPRESS configuration currently cannot handle reoptimization"
7475
exit 1
7576
fi
7677

7778
if test "${VISUALIZE}" = true
7879
then
79-
echo "Warning: XPRESS configuration currently cannot handle visualization"
80+
echo "Error: XPRESS configuration currently cannot handle visualization"
8081
exit 1
8182
fi
8283

8384
if test "${SETCUTOFF}" = 1 || test "${SETCUTOFF}" = true
8485
then
85-
echo "Warning: Setting a cutoff is currently not supported for XPRESS configuration"
86+
echo "Error: Setting a cutoff is currently not supported for XPRESS configuration"
8687
exit 1
8788
fi
8889

‎doc/inc/faq/faqtext.txt‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -422,52 +422,52 @@ SECTION: General Questions about SCIP
422422
ANSWER:
423423
<p>
424424
There are two main ways to analyse infeasible instances using SCIP:
425-
<\p>
425+
</p>
426426
<p>
427427
Firstly, there is IIS (irreducible infeasible subsystem) functionality in SCIP.
428-
This can be called from the command line using `iis` or from the C API using `SCIPgenerateIIS(scip)`.
429-
SCIP will then call its `iisfinders` and find a minimal subset of constraints (variable bounds too,
428+
This can be called from the command line using <code>iis</code> or from the C API using <code>SCIPgenerateIIS()</code>.
429+
SCIP will then call its <code>iisfinders</code> and find a minimal subset of constraints (variable bounds too,
430430
depending on the settings) that still results in an infeasible instance. There is no guarantee that
431431
the returned reduced instance is the smallest possible infeasible subsystem for the whole instance,
432432
but there is a guarantee that it contains no smaller infeasible subsystem, i.e., is irreducible.
433433
This functionality helps with identifying a small portion of constraints / variable bounds
434434
that together result in an infeasible problem.
435-
After computing the IIS, it can be printed via the command line using `display/iis` or `write/iis`.
436-
<\p>
435+
After computing the IIS, it can be printed via the command line using <code>display/iis</code> or <code>write/iis</code>.
436+
</p>
437437
<p>
438438
Secondly, there is MinUC (minimize number of unsatisfied constraints) functionality in SCIP.
439-
This can be called from the command line using `change/minuc`.
439+
This can be called from the command line using <code>change/minuc</code>.
440440
SCIP will then alter the current problem into a new problem.
441-
One can then simply call `optimize` and solve the altered problem, which now minimizes the number
441+
One can then simply call <code>optimize</code> and solve the altered problem, which now minimizes the number
442442
of unsatisfied constraints.
443443
In other words, SCIP will find a solution that marks a minimum number of constraints,
444444
such that if those constraints were relaxed, the original problem would be feasible.
445-
One can view this by printing the solution, where `originalconsname_master` has value 1
445+
One can view this by printing the solution, where <code>originalconsname_master</code> has value 1
446446
if the constraint is part of the MinUC.
447-
<\p>
447+
</p>
448448

449449
QUESTION: How do I use SCIP in order to solve MIPs numerically exactly and certify the result?
450450
LABEL:exactsolving
451451
ANSWER:
452452
<p>
453-
In the interactive shell the exact solving mode must be enabled by typing `set exact enable TRUE` before reading
453+
In the interactive shell the exact solving mode must be enabled by typing <code>set exact enable TRUE</code> before reading
454454
the problem instance. Optionally, a certificate file can be printed by specifying its filename via
455-
`set certificate filename [yourfilename.vipr]`.
455+
<code>set certificate filename [yourfilename.vipr]</code>.
456456
The resulting certificate can be checked with the proof checker <a href="https://github.com/scipopt/vipr">VIPR</a>
457-
or a formally verified version in <a href="https://cakeml.org/checkers.html>CakeML</a>.
458-
<\p>
457+
or a formally verified version in <a href="https://cakeml.org/checkers.html">CakeML</a>.
458+
</p>
459459
<p>
460460
In SCIP 10, this certificate only certifies the correctness of the branch-and-bound process after presolving, so
461-
you may want to disable presolving by typing `set presolving emphasis off` in order to obtain a certificate for
461+
you may want to disable presolving by typing <code>set presolving emphasis off</code> in order to obtain a certificate for
462462
the original problem instance. (Note that this may or may not slow down the solving process.)
463463
Note that, in any case, certificate files are incomplete if cutting plane separation is enabled (as by default).
464-
In this case, the certificate needs to be completed using the `viprcomp` script prior to verification.
465-
<\p>
464+
In this case, the certificate needs to be completed using the <code>viprcomp</code> script prior to verification.
465+
</p>
466466
<p>
467-
If you access SCIP via the API, the exact solving mode is enabled by setting the parameter `exact/enable = TRUE`
468-
or calling the API function `SCIPenableExactSolving()`, again <b>before</b> reading a problem instance.
467+
If you access SCIP via the API, the exact solving mode is enabled by setting the parameter <code>exact/enable = TRUE</code>
468+
or calling the API function <code>SCIPenableExactSolving()</code>, again <b>before</b> reading a problem instance.
469469
For further details please see the dedicated section of the release report of SCIP 10.
470-
<\p>
470+
</p>
471471

472472

473473
SECTION: Using SCIP as a standalone solver

‎make/local/make.targets‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ testcplex:
2020
cd check; \
2121
$(SHELL) ./check.sh $(TEST) $(CPLEX) $(SETTINGS) $(notdir $(CPLEX)).$(OSTYPE).$(ARCH) $(OUTPUTDIR) $(TIME) $(NODES) $(MEM) $(THREADS) $(FEASTOL) $(DISPFREQ) \
2222
$(CONTINUE) $(LOCK) $(VERSION) $(LPS) $(DEBUGTOOL) $(CLIENTTMPDIR) $(REOPT) $(OPTCOMMAND) $(SETCUTOFF) $(MAXJOBS) $(VISUALIZE) $(PERMUTE) \
23-
$(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(EMPHBENCHMARK) $(CLOCKTYPE);
23+
$(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(EMPHBENCHMARK) $(CLOCKTYPE) $(WITHCERTIFICATE);
2424

2525
.PHONY: testxpress
2626
testxpress:
2727
cd check; \
2828
$(SHELL) ./check.sh $(TEST) $(XPRESS_BIN) $(SETTINGS) $(notdir $(XPRESS_BIN)).$(OSTYPE).$(ARCH) $(OUTPUTDIR) $(TIME) $(NODES) $(MEM) $(THREADS) $(FEASTOL) $(DISPFREQ) \
2929
$(CONTINUE) $(LOCK) $(VERSION) $(LPS) $(DEBUGTOOL) $(CLIENTTMPDIR) $(REOPT) $(OPTCOMMAND) $(SETCUTOFF) $(MAXJOBS) $(VISUALIZE) $(PERMUTE) \
30-
$(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(EMPHBENCHMARK) $(CLOCKTYPE);
30+
$(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(EMPHBENCHMARK) $(CLOCKTYPE) $(WITHCERTIFICATE);
3131

3232
.PHONY: testmosek
3333
testmosek:
@@ -39,14 +39,14 @@ testcbc:
3939
cd check; \
4040
$(SHELL) ./check.sh $(TEST) $(CBC) $(SETTINGS) $(notdir $(CBC)).$(OSTYPE).$(ARCH) $(OUTPUTDIR) $(TIME) $(NODES) $(MEM) $(THREADS) $(FEASTOL) $(DISPFREQ) \
4141
$(CONTINUE) $(LOCK) $(VERSION) $(LPS) $(DEBUGTOOL) $(CLIENTTMPDIR) $(REOPT) $(OPTCOMMAND) $(SETCUTOFF) $(MAXJOBS) $(VISUALIZE) $(PERMUTE) \
42-
$(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(EMPHBENCHMARK) $(CLOCKTYPE);
42+
$(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(EMPHBENCHMARK) $(CLOCKTYPE) $(WITHCERTIFICATE);
4343

4444
.PHONY: testgurobi
4545
testgurobi:
4646
cd check; \
4747
$(SHELL) ./check.sh $(TEST) $(GUROBI) $(SETTINGS) $(notdir $(GUROBI)).$(OSTYPE).$(ARCH) $(OUTPUTDIR) $(TIME) $(NODES) $(MEM) $(THREADS) $(FEASTOL) $(DISPFREQ) \
4848
$(CONTINUE) $(LOCK) $(VERSION) $(LPS) $(DEBUGTOOL) $(CLIENTTMPDIR) $(REOPT) $(OPTCOMMAND) $(SETCUTOFF) $(MAXJOBS) $(VISUALIZE) $(PERMUTE) \
49-
$(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(EMPHBENCHMARK) $(CLOCKTYPE);
49+
$(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(EMPHBENCHMARK) $(CLOCKTYPE) $(WITHCERTIFICATE);
5050

5151
.PHONY: testglpk
5252
testglpk:
@@ -93,7 +93,7 @@ testclustercpx: check/check_cluster.sh check/configuration_cluster.sh check/conf
9393
$(QUEUETYPE) $(QUEUE) $(PPN) $(CLIENTTMPDIR) $(NOWAITCLUSTER) $(EXCLUSIVE) \
9494
$(PERMUTE) $(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(DEBUGTOOL) false $(OPTCOMMAND) \
9595
$(SETCUTOFF) $(VISUALIZE) $(CLUSTERNODES) $(EXCLUDENODES) $(SLURMACCOUNT) $(PYTHON) \
96-
$(EMPHBENCHMARK) $(CLOCKTYPE);
96+
$(EMPHBENCHMARK) $(CLOCKTYPE) $(WITHCERTIFICATE);
9797

9898
.PHONY: testclusterxpress
9999
testclusterxpress: check/check_cluster.sh check/configuration_cluster.sh check/configuration_set.sh check/configuration_logfiles.sh check/configuration_tmpfile_setup_xpress.sh check/evalcheck_cluster.sh check/check_xpress.awk check/run.sh
@@ -103,7 +103,7 @@ testclusterxpress: check/check_cluster.sh check/configuration_cluster.sh check/c
103103
$(QUEUETYPE) $(QUEUE) $(PPN) $(CLIENTTMPDIR) $(NOWAITCLUSTER) $(EXCLUSIVE) \
104104
$(PERMUTE) $(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(DEBUGTOOL) false $(OPTCOMMAND) \
105105
$(SETCUTOFF) $(VISUALIZE) $(CLUSTERNODES) $(EXCLUDENODES) $(SLURMACCOUNT) $(PYTHON) \
106-
$(EMPHBENCHMARK) $(CLOCKTYPE);
106+
$(EMPHBENCHMARK) $(CLOCKTYPE) $(WITHCERTIFICATE);
107107

108108
.PHONY: testclustercbc
109109
testclustercbc:
@@ -113,7 +113,7 @@ testclustercbc:
113113
$(QUEUETYPE) $(QUEUE) $(PPN) $(CLIENTTMPDIR) $(NOWAITCLUSTER) $(EXCLUSIVE) \
114114
$(PERMUTE) $(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(DEBUGTOOL) false $(OPTCOMMAND) \
115115
$(SETCUTOFF) $(VISUALIZE) $(CLUSTERNODES) $(EXCLUDENODES) $(SLURMACCOUNT) $(PYTHON) \
116-
$(EMPHBENCHMARK) $(CLOCKTYPE);
116+
$(EMPHBENCHMARK) $(CLOCKTYPE) $(WITHCERTIFICATE);
117117

118118
.PHONY: testclustergurobi
119119
testclustergurobi:
@@ -123,7 +123,7 @@ testclustergurobi:
123123
$(QUEUETYPE) $(QUEUE) $(PPN) $(CLIENTTMPDIR) $(NOWAITCLUSTER) $(EXCLUSIVE) \
124124
$(PERMUTE) $(SEEDS) $(GLBSEEDSHIFT) $(STARTPERM) $(DEBUGTOOL) false $(OPTCOMMAND) \
125125
$(SETCUTOFF) $(VISUALIZE) $(CLUSTERNODES) $(EXCLUDENODES) $(SLURMACCOUNT) $(PYTHON) \
126-
$(EMPHBENCHMARK) $(CLOCKTYPE);
126+
$(EMPHBENCHMARK) $(CLOCKTYPE) $(WITHCERTIFICATE);
127127

128128
# solvers with a specialized interface:
129129

0 commit comments

Comments
 (0)