Changeset 2883


Ignore:
Timestamp:
Jul 29, 2010 2:33:46 PM (9 years ago)
Author:
claird
Message:

Fixed typos in util related to disabling the creation of the canonical representation

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

Legend:

Unmodified
Added
Removed
  • coopr.pyomo/trunk/coopr/pyomo/scripting/util.py

    r2882 r2883  
    9999    # Disable canonical repn for ASL solvers
    100100    #
    101     if hasattr(options, 'solve') and options.solver == "asl":
     101    if hasattr(options, 'solver') and options.solver == "asl":
    102102        options.skip_canonical_repn = True
    103103
     
    257257    # is not assumed to be required by all solvers?
    258258    # For now...
    259     if hasattr(options, 'skip_canonical_rep') and options.skip_canonical_repn == True:
     259    if hasattr(options, 'skip_canonical_repn') and options.skip_canonical_repn == True:
    260260        if 'simple_preprocessor' in model._preprocessors:
    261261            model.preprocessor_ep.service('simple_preprocessor').deactivate_action('compute_canonical_repn')
  • coopr.pyomo/trunk/coopr/pyomo/tests/NL/CUTE/testCUTE.py

    r2882 r2883  
    4040    def test_cute(self):
    4141        """ testing CUTE suite """
    42         skip_files = ('brownden', 'drcav3lq','dtoc1l','gigomez1','hager3','fletcher','fletchbv','makela2', 'makela4', 'mifflin1', 'ncvxbqp1','polak1', 'rosenbr','srosenbr','tridia', 'zy2')
     42        skip_files = ('aircrfta', 'brownden', 'drcav3lq','dtoc1l','gigomez1','hager3','fletcher','fletchbv','makela2', 'makela4', 'mifflin1', 'ncvxbqp1','polak1', 'rosenbr','srosenbr','tridia', 'zy2')
    4343        single_test = None
    4444
Note: See TracChangeset for help on using the changeset viewer.