Skip to content

Commit

Permalink
Changing copyright year ranges
Browse files Browse the repository at this point in the history
  • Loading branch information
marekpiotrow committed May 26, 2024
1 parent e1d108a commit 1098632
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CadicalWrap.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*************************************************************************************[PbSolver.cc]
UWrMaxSat based on KP-MiniSat+ -- Copyright (c) 2019-2020 Marek Piotrów
UWrMaxSat based on KP-MiniSat+ -- Copyright (c) 2019-2024 Marek Piotrów
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
associated documentation files (the "Software"), to deal in the Software without restriction,
Expand Down
2 changes: 1 addition & 1 deletion Main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Minisat+ -- Copyright (c) 2005-2010, Niklas Een, Niklas Sorensson
KP-MiniSat+ based on MiniSat+ -- Copyright (c) 2018-2020 Michał Karpiński, Marek Piotrów
UWrMaxSat based on KP-MiniSat+ -- Copyright (c) 2019-2021 Marek Piotrów
UWrMaxSat based on KP-MiniSat+ -- Copyright (c) 2019-2024 Marek Piotrów
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
associated documentation files (the "Software"), to deal in the Software without restriction,
Expand Down
4 changes: 2 additions & 2 deletions Main_utils.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Minisat+ -- Copyright (c) 2005-2010, Niklas Een, Niklas Sorensson
KP-MiniSat+ based on MiniSat+ -- Copyright (c) 2018-2020 Michał Karpiński, Marek Piotrów
UWrMaxSat based on KP-MiniSat+ -- Copyright (c) 2019-2021 Marek Piotrów
UWrMaxSat based on KP-MiniSat+ -- Copyright (c) 2019-2024 Marek Piotrów
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
associated documentation files (the "Software"), to deal in the Software without restriction,
Expand Down Expand Up @@ -388,7 +388,7 @@ PbSolver::solve_Command convert(Command cmd) {

static cchar* doc =
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
"UWrMaxSat 1.4 -- University of Wrocław MaxSAT solver by Marek Piotrów (2019-2022)\n"
"UWrMaxSat 1.5 -- University of Wrocław MaxSAT solver by Marek Piotrów (2019-2024)\n"
"and PB solver by Marek Piotrów and Michał Karpiński (2018) -- an extension of\n"
"MiniSat+ 1.1, based on MiniSat 2.2.0 -- (C) Niklas Een, Niklas Sorensson (2012)\n"
"with COMiniSatPS by Chanseok Oh (2016) as the SAT solver\n"
Expand Down
23 changes: 23 additions & 0 deletions Main_utils.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
/*****************************************************************************************[Main.cc]
UWrMaxSat based on KP-MiniSat+ -- Copyright (c) 2019-2024 Marek Piotrów
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
associated documentation files (the "Software"), to deal in the Software without restriction,
including without limitation the rights to use, copy, modify, merge, publish, distribute,
sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or
substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************************************/

#ifndef MAIN_UTILS_H
#define MAIN_UTILS_H

extern bool opt_model_out;
extern bool opt_bin_model_out;
Expand Down Expand Up @@ -36,3 +58,4 @@ PbSolver::solve_Command convert(Command cmd);
void parseOptions(int argc, char** argv);
void setOptions(int argc, char** argv, bool check_files = true);

#endif
2 changes: 1 addition & 1 deletion MsSolver.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/***************************************************************************************[MsSolver.cc]
Copyright (c) 2018-2021, Marek Piotrów
Copyright (c) 2018-2024, Marek Piotrów
Based on PbSolver.cc ( Copyright (c) 2005-2010, Niklas Een, Niklas Sorensson)
Expand Down
2 changes: 1 addition & 1 deletion MsSolver.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**************************************************************************************[MsSolver.h ]
Copyright (c) 2018-2019, Marek Piotrów
Copyright (c) 2018-2024, Marek Piotrów
Based on PbSolver.h ( Copyright (c) 2005-2010, Niklas Een, Niklas Sorensson)
Expand Down
2 changes: 1 addition & 1 deletion PbSolver.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Copyright (c) 2005-2010, Niklas Een, Niklas Sorensson
KP-MiniSat+ based on MiniSat+ -- Copyright (c) 2018-2020 Michał Karpiński, Marek Piotrów
UWrMaxSat based on KP-MiniSat+ -- Copyright (c) 2019-2020 Marek Piotrów
UWrMaxSat based on KP-MiniSat+ -- Copyright (c) 2019-2024 Marek Piotrów
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
associated documentation files (the "Software"), to deal in the Software without restriction,
Expand Down
2 changes: 1 addition & 1 deletion PbSolver.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Copyright (c) 2005-2010, Niklas Een, Niklas Sorensson
KP-MiniSat+ based on MiniSat+ -- Copyright (c) 2018-2020 Michał Karpiński, Marek Piotrów
UWrMaxSat based on KP-MiniSat+ -- Copyright (c) 2019-2020 Marek Piotrów
UWrMaxSat based on KP-MiniSat+ -- Copyright (c) 2019-2024 Marek Piotrów
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
associated documentation files (the "Software"), to deal in the Software without restriction,
Expand Down
2 changes: 1 addition & 1 deletion SatSolver.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*************************************************************************************[PbSolver.cc]
KP-MiniSat+ based on MiniSat+ -- Copyright (c) 2018-2020 Michał Karpiński, Marek Piotrów
UWrMaxSat based on KP-MiniSat+ -- Copyright (c) 2019-2020 Marek Piotrów
UWrMaxSat based on KP-MiniSat+ -- Copyright (c) 2019-2024 Marek Piotrów
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
associated documentation files (the "Software"), to deal in the Software without restriction,
Expand Down
2 changes: 1 addition & 1 deletion SatSolver.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*************************************************************************************[PbSolver.cc]
KP-MiniSat+ based on MiniSat+ -- Copyright (c) 2018-2020 Michał Karpiński, Marek Piotrów
UWrMaxSat based on KP-MiniSat+ -- Copyright (c) 2019-2020 Marek Piotrów
UWrMaxSat based on KP-MiniSat+ -- Copyright (c) 2019-2024 Marek Piotrów
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
associated documentation files (the "Software"), to deal in the Software without restriction,
Expand Down
2 changes: 1 addition & 1 deletion ScipSolver.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**************************************************************************************[MsSolver.cc]
Copyright (c) 2021, Marek Piotrów
Copyright (c) 2021-2024, Marek Piotrów
Based on an extension of UWrMaxSat done by Dongxu Wang (2021) that added SCIP solver to the project.
Expand Down

0 comments on commit 1098632

Please sign in to comment.