Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch position_vector/momentum_vector to Grid #50

Merged
merged 16 commits into from
May 23, 2017

Conversation

Strilanc
Copy link
Collaborator

@Strilanc Strilanc commented May 22, 2017

Comes after #48

… u/cg/minor-M

# Conflicts:
#	src/fermilib/utils/_jellium.py
#	src/fermilib/utils/_jellium_test.py
#	src/fermilib/utils/_plane_wave_hamiltonian.py
… u/cg/minor-J

# Conflicts:
#	src/fermilib/utils/_jellium.py
#	src/fermilib/utils/_jellium_test.py
… u/cg/minor-J

# Conflicts:
#	src/fermilib/utils/_jellium_test.py
@Strilanc Strilanc changed the title [Blocked] Switch momentum_vector to Grid [Blocked] Switch position_vector/momentum_vector to Grid May 23, 2017
@Strilanc Strilanc changed the title [Blocked] Switch position_vector/momentum_vector to Grid Switch position_vector/momentum_vector to Grid May 23, 2017
@babbush babbush merged commit 9f0084a into ProjectQ-Framework:develop May 23, 2017
@Strilanc Strilanc deleted the u/cg/minor-M branch May 23, 2017 00:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants