remove old notices

examples/acopf3/ACtree.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 #Tree ideas; dlw Fall 2019
 # Stage numbers and scenario numbers are one-based, but lists are all zero-based
 # Tree node numbers used in node names are zero-based.

examples/acopf3/ccopf2wood.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # updated april 26
 # mpiexec -np 2 python -m mpi4py ccopf2wood.py 2 3
 # (see the first lines of main() to change instances)

examples/acopf3/ccopf_multistage.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # JPW and DLW; July 2019; ccopf create scenario instances for line outages
 # extended Fall 2019 by DLW
 import egret

examples/acopf3/fourstage.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # four stage test
 # mpiexec -np 8 python -m mpi4py forustage.py 2 2 2 1 0
 # (see the first lines of main() to change instances)

examples/acopf3/rho_setter.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # January 2020; rho_setter for ccopf from n-1 stuff of a few years ago 
 
 def generator_p_cost(md, g, output_level):

examples/afew.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # Run a few examples; dlw June 2020
 # See also runall.py
 # Assumes you run from the examples directory.

examples/aircond/aircond_ama.py

@@ -1,5 +1,3 @@
-# Copyright 2021 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 """
 An example of using amalgamator with 3 cylinders for a multistage problem
 To execute this:

examples/aircond/aircond_cylinders.py

@@ -1,4 +1,3 @@
-# This software is distributed under the 3-clause BSD License.
 # NOTE: as of March 2022, consider aircondB.py as an alternative to aircond.py
 # Use bundle_pickler.py to create bundle pickles
 # NOTE: As of 3 March 2022, you can't compare pickle bundle problems with non-pickled. See _demands_creator in aircondB.py for more discusion.

examples/aircond/aircond_seqsampling.py

@@ -1,5 +1,3 @@
-# Copyright 2020, 2021 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # Use the aircond model to illustrate how to use sequential sampling.
 #
 

examples/aircond/bundle_pickler.py

@@ -1,4 +1,3 @@
-# This software is distributed under the 3-clause BSD License.
 # Program to create proper bundles for aircond; DLW march 2022
 # NOTE: As of 3 March 2022, you can't compare pickle bundle problems with non-pickled. See _demands_creator in aircondB.py for more discusion.
 # see try_pickles.bash

examples/battery/battery.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 ''' Solution to the Lagrangian relaxation of a hybrid solar-battery storage
     system from the paper:
 

examples/battery/batteryext.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 import mpisppy.extension
 
 class BatteryExtension(mpisppy.extension.Extension):

examples/battery/batterymain.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # updated April 2020 so it executes, but this needs a three driver
 from mpisppy.opt.ph import PH
 from battery import scenario_creator, scenario_denouement

examples/distr/distr_ef.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # general example driver for distr with cylinders
 
 # This file can be executed thanks to python distr_ef.py --num-scens 2 --solver-name cplex_direct

examples/farmer/cs_farmer.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 import datetime
 import logging
 import sys

examples/farmer/farmer_ama.py

@@ -1,5 +1,3 @@
-# Copyright 2021 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 """
 An example of using amalgamator and solving directly the EF 
 To execute this:

examples/farmer/farmer_cylinders.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # general example driver for farmer with cylinders
 
 import farmer

examples/farmer/farmer_ef.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # This shows two ways to get parameters to the EF for solution; both are fairly short.
 
 import sys

examples/farmer/farmer_lshapedhub.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # general example driver for farmer with cylinders and an l-shape hub
 # NOTE: as of June 2020, it does not use the vanilla cylinders
 

examples/farmer/farmer_rho_demo.py

@@ -1,5 +1,3 @@
-# Copyright 2023 by U. Naepels and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # This program can be used in two different ways:
 # Compute gradient-based cost and rho for a given problem
 # Use the gradient-based rho setter which sets adaptative gradient rho for PH.

examples/farmer/farmer_seqsampling.py

@@ -1,5 +1,3 @@
-# Copyright 2020, 2021 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # Illustrate the use of sequential sampling for programmers.
 #
 # This is an atypical program in that it allows for a command line

examples/farmer/from_pysp/abstract.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # from PySP where it was an AbstractModel, with AMPL format data
 
 import os

examples/farmer/from_pysp/concrete_ampl.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # from PySP where it was a concrete model with AMPL format scenario tree data
 import os
 import sys

examples/generic_tester.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # This might make a mess in terms of output files....
 # (re)baseline by uncommenting rebaseline_xhat lines
 # NOTE: the asynchronous nature of mip-sppy makes it hard to hit baselines.

examples/hydro/hydro_cylinders.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # general example driver for the hydro example with cylinders
 # Modfied April 2022 by DLW to illustrate config.py
 

examples/hydro/hydro_cylinders_pysp.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # general example driver for the hydro example with cylinders
 
 import hydro

examples/hydro/hydro_ef.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 import sys
 import hydro
 import pyomo.environ as pyo

examples/netdes/data/rename.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 import subprocess
 
 piper = subprocess.Popen(['ls'], 

examples/netdes/drivertest.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # DLW version: add Xhat
 import netdes
 

examples/netdes/netdes.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 ''' Implementation of a simple network design problem. See README for more info
 
     Created: 9 November 2019 by DTM

examples/netdes/netdes_cylinders.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 import sys
 import os
 import copy

examples/netdes/netdes_ef.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 ''' Solve the EF of the network problems
 '''
 from mpisppy.opt.ef import ExtensiveForm

examples/netdes/netdes_extension.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 import numpy as np
 import pyomo.environ as pyo
 import mpisppy.utils.sputils as sputils

