From 00fdf0166789286a83649485b864a2738aaa70d3 Mon Sep 17 00:00:00 2001 From: David Luevano <55825613+luevano@users.noreply.github.com> Date: Thu, 12 Dec 2019 04:26:29 -0700 Subject: Reformat matrices calculation --- main.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'main.py') diff --git a/main.py b/main.py index 4354e4063..31a12e7e8 100644 --- a/main.py +++ b/main.py @@ -63,27 +63,12 @@ printc('\tData reading took {:.4f} seconds.'.format(toc-tic), 'GREEN') # Go back to main folder. os.chdir(init_path) -printc('Coulomb Matrices calculation started.', 'CYAN') -tic = time.perf_counter() - +# Matrices calculation. cm_data = c_matrix_multiple(molecules, nuclear_charge, as_eig=True) - -toc = time.perf_counter() -printc('\tCoulomb matrices calculation took {:.4f} seconds.'.format(toc-tic), - 'GREEN') - -printc('L-J Matrices calculation started.', 'CYAN') -tic = time.perf_counter() - ljm_data = lj_matrix_multiple(molecules, nuclear_charge, as_eig=True) -toc = time.perf_counter() -printc('\tL-J matrices calculation took {:.4f} seconds.'.format(toc-tic), - 'GREEN') - -# Coulomb Matrix ML +# ML calculation. do_ml(cm_data, energy_pbe0, 1000, 100, sigma=1000.0, desc_type='CM') -# Lennard-Jones Matrix ML do_ml(ljm_data, energy_pbe0, 1000, 100, sigma=1000.0, desc_type='L-JM') # End of program -- cgit v1.2.3-70-g09d2