rsspolymlp 0.4.7__tar.gz → 0.4.8__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (81) hide show
  1. {rsspolymlp-0.4.7/src/rsspolymlp.egg-info → rsspolymlp-0.4.8}/PKG-INFO +1 -1
  2. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/pyproject.toml +1 -1
  3. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/rss_summarize.py +7 -6
  4. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/struct_matcher/niggli_reduce.py +28 -23
  5. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8/src/rsspolymlp.egg-info}/PKG-INFO +1 -1
  6. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/LICENSE +0 -0
  7. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/README.md +0 -0
  8. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/setup.cfg +0 -0
  9. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/__init__.py +0 -0
  10. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/__init__.py +0 -0
  11. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/eos.py +0 -0
  12. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/ghost_minima.py +0 -0
  13. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/phase_analysis.py +0 -0
  14. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/struct_matcher/__init__.py +0 -0
  15. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/struct_matcher/assignment_algo.py +0 -0
  16. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/struct_matcher/chiral_spg.py +0 -0
  17. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/struct_matcher/dataclass.py +0 -0
  18. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/struct_matcher/gen_struct_rep.py +0 -0
  19. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/struct_matcher/identify_uniqstr.py +0 -0
  20. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/struct_matcher/position_redrep.py +0 -0
  21. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/struct_matcher/primitive_transform.py +0 -0
  22. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/struct_matcher/struct_match.py +0 -0
  23. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/struct_matcher/test/gen_rand_lattice.py +0 -0
  24. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/struct_matcher/test/gen_rand_position.py +0 -0
  25. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/analysis/utils/convert_data_format.py +0 -0
  26. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/api/__init__.py +0 -0
  27. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/api/cli_rsspolymlp.py +0 -0
  28. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/api/cli_rsspolymlp_devkit.py +0 -0
  29. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/api/cli_rsspolymlp_plot.py +0 -0
  30. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/api/cli_rsspolymlp_utils.py +0 -0
  31. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/api/rsspolymlp.py +0 -0
  32. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/api/rsspolymlp_devkit.py +0 -0
  33. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/api/rsspolymlp_plot.py +0 -0
  34. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/api/rsspolymlp_utils.py +0 -0
  35. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/common/__init__.py +0 -0
  36. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/common/atomic_energy.py +0 -0
  37. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/common/composition.py +0 -0
  38. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/common/interface_pypolymlp.py +0 -0
  39. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/common/interface_spglib.py +0 -0
  40. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/common/interface_vasp.py +0 -0
  41. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/common/property.py +0 -0
  42. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/mlp_dev/dataset/compress_vasprun.py +0 -0
  43. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/mlp_dev/dataset/gen_mlp_dataset.py +0 -0
  44. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/mlp_dev/dataset/split_dataset.py +0 -0
  45. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/mlp_dev/estimate_cost.py +0 -0
  46. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/mlp_dev/model_selection/binary/gen_single_model.py +0 -0
  47. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/mlp_dev/model_selection/elemental/gen_hybrid_model.py +0 -0
  48. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/mlp_dev/model_selection/elemental/gen_single_model.py +0 -0
  49. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/mlp_dev/model_selection/n_feature.py +0 -0
  50. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/mlp_dev/model_selection/pypolymlp_gridsearch.py +0 -0
  51. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/mlp_dev/model_selection/reduce_grid.py +0 -0
  52. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/mlp_dev/pareto_opt_mlp.py +0 -0
  53. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/mlp_dev/polymlp_dev.py +0 -0
  54. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/rss/__init__.py +0 -0
  55. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/rss/eliminate_duplicates.py +0 -0
  56. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/rss/load_logfile.py +0 -0
  57. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/rss/optimization_mlp.py +0 -0
  58. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/rss/random_struct.py +0 -0
  59. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/utils/__init__.py +0 -0
  60. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/utils/lammps_utils.py +0 -0
  61. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/utils/matplot_util/__init__.py +0 -0
  62. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/utils/matplot_util/custom_plt.py +0 -0
  63. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/utils/matplot_util/examples/__init__.py +0 -0
  64. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/utils/matplot_util/examples/example.py +0 -0
  65. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/utils/matplot_util/examples/template.py +0 -0
  66. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/utils/matplot_util/make_plot.py +0 -0
  67. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/utils/opt_sscha/opt_geometry_sscha.py +0 -0
  68. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/utils/opt_sscha/opt_position_sscha.py +0 -0
  69. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/utils/opt_sscha/run_opt_sscha.py +0 -0
  70. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/utils/opt_sscha/sscha_property.py +0 -0
  71. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/utils/pymatgen_utils.py +0 -0
  72. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/utils/vasp_util/__init__.py +0 -0
  73. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/utils/vasp_util/api.py +0 -0
  74. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/utils/vasp_util/gen_incar.py +0 -0
  75. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp/utils/vasp_util/gen_script.py +0 -0
  76. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp.egg-info/SOURCES.txt +0 -0
  77. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp.egg-info/dependency_links.txt +0 -0
  78. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp.egg-info/entry_points.txt +0 -0
  79. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp.egg-info/requires.txt +0 -0
  80. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/src/rsspolymlp.egg-info/top_level.txt +0 -0
  81. {rsspolymlp-0.4.7 → rsspolymlp-0.4.8}/tests/test_cli_help.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rsspolymlp
