Changeset 9475


Ignore:
Timestamp:
Dec 14, 2014 1:15:19 AM (5 years ago)
Author:
wehart
Message:

Updating the version #.

Renaming transformations to 'base.*' if they didn't have a specific
naming. NOTE: these are in the pyomo.core package ... which seems
odd. But we agreed that 'core' provides a connotation that we don't
intend.

Adding some documentation changes for 'pyomo help -t'.

Location:
pyomo/trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • pyomo/trunk/CHANGELOG.txt

    r9269 r9475  
    44
    55-------------------------------------------------------------------------------
    6 Pyomo 3.6
     6Pyomo 4.0
    77-------------------------------------------------------------------------------
    88
  • pyomo/trunk/pyomo/core/plugins/transform/dual_transformation.py

    r9247 r9475  
    2222    """
    2323
    24     alias("linear_dual", doc="Create the LP dual model.")
     24    alias("base.lagrangian_dual", doc="Create the LP dual model.")
    2525
    2626    def __init__(self, **kwds):
  • pyomo/trunk/pyomo/core/plugins/transform/eliminate_fixed_vars.py

    r9247 r9475  
    2121    """
    2222
    23     alias('remove_fixed_vars', doc="Create an equivalent model that omits all fixed variables.")
     23    alias('base.remove_fixed_vars', doc="Create an equivalent model that omits all fixed variables.")
    2424
    2525    def __init__(self, **kwds):
  • pyomo/trunk/pyomo/core/plugins/transform/equality_transform.py

    r9247 r9475  
    1414    """
    1515
    16     alias("add_slack_vars", doc="Create an equivalent model by introducing slack variables to eliminate inequality constraints.")
     16    alias("base.add_slack_vars", doc="Create an equivalent model by introducing slack variables to eliminate inequality constraints.")
    1717
    1818    def __init__(self, **kwds):
  • pyomo/trunk/pyomo/core/plugins/transform/linear_dual.py

    r9252 r9475  
    3131class LinearDual_PyomoTransformation(Transformation):
    3232
    33     alias('pyomo.linear_dual', doc="Dualize a linear model")
     33    alias('base.linear_dual', doc="Dualize a linear model")
    3434
    3535    def __init__(self):
  • pyomo/trunk/pyomo/core/plugins/transform/nonnegative_transform.py

    r9247 r9475  
    2020    """
    2121
    22     alias("nonnegative_vars", doc="Create an equivalent model in which all variables lie in the nonnegative orthant.")
     22    alias("base.nonnegative_vars", doc="Create an equivalent model in which all variables lie in the nonnegative orthant.")
    2323
    2424    def __init__(self, **kwds):
  • pyomo/trunk/pyomo/core/plugins/transform/radix_linearization.py

    r9247 r9475  
    3131    """
    3232
    33     alias( "radix_linearization",
     33    alias( "base.radix_linearization",
    3434           doc="Linearize bilinear and quadratic terms through "
    3535           "radix discretization (multiparametric disaggregation)" )
  • pyomo/trunk/pyomo/core/plugins/transform/relax_integrality.py

    r9247 r9475  
    2020    """
    2121
    22     alias('relax_integrality', "Create a model where integer variables are replaced with real variables.")
     22    alias('base.relax_integrality', "Create a model where integer variables are replaced with real variables.")
    2323
    2424    def __init__(self, **kwds):
  • pyomo/trunk/pyomo/core/plugins/transform/standard_form.py

    r9247 r9475  
    2727    """
    2828
    29     alias("standard_form", doc="Create an equivalent LP model in standard form.")
     29    alias("base.standard_form", doc="Create an equivalent LP model in standard form.")
    3030
    3131    def __init__(self, **kwds):
  • pyomo/trunk/pyomo/scripting/driver_help.py

    r9445 r9475  
    168168    wrapper.subsequent_indent = '      '
    169169    print("")
     170    print("Pyomo Model Transformations")
     171    print("---------------------------")
    170172    for xform in sorted(TransformationFactory.services()):
    171173        print("  "+xform)
  • pyomo/trunk/pyomo/version/__init__.py

    r9242 r9475  
    2323# The micro number should be set when tagging a release or generating a
    2424# VOTD build
    25 _major=3
    26 _minor=6
     25_major=4
     26_minor=0
    2727_micro=0
    2828_releaselevel='invalid'
  • pyomo/trunk/setup.py

    r9390 r9475  
    5555      #       VOTD + Final releases will have major.minor.revnum
    5656      # When cutting a release, ALSO update _major/_minor/_micro in
    57       #   pyomo/pyomo/__init__.py
     57      #   pyomo/pyomo/version/__init__.py
    5858      #   pyomo/RELEASE.txt
    59       version='3.6',
     59      version='4.0',
    6060      maintainer='William E. Hart',
    6161      maintainer_email='wehart@sandia.gov',
Note: See TracChangeset for help on using the changeset viewer.