diff options
| author | David Luevano Alvarado <55825613+luevano@users.noreply.github.com> | 2020-03-09 21:26:48 -0700 |
|---|---|---|
| committer | David Luevano Alvarado <55825613+luevano@users.noreply.github.com> | 2020-03-09 21:26:48 -0700 |
| commit | b54d8570a1cc78a49751c39842d20a23527c9657 (patch) | |
| tree | 5d2aefda538c1aefa39869e137ccb99a5c53c6a0 | |
| parent | 989a8a17e6aa6256e1501256f86ad3a330aae800 (diff) | |
CM O(n(n/2)+1) to O(n+1)
| -rw-r--r-- | ml_exp/representations.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ml_exp/representations.py b/ml_exp/representations.py index 761e263d4..6a8cfcaf1 100644 --- a/ml_exp/representations.py +++ b/ml_exp/representations.py @@ -57,14 +57,15 @@ size. Arrays are not of the right shape.') # Actual calculation of the coulomb matrix. for i in range(n): - for j in range(i, n): - if i==j: - cm[i, i] = 0.5*nc[i]**2.4 - else: - rv = coords[i] - coords[j] - r = np.linalg.norm(rv)/cr - cm[i, j] = nc[i]*nc[j]/r - cm[j, i] = cm[i, j] + cm[i, i] = 0.5*nc[i]**2.4 + + # Calculates the values row-wise for faster timings. + for i in range(n): + rv = coords[i + 1:] - coords[i] + r = np.linalg.norm(rv, axis=1)/cr + val = nc[i]*nc[i +1:]/r + cm[i, i + 1:n] = val + cm[i + 1:n, i] = val # Now the value will be returned. if as_eig: |