Skip to content

Commit ea3be8e

Browse files
whart222whart222
committed
Updates for the new copyright info for Pyomo 5.0.
1 parent 22f05c1 commit ea3be8e

File tree

742 files changed

+5208
-4520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

742 files changed

+5208
-4520
lines changed

‎ATTIC/openopt/FuncDesignerExt.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011
__all__ = ['tanh', 'arcsinh', 'arccosh', 'arctanh']
1112

‎ATTIC/openopt/__init__.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011
from pyomo.util.plugin import PluginGlobals
1112
PluginGlobals.add_env("pyomo")

‎ATTIC/openopt/func_designer.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011
__all__ = ['Pyomo2FuncDesigner']
1112

‎ATTIC/openopt/plugins/OPEN_OPT.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011
import sys
1112
import logging

‎ATTIC/openopt/plugins/__init__.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011
def load():
1112
import pyomo.openopt.plugins.OPEN_OPT

‎ATTIC/openopt/tests/__init__.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910
#
1011
# pyomo.openopt tests
1112
#

‎ATTIC/openopt/tests/test1.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011
from pyomo.environ import *
1112

‎ATTIC/openopt/tests/test_solvers.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910
#
1011
# Test Pyomo models with OpenOpt solvers
1112
#

‎ATTIC/openopt/tests/test_terms.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011
from pyutilib.misc import Options
1112
import pyutilib.th as unittest

‎LICENSE.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
Copyright 2014 Sandia Corporation. Under the terms of Contract DE-AC04-
2-
94AL85000 with Sandia Corporation, the U.S. Government retains certain
3-
rights in this software.
1+
Copyright 2017 National Technology and Engineering Solutions of
2+
Sandia, LLC . Under the terms of Contract DE-NA0003525 with National
3+
Technology and Engineering Solutions of Sandia, LLC , the U.S.
4+
Government retains certain rights in this software.
45

56
All rights reserved.
67

‎admin/jenkins.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011
import sys
1112
import os

‎examples/bilevel/bard_5_1_1.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011
# Example 5.1.1 from
1112
#

‎examples/bilevel/blp_example1.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011
from pyomo.environ import *
1112
from pyomo.bilevel import *

‎examples/bilevel/example1.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011
import pyomo.environ
1112
from pyomo.core import *

‎examples/bilevel/example2.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011
from pyomo.core import *
1112
from pyomo.bilevel import *

‎examples/bilevel/example3.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011
import pyomo.environ
1112
from pyomo.core import *

‎examples/bilevel/interdiction.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011
import pyomo.environ
1112
from pyomo.core import *

‎examples/bilevel/pmedian.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011

1112
from pyomo.core import *

‎examples/bilevel/sensor.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011
import pyomo.environ
1112
from pyomo.core import *

‎examples/bilevel/sensor_1_level.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011

1112
from pyomo.core import *

‎examples/bilevel/shortest.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# _________________________________________________________________________
1+
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2014 Sandia Corporation.
5-
# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
6-
# the U.S. Government retains certain rights in this software.
7-
# This software is distributed under the BSD License.
8-
# _________________________________________________________________________
4+
# Copyright 2017 National Technology and Engineering Solutions of Sandia, LLC
5+
# Under the terms of Contract DE-NA0003525 with National Technology and
6+
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
7+
# rights in this software.
8+
# This software is distributed under the 3-clause BSD License.
9+
# ___________________________________________________________________________
910

1011
from pyomo.environ import *
1112
from pyomo.bilevel import *

0 commit comments

Comments
 (0)