Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v90-bugfix'
Browse files Browse the repository at this point in the history
  • Loading branch information
@scip-ci
scip-ci committed Feb 6, 2024
2 parents a3cf34c + 6be2f7e commit daef1ae
Show file tree
Hide file tree
Showing 1,432 changed files with 1,514 additions and 1,460 deletions.
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB)
Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB)

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#* This file is part of the program and library *#
#* SCIP --- Solving Constraint Integer Programs *#
#* *#
#* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) *#
#* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) *#
#* *#
#* Licensed under the Apache License, Version 2.0 (the "License"); *#
#* you may not use this file except in compliance with the License. *#
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#* This file is part of the program and library *
#* SCIP --- Solving Constraint Integer Programs *
#* *
#* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) *
#* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) *
#* *
#* Licensed under the Apache License, Version 2.0 (the "License"); *
#* you may not use this file except in compliance with the License. *
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/doc/xternal_coloring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/branch_coloring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/branch_coloring.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/branch_strongcoloring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/branch_strongcoloring.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/coloringplugins.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/coloringplugins.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/cons_storeGraph.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/cons_storeGraph.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/heur_init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/heur_init.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/pricer_coloring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/pricer_coloring.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/probdata_coloring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/probdata_coloring.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/reader_col.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/reader_col.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/reader_csol.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/Coloring/src/reader_csol.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/CycleClustering/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#* This file is part of the program and library *
#* SCIP --- Solving Constraint Integer Programs *
#* *
#* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) *
#* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) *
#* *
#* Licensed under the Apache License, Version 2.0 (the "License"); *
#* you may not use this file except in compliance with the License. *
Expand Down
4 changes: 2 additions & 2 deletions applications/CycleClustering/doc/footer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ul>
$navpath
<li class="footer">
&copy; 2002-2023 by Zuse Institute Berlin (ZIB), <a href="http://www.zib.de/impressum_datenschutz">Imprint</a>
&copy; 2002-2024 by Zuse Institute Berlin (ZIB), <a href="http://www.zib.de/impressum_datenschutz">Imprint</a>
</li>
<li class="footer">$generatedby
<a href="http://www.doxygen.org/index.html">
Expand All @@ -18,7 +18,7 @@
<table width="100%">
<tr>
<td align="left" class="footer">
&copy; 2002-2023 by Zuse Institute Berlin (ZIB), <a href="http://www.zib.de/impressum_datenschutz">Imprint</a>
&copy; 2002-2024 by Zuse Institute Berlin (ZIB), <a href="http://www.zib.de/impressum_datenschutz">Imprint</a>
</td>
<td align="right" class="footer">
Generated on $date for $projectname by <a href="http://www.doxygen.org/index.html">doxygen</a> ($doxygenversion)
Expand Down
2 changes: 1 addition & 1 deletion applications/CycleClustering/doc/xternal_cycleclustering.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/CycleClustering/src/branch_multinode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/CycleClustering/src/branch_multinode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/CycleClustering/src/cycplugins.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/CycleClustering/src/cycplugins.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
2 changes: 1 addition & 1 deletion applications/CycleClustering/src/event_newsol.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* This file is part of the program and library */
/* SCIP --- Solving Constraint Integer Programs */
/* */
/* Copyright (c) 2002-2023 Zuse Institute Berlin (ZIB) */
/* Copyright (c) 2002-2024 Zuse Institute Berlin (ZIB) */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down
Loading

0 comments on commit daef1ae

Please sign in to comment.