Commit 74df6285 authored by Jacob Davison's avatar Jacob Davison
Browse files

resolving merge conflicts

parent 5f5a4f2f
......@@ -435,12 +435,11 @@ def test_refs(plots_dir):
# print('{:2.4f} | {d}'.format(E_conv[i], d=refs_conv[i]))
if __name__ == '__main__':
#<<<<<<< Updated upstream
# test_refs('logs_refs\\')
#=======
#test_refs('logs_refs\\')
test = main(4,4)
# >>>>>>> Stashed changes
# test = main(4,4)
import os
print(os.environ)
# # test_exact('plots_exact\\')
# # print(ci_matrix.exact_diagonalization(1.0, 0.5,0.0))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment