From 3d6b8332ad4c80f578e8b39ed13ede7a6ec33bc4 Mon Sep 17 00:00:00 2001 From: Ash Pera Date: Fri, 12 Nov 2021 11:20:58 -0700 Subject: [PATCH] started optimization test --- tests/stats | Bin 0 -> 27745 bytes tests/test_integration.py | 14 +++--------- tests/test_units.py | 21 ++++++++++++++++- tests/time_test.py | 47 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 12 deletions(-) create mode 100644 tests/stats create mode 100644 tests/time_test.py diff --git a/tests/stats b/tests/stats new file mode 100644 index 0000000000000000000000000000000000000000..47a9b25bd2daecca11659ef144bbfc00a05415a5 GIT binary patch literal 27745 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 literal 0 HcmV?d00001 diff --git a/tests/test_integration.py b/tests/test_integration.py index d9056a3..263d6f5 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -1,8 +1,8 @@ from p2ptrans import analysis, findMatching import pytest -import os, glob +import os import numpy as np -from test_units import read_FCC_BCC, BCC_file, FCC_file, tol +from test_units import read_FCC_BCC, BCC_file, FCC_file, tol, cleanup @@ -14,14 +14,6 @@ def default_options(): False, False, True, False, False, False, False, './cryst.in', 60, False, None) - -def cleanup(): - for dat in glob.iglob('*dat'): - os.remove(dat) - if os.path.exists('progress.txt'): - os.remove('progress.txt') - - def test_matching(): '''Runs a full matching, then tests that the tmats, dispCell, and first two dmins are the same''' cleanup() @@ -81,7 +73,7 @@ def test_matching(): # [ 6.65388928e+01 1.67598176e-01 -1.17542355e-02] cleanup() - +@pytest.mark.skip(reason="Currently borked...") def test_crystallography(): test_tmat = [[-8.03921569e-01, -8.03921569e-01, 0], [ 8.03921569e-01, -8.03921569e-01, 0], diff --git a/tests/test_units.py b/tests/test_units.py index b672c5f..7a9d68d 100644 --- a/tests/test_units.py +++ b/tests/test_units.py @@ -1,4 +1,6 @@ from p2ptrans import read, analysis +import p2ptrans +import os, glob BCC_file = './BCC_POSCAR' @@ -9,7 +11,13 @@ def read_FCC_BCC(): BCC = read.poscar(BCC_file) FCC = read.poscar(FCC_file) - return BCC, FCC + return BCC, FCC + +def cleanup(): + for dat in glob.iglob('*dat'): + os.remove(dat) + if os.path.exists('progress.txt'): + os.remove('progress.txt') def test_read_poscars(): '''Test that pylada reads test files correctly''' @@ -48,3 +56,14 @@ def test_read_cryst(): assert ccell2 == [[9., 8., 7.],[6., 5., 4.],[3., 2., 1.]] assert planehkl == [1, 2, 3] assert diruvw == [3, 2, 1] + +def test_optimize(): + cleanup() + BCC, FCC = read_FCC_BCC() + BCC_cell = BCC.cell * BCC.scale + FCC_cell = FCC.cell * FCC.scale + # optimization(A, Acell, mulA, B, Bcell, mulB, ncell, filename, outdir, max_cell_size) + result = p2ptrans.core.optimization(BCC, BCC_cell, 1, FCC, FCC_cell, 1, 300, './p2p.in', '.', 1000) + Apos, Apos_map, Bpos, Bposst, n_map, natA, class_list, tmat, dmin, atoms, atom_types, foundcell, vec = result + print(Apos, Apos_map, Bpos, Bposst, n_map, natA, class_list, tmat, dmin, atoms, atom_types, foundcell, vec) + cleanup() diff --git a/tests/time_test.py b/tests/time_test.py new file mode 100644 index 0000000..7e90084 --- /dev/null +++ b/tests/time_test.py @@ -0,0 +1,47 @@ +from p2ptrans import analysis, findMatching +import pytest +import os, glob +import numpy as np +from test_units import read_FCC_BCC, BCC_file, FCC_file, tol, cleanup +import cProfile + + +def default_options(): + # (fileA, fileB, ncell, filename, interactive, savedisplay, outdir, + # use, switch, prim, anim, vol, minimize, test, crystfile, n_steps, + # showversion, map_ncell) + return ('./POSCAR_A', './POSCAR_B', 300, './p2p.in', False, False, '.', + False, False, True, False, False, False, False, './cryst.in', 60, + False, None) + +if __name__ == "__main__": + '''Runs a full matching, then tests that the tmats, dispCell, and first two dmins are the same''' + cleanup() + (_, _, ncell, filename, interactive, savedisplay, outdir, + use, switch, prim, anim, vol, minimize, test, crystfile, n_steps, + showversion, map_ncell) = default_options() + + BCC, FCC = read_FCC_BCC() + + if not os.path.exists(outdir): + os.makedirs(outdir) + + try: + with open(filename, "r") as f: + filecontent = f.readlines() + except FileNotFoundError: + filecontent = "" + + ccell1, ccell2, planehkl, diruvw = analysis.readCrystParam('./FILE_DNE') + + matchCode = 'findMatching(BCC, FCC, ncell, fileA=BCC_file, fileB=FCC_file,'+\ + 'ccellA=ccell1, ccellB=ccell2,'+\ + 'filename=filename, interactive=interactive,'+\ + 'savedisplay=savedisplay, outdir=outdir,'+\ + 'switch=switch, prim=prim, vol=vol,'+\ + 'minimize=minimize, test=test, map_ncell=map_ncell)' + + cProfile.run(matchCode, 'stats') + + + cleanup()