Changeset 3156


Ignore:
Timestamp:
Oct 25, 2010 12:19:44 AM (10 years ago)
Author:
jwatson
Message:

Correcting shift from "integer" to "general" variable blocks when writing the LP file for an extensive form.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • coopr.pysp/trunk/coopr/pysp/ef.py

    r3155 r3156  
    456456   if integers_present(binding_instance, scenario_instances) is True:
    457457
    458       print >>output_file, "integer"
     458      print >>output_file, "general"
    459459      print >>output_file, ""
    460460
    461       print >>output_file, "\\ Begin integer variable block for master"
     461      print >>output_file, "\\ Begin discrete variable block for master"
    462462      problem_writer._print_model_LP(binding_instance, output_file)
    463       print >>output_file, "\\ End integer variable block for master"
     463      print >>output_file, "\\ End discrete variable block for master"
    464464      print >>output_file, ""
    465465   
    466466      for scenario_name in scenario_instances.keys():
    467467         instance = scenario_instances[scenario_name]
    468          print >>output_file, "\\ Begin integer variable block for scenario",scenario_name
     468         print >>output_file, "\\ Begin discrete variable block for scenario",scenario_name
    469469         problem_writer._print_model_LP(instance, output_file)
    470          print >>output_file, "\\ End integer variable block for scenario",scenario_name
     470         print >>output_file, "\\ End discrete variable block for scenario",scenario_name
    471471         print >>output_file, ""
    472472
Note: See TracChangeset for help on using the changeset viewer.