From eab4697b6bdb556d92dae5b669d3396ace793e3c Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Wed, 22 Mar 2023 10:23:42 -0500 Subject: [PATCH] Update copyright notices, other minor fixes --- README.md | 5 +---- src/BB/BB.jl | 2 +- src/BB/collect.jl | 2 +- src/BB/cplex.jl | 2 +- src/BB/log.jl | 2 +- src/BB/lp.jl | 2 +- src/BB/nodepool.jl | 2 +- src/BB/optimize.jl | 2 +- src/BB/structs.jl | 2 +- src/BB/varbranch/hybrid.jl | 2 +- src/BB/varbranch/infeasibility.jl | 2 +- src/BB/varbranch/pseudocost.jl | 2 +- src/BB/varbranch/random.jl | 2 +- src/BB/varbranch/reliability.jl | 2 +- src/BB/varbranch/strong.jl | 2 +- src/Cuts/Cuts.jl | 4 ++++ src/Cuts/tableau/collect.jl | 2 +- src/Cuts/tableau/gmi.jl | 2 +- src/Cuts/tableau/moi.jl | 2 +- src/Cuts/tableau/structs.jl | 2 +- src/Cuts/tableau/tableau.jl | 2 +- src/Cuts/tableau/transform.jl | 2 +- src/collectors.jl | 4 ++++ src/components.jl | 3 +++ src/extractors.jl | 3 +++ src/io.jl | 4 ++++ src/problems/setcover.jl | 4 ++++ src/solvers/jump.jl | 4 ++++ src/solvers/learning.jl | 4 ++++ test/src/BB/test_bb.jl | 2 +- test/src/MIPLearnT.jl | 4 ++++ test/src/fixtures.jl | 4 ++++ test/src/problems/test_setcover.jl | 4 ++++ test/src/solvers/test_jump.jl | 4 ++++ test/src/test_io.jl | 4 ++++ test/src/test_usage.jl | 3 +++ 36 files changed, 75 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 6551c17..cfd5291 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,5 @@

MIPLearn.jl

- - - @@ -11,7 +8,7 @@

