Update copyright

5 years ago · 54685d6774
parent bda061e695
commit 54685d6774
11 changed files with 105 additions and 18 deletions
--- a/COPYING.md
+++ b/COPYING.md
@ -0,0 +1,25 @@
+Copyright © 2020, UChicago Argonne, LLC
+
+All Rights Reserved
+
+Software Name: RELOG
+
+By: Argonne National Laboratory
+
+OPEN SOURCE LICENSE
+-------------------
+
+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.
+
+********************************************************************************
+
+DISCLAIMER
+----------
+
+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.
+
+********************************************************************************
--- a/docs/index.html
+++ b/docs/index.html
@ -126,19 +126,21 @@
        <div class="col-md-3"><div class="bs-sidebar hidden-print affix well" role="complementary">
    <ul class="nav bs-sidenav">
        <li class="first-level active"><a href="#relog-reverse-logistics-optimization">RELOG: Reverse Logistics Optimization</a></li>
-            <li class="second-level"><a href="#documentation">Documentation</a></li>
+            <li class="second-level"><a href="#table-of-contents">Table of Contents</a></li>
                
            <li class="second-level"><a href="#source-code">Source Code</a></li>
                
            <li class="second-level"><a href="#authors">Authors</a></li>
                
+            <li class="second-level"><a href="#license">License</a></li>
+                
    </ul>
 </div></div>
        <div class="col-md-9" role="main">

 <h1 id="relog-reverse-logistics-optimization">RELOG: Reverse Logistics Optimization</h1>
 <p><strong>RELOG</strong> is a supply chain optimization package focusing on reverse logistics and reverse manufacturing. For example, the package can be used to determine where to build recycling plants, what sizes should they have and which customers should be served by which plants. The package supports customized reverse logistics pipelines, with multiple types of plants, multiple types of product and multiple time periods.</p>
-<h3 id="documentation">Documentation</h3>
+<h3 id="table-of-contents">Table of Contents</h3>
 <ul>
 <li><a href="install/">Installation</a></li>
 <li><a href="model/">Modeling</a></li>
@ -152,7 +154,33 @@
 <ul>
 <li><strong>Alinson S. Xavier,</strong> Argonne National Laboratory &lt;<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#97;&#120;&#97;&#118;&#105;&#101;&#114;&#64;&#97;&#110;&#108;&#46;&#103;&#111;&#118;">&#97;&#120;&#97;&#118;&#105;&#101;&#114;&#64;&#97;&#110;&#108;&#46;&#103;&#111;&#118;</a>&gt;</li>
 <li><strong>Nwike Iloeje,</strong> Argonne National Laboratory &lt;<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#99;&#105;&#108;&#111;&#101;&#106;&#101;&#64;&#97;&#110;&#108;&#46;&#103;&#111;&#118;">&#99;&#105;&#108;&#111;&#101;&#106;&#101;&#64;&#97;&#110;&#108;&#46;&#103;&#111;&#118;</a>&gt;</li>
-</ul></div>
+</ul>
+<h3 id="license">License</h3>
+<pre><code class="text">RELOG: Reverse Logistics Optimization
+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 &quot;AS IS&quot; 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.
+</code></pre></div>
        
        
    </div>
@ -248,5 +276,5 @@

 <!--
 MkDocs version : 1.1
-Build Date UTC : 2020-05-22 14:37:07
+Build Date UTC : 2020-05-22 14:47:36
 -->
--- a/docs/search/search_index.json
+++ b/docs/search/search_index.json
--- a/docs/sitemap.xml.gz
+++ b/docs/sitemap.xml.gz
--- a/src/RELOG.jl
+++ b/src/RELOG.jl
@ -1,5 +1,6 @@
-# Copyright (C) 2020 Argonne National Laboratory
-# Written by Alinson Santos Xavier <axavier@anl.gov>
+# RELOG: Reverse Logistics Optimization
+# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
+# Released under the modified BSD license. See COPYING.md for more details.

 module RELOG
    include("dotdict.jl")
--- a/src/docs/index.md
+++ b/src/docs/index.md
@ -3,7 +3,7 @@

 **RELOG** is a supply chain optimization package focusing on reverse logistics and reverse manufacturing. For example, the package can be used to determine where to build recycling plants, what sizes should they have and which customers should be served by which plants. The package supports customized reverse logistics pipelines, with multiple types of plants, multiple types of product and multiple time periods.

-### Documentation
+### Table of Contents

  * [Installation](install.md)
  * [Modeling](model.md)
@ -15,4 +15,33 @@

 ### Authors
 * **Alinson S. Xavier,** Argonne National Laboratory <<axavier@anl.gov>>
-* **Nwike Iloeje,** Argonne National Laboratory <<ciloeje@anl.gov>>
+* **Nwike Iloeje,** Argonne National Laboratory <<ciloeje@anl.gov>>
+
+### License
+
+```text
+RELOG: Reverse Logistics Optimization
+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.
+```
--- a/src/dotdict.jl
+++ b/src/dotdict.jl
@ -1,5 +1,6 @@
-# Copyright (C) 2019 Argonne National Laboratory
-# Written by Alinson Santos Xavier <axavier@anl.gov>
+# RELOG: Reverse Logistics Optimization
+# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
+# Released under the modified BSD license. See COPYING.md for more details.

 struct DotDict
    inner::Dict
--- a/src/graph.jl
+++ b/src/graph.jl
@ -1,5 +1,6 @@
-# Copyright (C) 2019 Argonne National Laboratory
-# Written by Alinson Santos Xavier <axavier@anl.gov>
+# RELOG: Reverse Logistics Optimization
+# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
+# Released under the modified BSD license. See COPYING.md for more details.

 using Geodesy

--- a/src/instance.jl
+++ b/src/instance.jl
@ -1,5 +1,6 @@
-# Copyright (C) 2020 Argonne National Laboratory
-# Written by Alinson Santos Xavier <axavier@anl.gov>
+# RELOG: Reverse Logistics Optimization
+# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
+# Released under the modified BSD license. See COPYING.md for more details.

 using JSON, JSONSchema

--- a/src/model.jl
+++ b/src/model.jl
@ -1,5 +1,6 @@
-# Copyright (C) 2019 Argonne National Laboratory
-# Written by Alinson Santos Xavier <axavier@anl.gov>
+# RELOG: Reverse Logistics Optimization
+# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
+# Released under the modified BSD license. See COPYING.md for more details.

 using JuMP, LinearAlgebra, Geodesy, Cbc, ProgressBars

--- a/src/schemas/input.json
+++ b/src/schemas/input.json
@ -1,6 +1,6 @@
 {
    "$schema": "http://json-schema.org/draft-07/schema#",
-    "$id": "https://axavier.org/ReverseManufacturing/input/schema",
+    "$id": "https://anl-ceeesa.github.io/RELOG/input",
    "title": "Schema for ReverseManufacturing Input File",
    "definitions": {
        "TimeSeries": {