fixed canonicalization to match grant's thesis, added containers for variables and constants, and added dual variable values