summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Luevano <55825613+luevano@users.noreply.github.com>2020-01-23 18:59:34 -0700
committerDavid Luevano <55825613+luevano@users.noreply.github.com>2020-01-23 18:59:34 -0700
commit6e9b439d4b3d303b246d9e66b3ed3852e3fad9a5 (patch)
treee9c04b1af5552fc149f26553e7e53735f57cf435
parent5a48f2e69e301875c7d86f40ae1dab5d27f7fd0f (diff)
Rename lj_matrix to ml_exp
-rw-r--r--ml_exp/__init__.py (renamed from lj_matrix/__init__.py)18
-rw-r--r--ml_exp/__main__.py (renamed from lj_matrix/__main__.py)4
-rw-r--r--ml_exp/c_matrix.py (renamed from lj_matrix/c_matrix.py)2
-rw-r--r--ml_exp/cholesky_solve.py (renamed from lj_matrix/cholesky_solve.py)0
-rw-r--r--ml_exp/do_ml.py (renamed from lj_matrix/do_ml.py)10
-rw-r--r--ml_exp/frob_norm.py (renamed from lj_matrix/frob_norm.py)0
-rw-r--r--ml_exp/gauss_kernel.py (renamed from lj_matrix/gauss_kernel.py)2
-rw-r--r--ml_exp/lj_matrix.py (renamed from lj_matrix/lj_matrix.py)2
-rw-r--r--ml_exp/misc.py (renamed from lj_matrix/misc.py)0
-rw-r--r--ml_exp/parallel_create_matrices.py (renamed from lj_matrix/parallel_create_matrices.py)4
-rw-r--r--ml_exp/read_qm7_data.py (renamed from lj_matrix/read_qm7_data.py)2
-rw-r--r--ml_exp/version.py (renamed from lj_matrix/version.py)0
-rw-r--r--test/test_c_matrix.py2
13 files changed, 23 insertions, 23 deletions
diff --git a/lj_matrix/__init__.py b/ml_exp/__init__.py
index a430aac68..06425f6a2 100644
--- a/lj_matrix/__init__.py
+++ b/ml_exp/__init__.py
@@ -20,15 +20,15 @@ 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 lj_matrix.read_qm7_data import read_nc_data, read_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
-from lj_matrix.parallel_create_matrices import parallel_create_matrices
-from lj_matrix.misc import plot_benchmarks
+from ml_exp.read_qm7_data import read_nc_data, read_db_data, read_qm7_data
+from ml_exp.c_matrix import c_matrix, c_matrix_multiple
+from ml_exp.lj_matrix import lj_matrix, lj_matrix_multiple
+from ml_exp.frob_norm import frob_norm
+from ml_exp.gauss_kernel import gauss_kernel
+from ml_exp.cholesky_solve import cholesky_solve
+from ml_exp.do_ml import do_ml
+from ml_exp.parallel_create_matrices import parallel_create_matrices
+from ml_exp.misc import plot_benchmarks
# If somebody does "from package import *", this is what they will
diff --git a/lj_matrix/__main__.py b/ml_exp/__main__.py
index 688e5adcc..167f0fa7b 100644
--- a/lj_matrix/__main__.py
+++ b/ml_exp/__main__.py
@@ -20,8 +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 lj_matrix.do_ml import do_ml
-# from lj_matrix.misc import plot_benchmarks
+from ml_exp.do_ml import do_ml
+# from ml_exp.misc import plot_benchmarks
if __name__ == '__main__':
do_ml(min_training_size=1500,
diff --git a/lj_matrix/c_matrix.py b/ml_exp/c_matrix.py
index f21ccfd8c..00034a660 100644
--- a/lj_matrix/c_matrix.py
+++ b/ml_exp/c_matrix.py
@@ -24,7 +24,7 @@ import time
import math
import numpy as np
from numpy.linalg import eig
-from lj_matrix.misc import printc
+from ml_exp.misc import printc
def c_matrix(mol_data,
diff --git a/lj_matrix/cholesky_solve.py b/ml_exp/cholesky_solve.py
index bc6a572a3..bc6a572a3 100644
--- a/lj_matrix/cholesky_solve.py
+++ b/ml_exp/cholesky_solve.py
diff --git a/lj_matrix/do_ml.py b/ml_exp/do_ml.py
index 25a55e823..ebb0e505f 100644
--- a/lj_matrix/do_ml.py
+++ b/ml_exp/do_ml.py
@@ -23,11 +23,11 @@ SOFTWARE.
import time
import numpy as np
from multiprocessing import Process, Pipe
-from lj_matrix.misc import printc
-from lj_matrix.gauss_kernel import gauss_kernel
-from lj_matrix.cholesky_solve import cholesky_solve
-from lj_matrix.read_qm7_data import read_qm7_data
-from lj_matrix.parallel_create_matrices import parallel_create_matrices
+from ml_exp.misc import printc
+from ml_exp.gauss_kernel import gauss_kernel
+from ml_exp.cholesky_solve import cholesky_solve
+from ml_exp.read_qm7_data import read_qm7_data
+from ml_exp.parallel_create_matrices import parallel_create_matrices
def ml(desc_data,
diff --git a/lj_matrix/frob_norm.py b/ml_exp/frob_norm.py
index 4c3a2945d..4c3a2945d 100644
--- a/lj_matrix/frob_norm.py
+++ b/ml_exp/frob_norm.py
diff --git a/lj_matrix/gauss_kernel.py b/ml_exp/gauss_kernel.py
index 5dd8e6406..834d62408 100644
--- a/lj_matrix/gauss_kernel.py
+++ b/ml_exp/gauss_kernel.py
@@ -22,7 +22,7 @@ SOFTWARE.
"""
import math
import numpy as np
-from lj_matrix.frob_norm import frob_norm
+from ml_exp.frob_norm import frob_norm
def gauss_kernel(X_1, X_2, sigma):
diff --git a/lj_matrix/lj_matrix.py b/ml_exp/lj_matrix.py
index 6739ae283..549790755 100644
--- a/lj_matrix/lj_matrix.py
+++ b/ml_exp/lj_matrix.py
@@ -24,7 +24,7 @@ import time
import math
import numpy as np
from numpy.linalg import eig
-from lj_matrix.misc import printc
+from ml_exp.misc import printc
def lj_matrix(mol_data,
diff --git a/lj_matrix/misc.py b/ml_exp/misc.py
index e9142b05f..e9142b05f 100644
--- a/lj_matrix/misc.py
+++ b/ml_exp/misc.py
diff --git a/lj_matrix/parallel_create_matrices.py b/ml_exp/parallel_create_matrices.py
index cd5ef5c8e..a68122d48 100644
--- a/lj_matrix/parallel_create_matrices.py
+++ b/ml_exp/parallel_create_matrices.py
@@ -21,8 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
"""
from multiprocessing import Process, Pipe
-from lj_matrix.c_matrix import c_matrix_multiple
-from lj_matrix.lj_matrix import lj_matrix_multiple
+from ml_exp.c_matrix import c_matrix_multiple
+from ml_exp.lj_matrix import lj_matrix_multiple
def parallel_create_matrices(mol_data,
diff --git a/lj_matrix/read_qm7_data.py b/ml_exp/read_qm7_data.py
index 4401ca1c0..51c0eaee7 100644
--- a/lj_matrix/read_qm7_data.py
+++ b/ml_exp/read_qm7_data.py
@@ -24,7 +24,7 @@ import os
import time
import numpy as np
import random
-from lj_matrix.misc import printc
+from ml_exp.misc import printc
# 'periodic_table_of_elements.txt' retrieved from
diff --git a/lj_matrix/version.py b/ml_exp/version.py
index fab58433d..fab58433d 100644
--- a/lj_matrix/version.py
+++ b/ml_exp/version.py
diff --git a/test/test_c_matrix.py b/test/test_c_matrix.py
index a8bb5ae34..300ba869e 100644
--- a/test/test_c_matrix.py
+++ b/test/test_c_matrix.py
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
"""
import unittest
-from lj_matrix.c_matrix import c_matrix
+from ml_exp.c_matrix import c_matrix
class TestCMatrix(unittest.TestCase):