summaryrefslogtreecommitdiff
path: root/lj_matrix
diff options
context:
space:
mode:
authorDavid Luevano <55825613+luevano@users.noreply.github.com>2019-12-18 09:53:44 -0700
committerDavid Luevano <55825613+luevano@users.noreply.github.com>2019-12-18 09:53:44 -0700
commita50d424d0ab7dd4cc6a2d6fc94371fa65a0d89b2 (patch)
treea95b14a3f0620909139c9e0a7b20a25633d2adef /lj_matrix
parent124c3c5eb77c807b8a8a78413f3800720914c8e1 (diff)
Fix test issues
Diffstat (limited to 'lj_matrix')
-rw-r--r--lj_matrix/__init__.py27
-rw-r--r--lj_matrix/__main__.py10
-rw-r--r--lj_matrix/c_matrix.py2
-rw-r--r--lj_matrix/do_ml.py6
-rw-r--r--lj_matrix/gauss_kernel.py2
-rw-r--r--lj_matrix/lj_matrix.py2
-rw-r--r--lj_matrix/read_qm7_data.py2
7 files changed, 26 insertions, 25 deletions
diff --git a/lj_matrix/__init__.py b/lj_matrix/__init__.py
index 47d7e5013..5019bd51d 100644
--- a/lj_matrix/__init__.py
+++ b/lj_matrix/__init__.py
@@ -20,26 +20,27 @@ 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 misc import printc
-from read_qm7_data import read_qm7_data, read_nc_data, reas_db_data
-from c_matrix import c_matrix, c_matrix_multiple
-from cholesky_solve import cholesky_solve
-from do_ml import do_ml
-from frob_norm import frob_norm
-from gauss_kernel import gauss_kernel
-from lj_matrix import lj_matrix, lj_matrix_multiple
+from lj_matrix.misc import printc
+from lj_matrix.read_qm7_data import read_nc_data, reas_db_data, read_qm7_data
+from lj_matrix.c_matrix import c_matrix, c_matrix_multiple
+from lj_matrix.lj_matrix import lj_matrix, lj_matrix_multiple
+from lj_matrix.frob_norm import frob_norm
+from lj_matrix.gauss_kernel import gauss_kernel
+from lj_matrix.cholesky_solve import cholesky_solve
+from lj_matrix.do_ml import do_ml
+
# If somebody does "from package import *", this is what they will
# be able to access:
__all__ = ['printc',
- 'read_qm7_data',
'read_nc_data',
'reas_db_data',
+ 'read_qm7_data',
'c_matrix',
'c_matrix_multiple',
- 'cholesky_solve',
- 'do_ml',
+ 'lj_matrix',
+ 'lj_matrix_multiple',
'frob_norm',
'gauss_kernel',
- 'lj_matrix',
- 'lj_matrix_multiple']
+ 'cholesky_solve',
+ 'do_ml']
diff --git a/lj_matrix/__main__.py b/lj_matrix/__main__.py
index 5a0e95b94..0b2a7c6f8 100644
--- a/lj_matrix/__main__.py
+++ b/lj_matrix/__main__.py
@@ -24,11 +24,11 @@ import time
from multiprocessing import Process, Pipe
# import matplotlib.pyplot as plt
import pandas as pd
-from misc import printc
-from read_qm7_data import read_qm7_data
-from c_matrix import c_matrix_multiple
-from lj_matrix import lj_matrix_multiple
-from do_ml import do_ml
+from lj_matrix.misc import printc
+from lj_matrix.read_qm7_data import read_qm7_data
+from lj_matrix.c_matrix import c_matrix_multiple
+from lj_matrix.lj_matrix import lj_matrix_multiple
+from lj_matrix.do_ml import do_ml
# Test
diff --git a/lj_matrix/c_matrix.py b/lj_matrix/c_matrix.py
index 4de711a1b..f21ccfd8c 100644
--- a/lj_matrix/c_matrix.py
+++ b/lj_matrix/c_matrix.py
@@ -21,10 +21,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
"""
import time
-from misc import printc
import math
import numpy as np
from numpy.linalg import eig
+from lj_matrix.misc import printc
def c_matrix(mol_data,
diff --git a/lj_matrix/do_ml.py b/lj_matrix/do_ml.py
index c88533e68..ba88a6fd8 100644
--- a/lj_matrix/do_ml.py
+++ b/lj_matrix/do_ml.py
@@ -21,10 +21,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
"""
import time
-from misc import printc
import numpy as np
-from gauss_kernel import gauss_kernel
-from cholesky_solve import cholesky_solve
+from lj_matrix.misc import printc
+from lj_matrix.gauss_kernel import gauss_kernel
+from lj_matrix.cholesky_solve import cholesky_solve
def do_ml(desc_data,
diff --git a/lj_matrix/gauss_kernel.py b/lj_matrix/gauss_kernel.py
index 0dfc65d59..5dd8e6406 100644
--- a/lj_matrix/gauss_kernel.py
+++ b/lj_matrix/gauss_kernel.py
@@ -22,7 +22,7 @@ SOFTWARE.
"""
import math
import numpy as np
-from frob_norm import frob_norm
+from lj_matrix.frob_norm import frob_norm
def gauss_kernel(X_1, X_2, sigma):
diff --git a/lj_matrix/lj_matrix.py b/lj_matrix/lj_matrix.py
index 2a8e0d956..2a56a3cdf 100644
--- a/lj_matrix/lj_matrix.py
+++ b/lj_matrix/lj_matrix.py
@@ -21,10 +21,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
"""
import time
-from misc import printc
import math
import numpy as np
from numpy.linalg import eig
+from lj_matrix.misc import printc
def lj_matrix(mol_data,
diff --git a/lj_matrix/read_qm7_data.py b/lj_matrix/read_qm7_data.py
index 068ea1a42..b54691fb0 100644
--- a/lj_matrix/read_qm7_data.py
+++ b/lj_matrix/read_qm7_data.py
@@ -24,7 +24,7 @@ import os
import time
import numpy as np
import random
-from misc import printc
+from lj_matrix.misc import printc
# 'periodic_table_of_elements.txt' retrieved from