Skip to content

Commit

Permalink
Update README, COPYRIGHT and LICENSE
Browse files Browse the repository at this point in the history
  • Loading branch information
SelinBayramoglu committed Sep 14, 2023
1 parent 67b575c commit 242a680
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 23 deletions.
Binary file modified .DS_Store
Binary file not shown.
18 changes: 18 additions & 0 deletions COPYRIGHT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
Copyright
=========

Institute for the Design of Advanced Energy Systems Process Systems Engineering
Framework (IDAES PSE Framework) was produced under the DOE Institute for the
Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2023 by the
software owners: The Regents of the University of California, through Lawrence
Berkeley National Laboratory, National Technology & Engineering Solutions of
Sandia, LLC, Carnegie Mellon University, West Virginia University Research
Corporation, et al. All rights reserved.

NOTICE. This Software was developed under funding from the U.S. Department of
Energy and the U.S. Government consequently retains certain rights. As such, the
U.S. Government has been granted for itself and others acting on its behalf a
paid-up, nonexclusive, irrevocable, worldwide license in the Software to
reproduce, distribute copies to the public, prepare derivative works, and
perform publicly and display publicly, and to permit other to do so. Copyright
(C) 2018-2023 IDAES - All Rights Reserved
22 changes: 0 additions & 22 deletions LICENSE

This file was deleted.

50 changes: 50 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
License
=======

Institute for the Design of Advanced Energy Systems Process Systems Engineering
Framework (IDAES PSE Framework) Copyright (c) 2018-2023, by the software owners: The
Regents of the University of California, through Lawrence Berkeley National
Laboratory, National Technology & Engineering Solutions of Sandia, LLC,
Carnegie Mellon University, West Virginia University Research Corporation, et al.
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 Institute for the Design of Advanced Energy Systems
(IDAES), University of California, Lawrence Berkeley National Laboratory,
National Technology & Engineering Solutions of Sandia, LLC, Sandia National
Laboratories, Carnegie Mellon University, West Virginia University Research
Corporation, U.S. Dept. of Energy, 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 OWNER 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.

You are under no obligation whatsoever to provide any bug fixes, patches, or
upgrades to the features, functionality or performance of the source code
("Enhancements") to anyone; however, if you choose to make your Enhancements
available either publicly, or directly to Lawrence Berkeley National Laboratory,
without imposing a separate written license agreement for such Enhancements,
then you hereby grant Lawrence Berkeley National Laboratory the following
license: a non-exclusive, royalty-free perpetual license to install, use,
modify, prepare derivative works, incorporate into other computer software,
distribute, and sublicense such enhancements or derivative works thereof, in
binary and source code form.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Python package to build sparse regression models of strong branching and use the

### Copyright

Copyright (c) 2023, Selin Bayramoglu
Please see COPYRIGHT.md .


#### Acknowledgements
Expand Down

0 comments on commit 242a680

Please sign in to comment.