-**MIPLearn** is an extensible open-source framework for solving discrete optimization problems using a combination of Mixed-Integer Linear Programming (MIP) and Machine Learning (ML). See the [main repository](https://github.com/ANL-CEEESA/MIPLearn) for more information. This repository holds an experimental Julia interface for the package. See [getting started tutorial](https://github.com/ANL-CEEESA/MIPLearn.jl/blob/dev/docs/getting-started.ipynb). +**MIPLearn** is an extensible open-source framework for solving discrete optimization problems using a combination of Mixed-Integer Linear Programming (MIP) and Machine Learning (ML). See the [main repository](https://github.com/ANL-CEEESA/MIPLearn) for more information. This repository holds an experimental Julia interface for the package. [miplearn]: https://github.com/ANL-CEEESA/MIPLearn diff --git a/src/BB/BB.jl b/src/BB/BB.jl index 18fb8a9..9d9d4d4 100644 --- a/src/BB/BB.jl +++ b/src/BB/BB.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. module BB diff --git a/src/BB/collect.jl b/src/BB/collect.jl index a1dde95..6332140 100644 --- a/src/BB/collect.jl +++ b/src/BB/collect.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. using Printf diff --git a/src/BB/cplex.jl b/src/BB/cplex.jl index 2463a45..8b75a24 100644 --- a/src/BB/cplex.jl +++ b/src/BB/cplex.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020-2022, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. using CPLEX diff --git a/src/BB/log.jl b/src/BB/log.jl index 5c7bbbf..dc32805 100644 --- a/src/BB/log.jl +++ b/src/BB/log.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. using Printf diff --git a/src/BB/lp.jl b/src/BB/lp.jl index 76fa4ec..3dc5be7 100644 --- a/src/BB/lp.jl +++ b/src/BB/lp.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. import Base: values, convert diff --git a/src/BB/nodepool.jl b/src/BB/nodepool.jl index be1fa9a..a62a8b0 100644 --- a/src/BB/nodepool.jl +++ b/src/BB/nodepool.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. using Statistics diff --git a/src/BB/optimize.jl b/src/BB/optimize.jl index bb0fb06..b4121a9 100644 --- a/src/BB/optimize.jl +++ b/src/BB/optimize.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. using Printf diff --git a/src/BB/structs.jl b/src/BB/structs.jl index fb99f17..e3be2f8 100644 --- a/src/BB/structs.jl +++ b/src/BB/structs.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. using DataStructures diff --git a/src/BB/varbranch/hybrid.jl b/src/BB/varbranch/hybrid.jl index fa5d959..b54fa0b 100644 --- a/src/BB/varbranch/hybrid.jl +++ b/src/BB/varbranch/hybrid.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. """ diff --git a/src/BB/varbranch/infeasibility.jl b/src/BB/varbranch/infeasibility.jl index 2c99ed8..457be1a 100644 --- a/src/BB/varbranch/infeasibility.jl +++ b/src/BB/varbranch/infeasibility.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. """ diff --git a/src/BB/varbranch/pseudocost.jl b/src/BB/varbranch/pseudocost.jl index 8b3cff0..37016f4 100644 --- a/src/BB/varbranch/pseudocost.jl +++ b/src/BB/varbranch/pseudocost.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. """ diff --git a/src/BB/varbranch/random.jl b/src/BB/varbranch/random.jl index fd09c30..ab40cfc 100644 --- a/src/BB/varbranch/random.jl +++ b/src/BB/varbranch/random.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. using Random diff --git a/src/BB/varbranch/reliability.jl b/src/BB/varbranch/reliability.jl index e3bc29a..4edd039 100644 --- a/src/BB/varbranch/reliability.jl +++ b/src/BB/varbranch/reliability.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. import ..to_str_array diff --git a/src/BB/varbranch/strong.jl b/src/BB/varbranch/strong.jl index 9cb36a5..470989d 100644 --- a/src/BB/varbranch/strong.jl +++ b/src/BB/varbranch/strong.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. using Random diff --git a/src/Cuts/Cuts.jl b/src/Cuts/Cuts.jl index decb70d..3684a19 100644 --- a/src/Cuts/Cuts.jl +++ b/src/Cuts/Cuts.jl @@ -1,3 +1,7 @@ +# MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. + module Cuts import ..to_str_array diff --git a/src/Cuts/tableau/collect.jl b/src/Cuts/tableau/collect.jl index f0c011a..514c9b5 100644 --- a/src/Cuts/tableau/collect.jl +++ b/src/Cuts/tableau/collect.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020-2022, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. import ..H5File diff --git a/src/Cuts/tableau/gmi.jl b/src/Cuts/tableau/gmi.jl index 19194e9..d08e087 100644 --- a/src/Cuts/tableau/gmi.jl +++ b/src/Cuts/tableau/gmi.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020-2022, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. using SparseArrays diff --git a/src/Cuts/tableau/moi.jl b/src/Cuts/tableau/moi.jl index 34c6eb1..caa7764 100644 --- a/src/Cuts/tableau/moi.jl +++ b/src/Cuts/tableau/moi.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020-2022, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. using JuMP diff --git a/src/Cuts/tableau/structs.jl b/src/Cuts/tableau/structs.jl index 55200ad..5d39ef7 100644 --- a/src/Cuts/tableau/structs.jl +++ b/src/Cuts/tableau/structs.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020-2022, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. using SparseArrays diff --git a/src/Cuts/tableau/tableau.jl b/src/Cuts/tableau/tableau.jl index 6498342..3323283 100644 --- a/src/Cuts/tableau/tableau.jl +++ b/src/Cuts/tableau/tableau.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020-2022, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. using KLU diff --git a/src/Cuts/tableau/transform.jl b/src/Cuts/tableau/transform.jl index ae3a154..bc11b1b 100644 --- a/src/Cuts/tableau/transform.jl +++ b/src/Cuts/tableau/transform.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020-2022, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. using LinearAlgebra diff --git a/src/collectors.jl b/src/collectors.jl index 8d5465d..d9ee5a2 100644 --- a/src/collectors.jl +++ b/src/collectors.jl @@ -1,3 +1,7 @@ +# MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. + global BasicCollector = PyNULL() function __init_collectors__() diff --git a/src/components.jl b/src/components.jl index 8bd913d..73172bf 100644 --- a/src/components.jl +++ b/src/components.jl @@ -1,3 +1,6 @@ +# MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. global MinProbabilityClassifier = PyNULL() global SingleClassFix = PyNULL() diff --git a/src/extractors.jl b/src/extractors.jl index c266d25..ff34bc6 100644 --- a/src/extractors.jl +++ b/src/extractors.jl @@ -1,3 +1,6 @@ +# MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. global FeaturesExtractor = PyNULL() global AlvLouWeh2017Extractor = PyNULL() diff --git a/src/io.jl b/src/io.jl index 29f8af4..5bce22d 100644 --- a/src/io.jl +++ b/src/io.jl @@ -1,3 +1,7 @@ +# MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. + global H5File = PyNULL() global write_pkl_gz = PyNULL() global read_pkl_gz = PyNULL() diff --git a/src/problems/setcover.jl b/src/problems/setcover.jl index e037cfc..fb44b63 100644 --- a/src/problems/setcover.jl +++ b/src/problems/setcover.jl @@ -1,3 +1,7 @@ +# MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. + using JuMP using HiGHS diff --git a/src/solvers/jump.jl b/src/solvers/jump.jl index 7c8f365..7b091fd 100644 --- a/src/solvers/jump.jl +++ b/src/solvers/jump.jl @@ -1,3 +1,7 @@ +# MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. + using JuMP using HiGHS diff --git a/src/solvers/learning.jl b/src/solvers/learning.jl index 8cccdad..dccff4f 100644 --- a/src/solvers/learning.jl +++ b/src/solvers/learning.jl @@ -1,3 +1,7 @@ +# MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. + global LearningSolver = PyNULL() function __init_solvers_learning__() diff --git a/test/src/BB/test_bb.jl b/test/src/BB/test_bb.jl index 85796d2..003dcd2 100644 --- a/test/src/BB/test_bb.jl +++ b/test/src/BB/test_bb.jl @@ -1,5 +1,5 @@ # MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization -# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. # Released under the modified BSD license. See COPYING.md for more details. using Clp diff --git a/test/src/MIPLearnT.jl b/test/src/MIPLearnT.jl index 9db1830..6b95fcb 100644 --- a/test/src/MIPLearnT.jl +++ b/test/src/MIPLearnT.jl @@ -1,3 +1,7 @@ +# MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. + module MIPLearnT using Test diff --git a/test/src/fixtures.jl b/test/src/fixtures.jl index 94365b9..56f4dec 100644 --- a/test/src/fixtures.jl +++ b/test/src/fixtures.jl @@ -1,3 +1,7 @@ +# MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. + function fixture_setcover_data() return SetCoverData( costs = [5, 10, 12, 6, 8], diff --git a/test/src/problems/test_setcover.jl b/test/src/problems/test_setcover.jl index e4b54cb..5f85418 100644 --- a/test/src/problems/test_setcover.jl +++ b/test/src/problems/test_setcover.jl @@ -1,3 +1,7 @@ +# MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. + using PyCall function test_problems_setcover() diff --git a/test/src/solvers/test_jump.jl b/test/src/solvers/test_jump.jl index fb6557b..5bbc04d 100644 --- a/test/src/solvers/test_jump.jl +++ b/test/src/solvers/test_jump.jl @@ -1,3 +1,7 @@ +# MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. + using JuMP import MIPLearn: from_str_array, to_str_array diff --git a/test/src/test_io.jl b/test/src/test_io.jl index a6d441e..6e40c93 100644 --- a/test/src/test_io.jl +++ b/test/src/test_io.jl @@ -1,3 +1,7 @@ +# MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. + using MIPLearn function test_io() diff --git a/test/src/test_usage.jl b/test/src/test_usage.jl index 090a4f6..33e52b2 100644 --- a/test/src/test_usage.jl +++ b/test/src/test_usage.jl @@ -1,3 +1,6 @@ +# MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization +# Copyright (C) 2020-2023, UChicago Argonne, LLC. All rights reserved. +# Released under the modified BSD license. See COPYING.md for more details. function test_usage() LogisticRegression = pyimport("sklearn.linear_model").LogisticRegression