Ignore:
Timestamp:
Dec 29, 2009 5:16:16 PM (10 years ago)
Author:
wehart
Message:

Misc rework of variable presolving. Now, model
statistics are stored in a more obvious location, and using more
verbose names.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • coopr.pyomo/trunk/coopr/pyomo/io/ampl.py

    r1992 r2064  
    128128        # LINE 2
    129129        #
    130         print >>OUTPUT, " " + str(model.vnum), nc, no, nrange, str(neqn) +\
     130        print >>OUTPUT, " " + str(model.statistics.number_of_variables), nc, no, nrange, str(neqn) +\
    131131                "\t# vars, constraints, objectives, ranges, eqns"
    132132        #
     
    165165        # LINE 8
    166166        #
    167         nsno = model.vnum
     167        nsno = model.statistics.number_of_variables
    168168        ngc = ngo = 0
    169169        for key in Obj:
     
    294294        # "k" lines
    295295        #
    296         n1 = model.vnum - 1
     296        n1 = model.statistics.number_of_variables - 1
    297297        print >>OUTPUT, "k" + str(n1)
    298298        ktot = 0
Note: See TracChangeset for help on using the changeset viewer.