Changeset 2869


Ignore:
Timestamp:
Jul 28, 2010 11:24:00 AM (9 years ago)
Author:
prsteel
Message:

Updates to Var and NonNegativeTransformation? objects. Var objects were
failing on some bounds checks, and NonNegativeTransformation? objects
had a scoping issue.

Location:
coopr.pyomo/trunk/coopr/pyomo
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • coopr.pyomo/trunk/coopr/pyomo/base/var.py

    r2858 r2869  
    127127        by using the domain.
    128128        """
    129         dbounds = self.domain.bounds()
     129        try:
     130            dbounds = self.domain.bounds()
     131        except:
     132            # No explicit domain bounds
     133            return
    130134
    131135        if self.lb is None or \
  • coopr.pyomo/trunk/coopr/pyomo/transform/nonnegative_transform.py

    r2861 r2869  
    297297            nonneg.__setattr__(conName,
    298298                               Constraint(nonneg.__getattribute__(sname),
    299                                           rule=self._partial(exprMapRule, ruleMap)))
     299                                          rule=self._partial(self.exprMapRule, ruleMap)))
    300300
    301301        # Make the bounds constraints
     
    310310                conName,
    311311                Constraint(nonneg.__getattribute__(sname),
    312                            rule=self._partial(self.delayedExprMapRule,
    313                                               ruleMap)))
     312                           rule=self._partial(self.delayedExprMapRule, ruleMap)))
    314313
    315314        # Make the objectives
Note: See TracChangeset for help on using the changeset viewer.