3
- Version: 0.4.7
3
+ Version: 0.4.8
4
4
  Summary: A framework for random structure search using polynomial MLPs
5
5
  Author-email: Hayato Wakai <wakai@cms.mtl.kyoto-u.ac.jp>
6
6
  Maintainer-email: Hayato Wakai <wakai@cms.mtl.kyoto-u.ac.jp>
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "rsspolymlp"
7
- version = "0.4.7"
7
+ version = "0.4.8"
8
8
  description = "A framework for random structure search using polynomial MLPs"
9
9
  license = "MIT"
10
10
  authors = [
@@ -91,12 +91,13 @@ class RSSResultSummarizer:
91
91
  axis_tol = 0.1
92
92
  pos_tol = 0.1
93
93
 
94
- self.analyzer = UniqueStructIdentifier(
95
- axis_tol=axis_tol,
96
- pos_tol=pos_tol,
97
- assign_method=self.assign_method,
98
- )
99
94
  for comp_tag, res_paths in json_paths_c.items():
95
+ self.analyzer = UniqueStructIdentifier(
96
+ axis_tol=axis_tol,
97
+ pos_tol=pos_tol,
98
+ assign_method=self.assign_method,
99
+ )
100
+
100
101
  print(f"Composition {comp_tag}: summarizing...")
101
102
  time_start = time()
102
103
 
@@ -441,7 +442,7 @@ class RSSResultSummarizer:
441
442
  continue
442
443
 
443
444
  energy_dft /= len(polymlp_st.elements)
444
- if energy_dft < -10:
445
+ if energy_dft < -20:
445
446
  print(path_name, "exhibits an unphysically low energy. Skipping.")
446
447
  continue
447
448
 
@@ -21,7 +21,7 @@ def niggli_reduce(
21
21
  return axis_niggli, pos
22
22
 
23
23
 
24
- def get_niggli_reduced_cell(axis, tol: float = 1e-5):
24
+ def get_niggli_reduced_cell(axis, tol: float = 1e-5, verbose: bool = False):
25
25
  """
26
26
  Get the Niggli-reduced cell using a numerically stable algorithm.
27
27
 
@@ -72,6 +72,7 @@ def get_niggli_reduced_cell(axis, tol: float = 1e-5):
72
72
  e_bc = tol * (norm_b + norm_c)
73
73
  e_ac = tol * (norm_a + norm_c)
74
74
  e_ab = tol * (norm_a + norm_b)
75
+ e = max([e_aa, e_bb, e_cc, e_bc, e_ac, e_ab])
75
76
 
76
77
  iteration = 100
77
78
  for n_iter in range(iteration):
@@ -81,24 +82,22 @@ def get_niggli_reduced_cell(axis, tol: float = 1e-5):
81
82
  aa, bb, cc, bc, ac, ab = get_G_components(G)
82
83
 
83
84
  # A1: Main condition: aa <= bb; Special condition: |bc| < |ac|
84
- if bb + e_aa + e_bb < aa or (
85
- abs(aa - bb) < e_aa + e_bb and abs(bc) > abs(ac) + e_bc + e_ac
86
- ):
85
+ if bb + e < aa or (abs(aa - bb) < e and abs(bc) > abs(ac) + e):
87
86
  C = np.array([[0, -1, 0], [-1, 0, 0], [0, 0, -1]])
88
87
  G, P = convert_G_and_P(C, G, P)
89
88
  aa, bb, cc, bc, ac, ab = get_G_components(G)
90
89
 
91
90
  # A2: Main condition: bb <= cc; Special condition: |ac| < |ab|
92
- if cc + e_bb + e_cc < bb or (
93
- abs(bb - cc) < e_bb + e_cc and abs(ac) > abs(ab) + e_ac + e_ab
94
- ):
91
+ if (cc + e < bb) or (abs(bb - cc) < e and abs(ac) > abs(ab) + e):
95
92
  C = np.array([[-1, 0, 0], [0, 0, -1], [0, -1, 0]])
96
93
  G, P = convert_G_and_P(C, G, P)
94
+ if verbose:
95
+ print("A2: Continue to the next iteration.")
97
96
  continue
98
97
 
99
- ell = 0 if abs(bc) < e_bc else bc / abs(bc)
100
- m = 0 if abs(ac) < e_ac else ac / abs(ac)
101
- n = 0 if abs(ab) < e_ab else ab / abs(ab)
98
+ ell = 0 if abs(bc) < e else bc / abs(bc)
99
+ m = 0 if abs(ac) < e else ac / abs(ac)
100
+ n = 0 if abs(ab) < e else ab / abs(ab)
102
101
 
103
102
  # A3: Main condition: bc > 0, ac > 0, ab > 0 (Type I)
104
103
  if ell * m * n == 1:
@@ -130,9 +129,9 @@ def get_niggli_reduced_cell(axis, tol: float = 1e-5):
130
129
  # Special conditions: if bc = bb: ab/2 <= ac,
131
130
  # elif bc = -bb: ab = 0 (otherwise, convert to Type I)
132
131
  if (
133
- abs(bc) > bb + e_bc + e_bb
134
- or (abs(bc - bb) < e_bc + e_bb and ab - e_ab - e_ac > 2 * ac)
135
- or (abs(bc + bb) < e_bc + e_bb and -e_ab > ab)
132
+ abs(bc) > bb + e
133
+ or (abs(bc - bb) < e and ab - e > 2 * ac)
134
+ or (abs(bc + bb) < e and -e > ab)
136
135
  ):
137
136
  # Basis transformation: c' = c - sign(bc) * b
138
137
  # cc' = cc + bb - |bc|
@@ -147,15 +146,17 @@ def get_niggli_reduced_cell(axis, tol: float = 1e-5):
147
146
  # A6 and A7 follow by analogous arguments.
148
147
  C = np.array([[1, 0, 0], [0, 1, -bc / abs(bc)], [0, 0, 1]])
149
148
  G, P = convert_G_and_P(C, G, P)
149
+ if verbose:
150
+ print("A5: Continue to the next iteration.")
150
151
  continue
151
152
 
152
153
  # A6: Main condition: |ac| <= aa;
153
154
  # Special conditions: if ac = aa: ab/2 <= bc,
154
155
  # elif ac = -aa: ab = 0 (otherwise, convert to Type I)
155
156
  if (
156
- abs(ac) > aa + e_aa + e_ac
157
- or (abs(aa - ac) < e_aa + e_ac and ab - e_ab - e_bc > 2 * bc)
158
- or (abs(aa + ac) < e_aa + e_ac and -e_ab > ab)
157
+ abs(ac) > aa + e
158
+ or (abs(aa - ac) < e and ab - e > 2 * bc)
159
+ or (abs(aa + ac) < e and -e > ab)
159
160
  ):
160
161
  # Basis transformation: c' = c - sign(ac) * a
161
162
  # cc' = cc + aa - |ac|
@@ -163,15 +164,17 @@ def get_niggli_reduced_cell(axis, tol: float = 1e-5):
163
164
  # bc' = bc/2 - sign(ac) * ab/2
164
165
  C = np.array([[1, 0, -ac / abs(ac)], [0, 1, 0], [0, 0, 1]])
165
166
  G, P = convert_G_and_P(C, G, P)
167
+ if verbose:
168
+ print("A6: Continue to the next iteration.")
166
169
  continue
167
170
 
168
171
  # A7: Main condition: |ab| <= aa;
169
172
  # Special conditions: if ab = aa: ac/2 <= bc,
170
173
  # elif ab = -aa: ac = 0 (otherwise, convert to Type I)
171
174
  if (
172
- abs(ab) > aa + e_aa + e_ab
173
- or (abs(aa - ab) < e_aa + e_ab and ac - e_ac - e_bc > 2 * bc)
174
- or (abs(aa + ab) < e_aa + e_ab and -e_ac > ac)
175
+ abs(ab) > aa + e
176
+ or (abs(aa - ab) < e and ac - e > 2 * bc)
177
+ or (abs(aa + ab) < e and -e > ac)
175
178
  ):
176
179
  # Basis transformation: b' = b - sign(ab) * a
177
180
  # bb' = bb + aa - |ab|
@@ -179,15 +182,15 @@ def get_niggli_reduced_cell(axis, tol: float = 1e-5):
179
182
  # bc' = bc/2 - sign(ab) * ac/2
180
183
  C = np.array([[1, -ab / abs(ab), 0], [0, 1, 0], [0, 0, 1]])
181
184
  G, P = convert_G_and_P(C, G, P)
185
+ if verbose:
186
+ print("A7: Continue to the next iteration.")
182
187
  continue
183
188
 
184
189
  # A8: Main condition: |bc| + |ac| + |ab| <= aa + bb (Type II);
185
190
  # Special condition: if |bc| + |ac| + |ab| = aa + bb: aa <= |ac| + |ab/2|
186
191
  # (otherwise, convert to Type I)
187
- if -(e_bc + e_ac + e_ab + e_aa + e_bb) > bc + ac + ab + aa + bb or (
188
- abs(bc + ac + ab + aa + bb)
189
- < (e_bc + e_ac + e_ab + e_aa + e_bb)
190
- < ab + (aa + ac) * 2
192
+ if -e > bc + ac + ab + aa + bb or (
193
+ abs(bc + ac + ab + aa + bb) < e < ab + (aa + ac) * 2
191
194
  ):
192
195
  # Basis transformation: c' = a + b + c
193
196
  # cc' = cc + aa + bb + ab + ac + bc
@@ -195,6 +198,8 @@ def get_niggli_reduced_cell(axis, tol: float = 1e-5):
195
198
  # bc' = 2 * bb + ab + bc (special condition: bc' < 0)
196
199
  C = np.array([[1, 0, 1], [0, 1, 1], [0, 0, 1]])
197
200
  G, P = convert_G_and_P(C, G, P)
201
+ if verbose:
202
+ print("A8: Continue to the next iteration.")
198
203
  continue
199
204
 
200
205
  break
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rsspolymlp
3
- Version: 0.4.7
3
+ Version: 0.4.8
4
4
  Summary: A framework for random structure search using polynomial MLPs
5
5
  Author-email: Hayato Wakai <wakai@cms.mtl.kyoto-u.ac.jp>
6
6
  Maintainer-email: Hayato Wakai <wakai@cms.mtl.kyoto-u.ac.jp>
File without changes
File without changes
File without changes