From 31ad19e05899f620d0851cd1760ddfd874db9cc5 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Mon, 29 Aug 2022 11:16:53 +1200 Subject: [PATCH] Add copyright headers (#139) --- LICENSE.md | 44 ++++++++++---------- gen/gen.jl | 5 +++ src/ECOS.jl | 12 ++---- src/MOI_wrapper/MOI_wrapper.jl | 5 +++ src/MOI_wrapper/permuted_exponential_cone.jl | 5 +++ src/gen/libecos_api.jl | 5 +++ src/gen/libecos_common.jl | 5 +++ test/MOI_wrapper.jl | 5 +++ test/c_wrapper.jl | 13 +++--- test/runtests.jl | 12 ++---- 10 files changed, 66 insertions(+), 45 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 1ceabe0..783857d 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,22 +1,24 @@ -The ECOS.jl package is licensed under the MIT "Expat" License: +ECOS.jl is licensed under the MIT License (MIT) -> Copyright (c) 2014: Joao Felipe Santos, Iain Dunning -> -> 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. +Copyright (c) 2014: Joao Felipe Santos, Iain Dunning, and contributors + +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. + +Note that ECOS.jl includes embotech/ecos as a dependency, which is licensed +under the GPLv3 license: https://github.com/embotech/ecos/blob/develop/COPYING diff --git a/gen/gen.jl b/gen/gen.jl index 80ea6a5..8dfac37 100644 --- a/gen/gen.jl +++ b/gen/gen.jl @@ -1,3 +1,8 @@ +# Copyright (c) 2014: Joao Felipe Santos, Iain Dunning, and contributors +# +# Use of this source code is governed by an MIT-style license that can be found +# in the LICENSE.md file or at https://opensource.org/licenses/MIT. + using Clang, ECOS_jll _GEN_DIR = joinpath(dirname(@__DIR__), "src", "gen") diff --git a/src/ECOS.jl b/src/ECOS.jl index ba9cf2c..717e95d 100644 --- a/src/ECOS.jl +++ b/src/ECOS.jl @@ -1,11 +1,7 @@ -############################################################################# -# ECOS.jl -# Wrapper around the ECOS solver https://github.com/ifa-ethz/ecos -# See http://github.com/jump-dev/ECOS.jl -############################################################################# -# ECOS.jl -# Contains the wrapper itself -############################################################################# +# Copyright (c) 2014: Joao Felipe Santos, Iain Dunning, and contributors +# +# Use of this source code is governed by an MIT-style license that can be found +# in the LICENSE.md file or at https://opensource.org/licenses/MIT. module ECOS diff --git a/src/MOI_wrapper/MOI_wrapper.jl b/src/MOI_wrapper/MOI_wrapper.jl index 96eae7d..47978b1 100644 --- a/src/MOI_wrapper/MOI_wrapper.jl +++ b/src/MOI_wrapper/MOI_wrapper.jl @@ -1,3 +1,8 @@ +# Copyright (c) 2014: Joao Felipe Santos, Iain Dunning, and contributors +# +# Use of this source code is governed by an MIT-style license that can be found +# in the LICENSE.md file or at https://opensource.org/licenses/MIT. + using MathOptInterface const MOI = MathOptInterface diff --git a/src/MOI_wrapper/permuted_exponential_cone.jl b/src/MOI_wrapper/permuted_exponential_cone.jl index cc56ee6..5f4ac8f 100644 --- a/src/MOI_wrapper/permuted_exponential_cone.jl +++ b/src/MOI_wrapper/permuted_exponential_cone.jl @@ -1,3 +1,8 @@ +# Copyright (c) 2014: Joao Felipe Santos, Iain Dunning, and contributors +# +# Use of this source code is governed by an MIT-style license that can be found +# in the LICENSE.md file or at https://opensource.org/licenses/MIT. + # ECOS orders differently than MOI the second and third dimension of the # exponential cone diff --git a/src/gen/libecos_api.jl b/src/gen/libecos_api.jl index 9c8311c..fceae94 100644 --- a/src/gen/libecos_api.jl +++ b/src/gen/libecos_api.jl @@ -1,3 +1,8 @@ +# Copyright (c) 2014: Joao Felipe Santos, Iain Dunning, and contributors +# +# Use of this source code is governed by an MIT-style license that can be found +# in the LICENSE.md file or at https://opensource.org/licenses/MIT. + # Julia wrapper for header: cone.h # Automatically generated using Clang.jl diff --git a/src/gen/libecos_common.jl b/src/gen/libecos_common.jl index e0d9c4c..a27a612 100644 --- a/src/gen/libecos_common.jl +++ b/src/gen/libecos_common.jl @@ -1,3 +1,8 @@ +# Copyright (c) 2014: Joao Felipe Santos, Iain Dunning, and contributors +# +# Use of this source code is governed by an MIT-style license that can be found +# in the LICENSE.md file or at https://opensource.org/licenses/MIT. + # Automatically generated using Clang.jl const CONEMODE = 0 diff --git a/test/MOI_wrapper.jl b/test/MOI_wrapper.jl index 7b34073..d06d2f5 100644 --- a/test/MOI_wrapper.jl +++ b/test/MOI_wrapper.jl @@ -1,3 +1,8 @@ +# Copyright (c) 2014: Joao Felipe Santos, Iain Dunning, and contributors +# +# Use of this source code is governed by an MIT-style license that can be found +# in the LICENSE.md file or at https://opensource.org/licenses/MIT. + module TestECOS using Test diff --git a/test/c_wrapper.jl b/test/c_wrapper.jl index cb392e8..7eead83 100644 --- a/test/c_wrapper.jl +++ b/test/c_wrapper.jl @@ -1,12 +1,9 @@ +# Copyright (c) 2014: Joao Felipe Santos, Iain Dunning, and contributors +# +# Use of this source code is governed by an MIT-style license that can be found +# in the LICENSE.md file or at https://opensource.org/licenses/MIT. + #! format: off -############################################################################# -# ECOS.jl -# Wrapper around the ECOS solver https://github.com/ifa-ethz/ecos -# See http://github.com/jump-dev/ECOS.jl -############################################################################# -# test/direct.jl -# Test the direct interface for the ECOS.jl solver wrapper -############################################################################# import ECOS import SparseArrays diff --git a/test/runtests.jl b/test/runtests.jl index 0b7159f..3e55286 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,11 +1,7 @@ -############################################################################# -# ECOS.jl -# Wrapper around the ECOS solver https://github.com/ifa-ethz/ecos -# See http://github.com/jump-dev/ECOS.jl -############################################################################# -# test/runtests.jl -# Test the ECOS.jl solver wrapper -############################################################################# +# Copyright (c) 2014: Joao Felipe Santos, Iain Dunning, and contributors +# +# Use of this source code is governed by an MIT-style license that can be found +# in the LICENSE.md file or at https://opensource.org/licenses/MIT. using Test