summaryrefslogtreecommitdiff
path: root/ml_exp/__main__.py
diff options
context:
space:
mode:
authorDavid Luevano <55825613+luevano@users.noreply.github.com>2020-02-01 13:55:06 -0700
committerDavid Luevano <55825613+luevano@users.noreply.github.com>2020-02-01 13:55:06 -0700
commitcf88764c4571cdb6dec2c69fb14288adf377c0e3 (patch)
tree1ef9c85dd2518c2235fcfd59b594b4c6b7be7b7a /ml_exp/__main__.py
parent07673b8a28674a5d670f9da4b5c3014bc7855cb9 (diff)
Add bag of k_cx and fix bug on adj_matrix.py
Diffstat (limited to 'ml_exp/__main__.py')
-rw-r--r--ml_exp/__main__.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/ml_exp/__main__.py b/ml_exp/__main__.py
index 9b4a18cc3..a1f2f0030 100644
--- a/ml_exp/__main__.py
+++ b/ml_exp/__main__.py
@@ -23,9 +23,10 @@ SOFTWARE.
# from ml_exp.do_ml import do_ml
# from ml_exp.misc import plot_benchmarks
from ml_exp.read_qm7_data import read_qm7_data
-# from ml_exp.adj_matrix import fneig_matrix, adj_matrix
+from ml_exp.adj_matrix import fneig_matrix, adj_matrix
from ml_exp.c_matrix import c_matrix
from ml_exp.bob import bob
+from ml_exp.bostuff import bok_cx
if __name__ == '__main__':
"""
@@ -58,5 +59,13 @@ if __name__ == '__main__':
for i in range(1):
cm = c_matrix(xyz[i], nc[i], as_eig=False)
bob = bob(cm, atoms[i])
+
print(f'{i} coulomb matrix\n{cm}')
print(f'{i} bag of bonds\n{bob}')
+
+ fnm, bonds = fneig_matrix(atoms[i], xyz[i], nc[i], False)
+ am = adj_matrix(fnm, bonds, None)
+ bok_cx = bok_cx(am, atoms[i])
+
+ print(f'{i} adjacency matrix\n{am}')
+ print(f'{i} bag of k_cx\n{bok_cx}')