Latex renders circuits incorrectly

[pboyle1960]

Pre-Report Checklist

• I am running the latest versions of pyQuil and the Forest SDK
• I checked to make sure that this bug has not already been reported

Issue Description

When running the code in the attached example notebook incorrect circuit renderings result.

Problem 1:
SITUATION: a 2-qubit gate acts on qubits that are not given in increasing order, such as XY(np.pi,2,1)
BUG DESCRIPTION: the gate will connect the wrong gates (see the first code snippet below).

Problem 2:
SITUATION: circuit includes CPHASE
BUG DESCRIPTION: CPHASE is not correctly represented (see the second code snippet below).

How to Reproduce

Please see the code snippets below.

Please also see notebook sandbox.ipynb in attached sandbox.zip.

Please also see attached output draw_circuit.pdf.

Code Snippets

from pyquil.quil import Pragma, Program
from pyquil.gates import CNOT, H, XY, CPHASE, I
from pyquil import latex

import numpy as np

p = Program()
p  += XY(0.1,2,1)
p +=XY(0.2,2,3)

print(p)

print(latex.to_latex(p)) 

from pyquil.quil import Pragma, Program
from pyquil.gates import CNOT, H, XY, CPHASE, I
from pyquil import latex

import numpy as np

p = Program()
p  += CPHASE(0.1,1,2)

print(p)

print(latex.to_latex(p))

sandbox.zip
draw_circuit.pdf

[kalzoo]

v4 tag because we need to ensure that this is working ahead of the v4.0.0 release

This is not what this has come to mean. We may in fact target this fix for v3