diff options
| author | David Luevano Alvarado <55825613+luevano@users.noreply.github.com> | 2020-02-23 21:07:54 -0700 |
|---|---|---|
| committer | David Luevano Alvarado <55825613+luevano@users.noreply.github.com> | 2020-02-23 21:07:54 -0700 |
| commit | 54e69de6126afb321c0ea575ede595347ffc121c (patch) | |
| tree | d692421977e1ef21929ff3068b485da33ac5b387 | |
| parent | db47ff8606b14e4cdddc0e317972c3515b9c788b (diff) | |
Add fnm and am to init
| -rw-r--r-- | ml_exp/__init__.py | 7 | ||||
| -rw-r--r-- | ml_exp/__main__.py | 12 |
2 files changed, 7 insertions, 12 deletions
diff --git a/ml_exp/__init__.py b/ml_exp/__init__.py index f5ec7068b..d81f0999a 100644 --- a/ml_exp/__init__.py +++ b/ml_exp/__init__.py @@ -21,10 +21,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ from ml_exp.compound import Compound -from ml_exp.representations import coulomb_matrix, lennard_jones_matrix +from ml_exp.representations import coulomb_matrix, lennard_jones_matrix,\ + first_neighbor_matrix, adjacency_matrix # If somebody does "from package import *", this is what they will # be able to access: __all__ = ['Compound', 'coulomb_matrix', - 'lennard_jones_matrix'] + 'lennard_jones_matrix', + 'first_neighbor_matrix', + 'adjacency_matrix'] diff --git a/ml_exp/__main__.py b/ml_exp/__main__.py index 124ce8cd9..44b492103 100644 --- a/ml_exp/__main__.py +++ b/ml_exp/__main__.py @@ -20,16 +20,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ -from ml_exp.compound import Compound +# from ml_exp.compound import Compound if __name__ == '__main__': - print('Initialize test') - mol_name = '/home/luevano/py/ml_exp/data/qm7/0004.xyz' - mol = Compound(mol_name) - mol.gen_cm(size=1, as_eig=False) - mol.gen_ljm(size=1, as_eig=False) - mol.gen_am(size=1) - - print(mol.n, mol.atoms, mol.atoms_nc) - print(mol.am) + print('OK!') |