examples/netdes/netdes_ph.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 ''' Solve the EF of the network problems
 '''
 from netdes import scenario_creator, scenario_denouement

examples/netdes/parse.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 ''' Parse data from an instance file
 
     TODO: Currently storing the (dense) adjacency matrix. Cheaper not to.

examples/run_all.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # Run a lot of examples for regression testing; dlw May 2020
 # Not intended to be user-friendly.
 # Assumes you run from the examples directory.

examples/sizes/sizes.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 import os
 import models.ReferenceModel as ref
 import mpisppy.utils.sputils as sputils

examples/sizes/sizes_cylinders.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 import sys
 import copy
 import sizes

examples/sizes/sizes_demo.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # updated 23 April 2020
 # Serial (not cylinders)
 

examples/sizes/sizes_ph.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # updated 23 April 2020
 # Serial (not cylinders)
 

examples/sizes/sizes_pysp.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 import sys
 
 from pyomo.environ import SolverFactory

examples/sizes/special_cylinders.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # ** special **
 import sys
 import copy

examples/sizes/special_sizes.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # special sizes to support exotic options
 import os
 import models.ReferenceModel as ref

examples/sslp/model/ReferenceModel.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # -*- coding: utf-8 -*-
 """
 Created on Fri Feb  8 11:49:24 2013

examples/sslp/sslp.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # update April 2020: BUT this really needs upper and lower bound spokes
 # dlw February 2019: PySP 2 for the sslp example
 

examples/sslp/sslp_cylinders.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 import sys
 import os
 import copy

examples/sslp/sslp_ef.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 ''' Solve the EF of the sslp problems
 '''
 from mpisppy.opt.ef import ExtensiveForm

examples/stoch_distr/stoch_distr_admm_cylinders.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # general example driver for stoch_distr with cylinders
 
 # Driver file for stochastic admm

examples/stoch_distr/stoch_distr_ef.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # general example driver for stoch_distr with cylinders
 
 # This file can be executed thanks to python stoch_distr_ef.py --num-stoch-scens 2 --solver-name xpress --num-stoch-scens 2 --num-admm-subproblems 3 --scalable --mnpr 6

examples/tryone.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # For specific tests during development
 # See also runall.py
 # Assumes you run from the examples directory.

examples/uc/cs_uc.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 import datetime
 import logging
 import sys

examples/uc/gradient_uc_cylinders.py

@@ -1,5 +1,3 @@
-# Copyright 2023 U. Naepels and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 
 # TBD: put in more options: threads, mipgaps for spokes
 

examples/uc/rhoconfig10.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 from pyomo.environ import *
 
 # TBD - we can't get the rho scale factor into the callback easily, so we hard-code for now.

examples/uc/simple_ef.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 import sys
 import uc_funcs as uc
 import pyomo.environ as pyo

examples/uc/uc3wood.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # updated 23April2020
 # dlw August 2019: 3driver caller for the uc example; unix path names
 

examples/uc/uc4wood.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 ## includes fwph
 # updated 23April2020
 # dlw August 2019: 3driver caller for the uc example; unix path names

examples/uc/uc_ama.py

@@ -1,5 +1,3 @@
-# Copyright 2021 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 """
 An example of using amalgamator with 3 cylinders and one extension 
 To execute this:

examples/uc/uc_cylinders.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 
 # TBD: put in more options: threads, mipgaps for spokes
 

examples/uc/uc_ef.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 import sys
 import uc_funcs as uc
 import pyomo.environ as pyo

examples/uc/uc_funcs.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 
 # NOTE: this file has some "legacy" functions with wrappers
 #  (but it even has some legacy wrappers....)

examples/uc/uc_lshaped.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # general example driver for farmer with cylinders
 
 import uc_funcs as uc

mpi_one_sided_test.py

@@ -1,4 +1,3 @@
-# This software is distributed under the 3-clause BSD License.
 ''' Basic test script to make sure that the one-sided MPI calls work as
     intended. Runs on two processes. Will raise an assertion error if the
     Lock/Get/Unlock combination blocks. Otherwise, exits normally and produces

mpisppy/MPI.py

@@ -1,4 +1,3 @@
-# This software is distributed under the 3-clause BSD License.
 
 try:
     from mpi4py.MPI import *

mpisppy/__init__.py

@@ -1,6 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
-
 from pyomo.common.timing import TicTocTimer as _TTT
 # Register numpy types in Pyomo, see https://github.com/Pyomo/pyomo/issues/3091
 from pyomo.common.dependencies import numpy_available as _np_avail

mpisppy/confidence_intervals/__init__.py

@@ -1 +0,0 @@
-

mpisppy/confidence_intervals/ciutils.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # Utility functions for mmw, sequantial sampling and sample trees
 
 import os

mpisppy/confidence_intervals/mmw_ci.py

@@ -1,4 +1,3 @@
-# This software is distributed under the 3-clause BSD License.
 
 # Code to evaluate a given x-hat given as a nonant-cache, and the MMW confidence interval.
 

mpisppy/confidence_intervals/mmw_conf.py

@@ -1,4 +1,3 @@
-# This software is distributed under the 3-clause BSD License.
 
 # To test: (from confidence_intervals directory; assumes the npy file is in the farmer directory) 
 # python mmw_conf.py mpisppy/tests/examples/farmer.py --xhatpath ../../examples/farmer/farmer_root_nonants.npy --confidence-level 0.95 --EF-solver-name gurobi --MMW-num-batches 3 --MMW-batch-size 5