Changeset 2930
 Timestamp:
 Aug 14, 2010 5:20:11 PM (9 years ago)
 Location:
 coopr.pyomo/trunk/coopr/pyomo
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

coopr.pyomo/trunk/coopr/pyomo/preprocess/compute_canonical_repn.py
r2648 r2930 22 22 """ 23 23 This plugin computes the canonical representation for 24 all objectives and constraints 25 linear terms. 24 all objectives and constraints linear terms. 26 25 """ 27 26 … … 39 38 The main routine to perform the preprocess 40 39 """ 40 if getattr(model,'skip_canonical_repn',False): 41 return model 41 42 # 42 43 # Objectives 
coopr.pyomo/trunk/coopr/pyomo/scripting/util.py
r2883 r2930 96 96 raise ValueError, msg % options.tempdir 97 97 TempfileManager.tempdir = options.tempdir 98 #99 # Disable canonical repn for ASL solvers100 #101 if hasattr(options, 'solver') and options.solver == "asl":102 options.skip_canonical_repn = True103 98 104 99 # … … 253 248 ep.apply( options=options, model=model ) 254 249 255 # ToDo: CDL This may not be the right place for this 250 # 251 # Disable canonical repn for ASL solvers 252 # 256 253 # Likely we need to change the framework so that canonical repn 257 254 # is not assumed to be required by all solvers? 258 # For now... 259 if hasattr(options, 'skip_canonical_repn') and options.skip_canonical_repn == True: 260 if 'simple_preprocessor' in model._preprocessors: 261 model.preprocessor_ep.service('simple_preprocessor').deactivate_action('compute_canonical_repn') 255 # 256 if hasattr(options, 'solver') and options.solver == "asl": 257 model.skip_canonical_repn = True 262 258 263 259 #
Note: See TracChangeset
for help on using the changeset viewer.