From 635c16386d05a7edc61951101d12cc18f710b729 Mon Sep 17 00:00:00 2001 From: Alinson S Xavier Date: Fri, 21 Feb 2020 11:35:09 -0600 Subject: [PATCH] Update copyright notices --- README.md | 25 ++++++++++++++++++- benchmark/Makefile | 5 ++++ benchmark/benchmark.py | 5 ++++ miplearn/__init__.py | 4 +-- miplearn/benchmark.py | 3 ++- miplearn/components/branching.jl | 5 ++++ miplearn/components/branching.py | 3 ++- miplearn/components/component.py | 3 ++- miplearn/components/tests/test_branching.py | 3 ++- miplearn/components/tests/test_warmstart.py | 3 ++- .../components/tests/test_warmstart_knn.py | 3 ++- .../tests/test_warmstart_logistic.py | 3 ++- miplearn/components/warmstart.py | 3 ++- miplearn/extractors.py | 3 ++- miplearn/instance.py | 3 ++- miplearn/solvers.py | 3 ++- miplearn/tests/test_benchmark.py | 3 ++- miplearn/tests/test_extractors.py | 3 ++- miplearn/tests/test_solver.py | 3 ++- 19 files changed, 69 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index ef6b595..03a1feb 100644 --- a/README.md +++ b/README.md @@ -24,4 +24,27 @@ License ------- MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization - Copyright (C) 2019-2020 Argonne National Laboratory. All rights reserved. + Copyright © 2020, UChicago Argonne, LLC. All Rights Reserved. + + Redistribution and use in source and binary forms, with or without modification, are permitted + provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this list of + conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, this list of + conditions and the following disclaimer in the documentation and/or other materials provided + with the distribution. + 3. Neither the name of the copyright holder nor the names of its contributors may be used to + endorse or promote products derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + diff --git a/benchmark/Makefile b/benchmark/Makefile index e92ee3f..4a232ec 100644 --- a/benchmark/Makefile +++ b/benchmark/Makefile @@ -1,3 +1,8 @@ +# MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. +# Written by Alinson S. Xavier + CHALLENGES := \ stab/ChallengeA \ knapsack/ChallengeA diff --git a/benchmark/benchmark.py b/benchmark/benchmark.py index e7f971a..1537daf 100755 --- a/benchmark/benchmark.py +++ b/benchmark/benchmark.py @@ -1,4 +1,9 @@ #!/usr/bin/env python +# MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. +# Written by Alinson S. Xavier + """Benchmark script Usage: diff --git a/miplearn/__init__.py b/miplearn/__init__.py index 5a9de67..352049b 100644 --- a/miplearn/__init__.py +++ b/miplearn/__init__.py @@ -1,8 +1,8 @@ # MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2019-2020 Argonne National Laboratory. All rights reserved. +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. # Written by Alinson S. Xavier - from .components.component import Component from .components.warmstart import (WarmStartComponent, KnnWarmStartPredictor, diff --git a/miplearn/benchmark.py b/miplearn/benchmark.py index 0146772..df0c168 100644 --- a/miplearn/benchmark.py +++ b/miplearn/benchmark.py @@ -1,5 +1,6 @@ # MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2019-2020 Argonne National Laboratory. All rights reserved. +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. # Written by Alinson S. Xavier from .solvers import LearningSolver diff --git a/miplearn/components/branching.jl b/miplearn/components/branching.jl index ff85ae2..c57fe55 100644 --- a/miplearn/components/branching.jl +++ b/miplearn/components/branching.jl @@ -1,3 +1,8 @@ +# MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. +# Written by Alinson S. Xavier + import Base.Threads.@threads using TinyBnB, CPLEXW, Printf diff --git a/miplearn/components/branching.py b/miplearn/components/branching.py index be6c871..e267834 100644 --- a/miplearn/components/branching.py +++ b/miplearn/components/branching.py @@ -1,5 +1,6 @@ # MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2019-2020 Argonne National Laboratory. All rights reserved. +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. # Written by Alinson S. Xavier from .component import Component diff --git a/miplearn/components/component.py b/miplearn/components/component.py index 1b3f0a8..2f8d88d 100644 --- a/miplearn/components/component.py +++ b/miplearn/components/component.py @@ -1,5 +1,6 @@ # MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2019-2020 Argonne National Laboratory. All rights reserved. +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. # Written by Alinson S. Xavier from abc import ABC, abstractmethod diff --git a/miplearn/components/tests/test_branching.py b/miplearn/components/tests/test_branching.py index 7fbbdd1..5316814 100644 --- a/miplearn/components/tests/test_branching.py +++ b/miplearn/components/tests/test_branching.py @@ -1,5 +1,6 @@ # MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2019-2020 Argonne National Laboratory. All rights reserved. +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. # Written by Alinson S. Xavier from miplearn import BranchPriorityComponent, LearningSolver diff --git a/miplearn/components/tests/test_warmstart.py b/miplearn/components/tests/test_warmstart.py index 9f62bb7..875e7a4 100644 --- a/miplearn/components/tests/test_warmstart.py +++ b/miplearn/components/tests/test_warmstart.py @@ -1,5 +1,6 @@ # MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2019-2020 Argonne National Laboratory. All rights reserved. +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. # Written by Alinson S. Xavier from miplearn import WarmStartComponent, LearningSolver diff --git a/miplearn/components/tests/test_warmstart_knn.py b/miplearn/components/tests/test_warmstart_knn.py index 0b44aad..b6f836c 100644 --- a/miplearn/components/tests/test_warmstart_knn.py +++ b/miplearn/components/tests/test_warmstart_knn.py @@ -1,5 +1,6 @@ # MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2019-2020 Argonne National Laboratory. All rights reserved. +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. # Written by Alinson S. Xavier from miplearn import KnnWarmStartPredictor diff --git a/miplearn/components/tests/test_warmstart_logistic.py b/miplearn/components/tests/test_warmstart_logistic.py index 3631c20..59db276 100644 --- a/miplearn/components/tests/test_warmstart_logistic.py +++ b/miplearn/components/tests/test_warmstart_logistic.py @@ -1,5 +1,6 @@ # MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2019-2020 Argonne National Laboratory. All rights reserved. +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. # Written by Alinson S. Xavier from miplearn import LogisticWarmStartPredictor diff --git a/miplearn/components/warmstart.py b/miplearn/components/warmstart.py index 25dc8b9..4fc665d 100644 --- a/miplearn/components/warmstart.py +++ b/miplearn/components/warmstart.py @@ -1,5 +1,6 @@ # MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2019-2020 Argonne National Laboratory. All rights reserved. +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. # Written by Alinson S. Xavier from .component import Component diff --git a/miplearn/extractors.py b/miplearn/extractors.py index e77ea02..d01742c 100644 --- a/miplearn/extractors.py +++ b/miplearn/extractors.py @@ -1,5 +1,6 @@ # MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2019-2020 Argonne National Laboratory. All rights reserved. +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. # Written by Alinson S. Xavier import numpy as np diff --git a/miplearn/instance.py b/miplearn/instance.py index a401e3a..7404608 100644 --- a/miplearn/instance.py +++ b/miplearn/instance.py @@ -1,5 +1,6 @@ # MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2019-2020 Argonne National Laboratory. All rights reserved. +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. # Written by Alinson S. Xavier from abc import ABC, abstractmethod diff --git a/miplearn/solvers.py b/miplearn/solvers.py index 8ec7ca0..f7551cc 100644 --- a/miplearn/solvers.py +++ b/miplearn/solvers.py @@ -1,5 +1,6 @@ # MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2019-2020 Argonne National Laboratory. All rights reserved. +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. # Written by Alinson S. Xavier from . import WarmStartComponent, BranchPriorityComponent diff --git a/miplearn/tests/test_benchmark.py b/miplearn/tests/test_benchmark.py index 37a3ed9..27184d6 100644 --- a/miplearn/tests/test_benchmark.py +++ b/miplearn/tests/test_benchmark.py @@ -1,5 +1,6 @@ # MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2019-2020 Argonne National Laboratory. All rights reserved. +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. # Written by Alinson S. Xavier from miplearn import LearningSolver, BenchmarkRunner, KnnWarmStartPredictor diff --git a/miplearn/tests/test_extractors.py b/miplearn/tests/test_extractors.py index 013a980..95c54a0 100644 --- a/miplearn/tests/test_extractors.py +++ b/miplearn/tests/test_extractors.py @@ -1,5 +1,6 @@ # MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2019-2020 Argonne National Laboratory. All rights reserved. +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. # Written by Alinson S. Xavier from miplearn.problems.knapsack import KnapsackInstance diff --git a/miplearn/tests/test_solver.py b/miplearn/tests/test_solver.py index a2b7636..3598f06 100644 --- a/miplearn/tests/test_solver.py +++ b/miplearn/tests/test_solver.py @@ -1,5 +1,6 @@ # MIPLearn, an extensible framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2019-2020 Argonne National Laboratory. All rights reserved. +# Copyright © 2020, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. # Written by Alinson S. Xavier from miplearn import LearningSolver, BranchPriorityComponent, WarmStartComponent