|
6 | 6 | from glob import glob
|
7 | 7 |
|
8 | 8 | import numpy as np
|
9 |
| -from comp_sys import CompLabeledSys, IsNoPBC, MultiSystems |
| 9 | +from comp_sys import ( |
| 10 | + CompLabeledMultiSys, |
| 11 | + CompLabeledSys, |
| 12 | + IsNoPBC, |
| 13 | + MSAllIsNoPBC, |
| 14 | + MultiSystems, |
| 15 | +) |
10 | 16 | from context import dpdata
|
11 | 17 |
|
12 | 18 |
|
13 | 19 | class TestMixedMultiSystemsDumpLoad(
|
14 |
| - unittest.TestCase, CompLabeledSys, MultiSystems, IsNoPBC |
| 20 | + unittest.TestCase, CompLabeledMultiSys, MultiSystems, MSAllIsNoPBC |
15 | 21 | ):
|
16 | 22 | def setUp(self):
|
17 | 23 | self.places = 6
|
@@ -62,8 +68,8 @@ def setUp(self):
|
62 | 68 | self.place_holder_ms.from_deepmd_npy("tmp.deepmd.mixed", fmt="deepmd/npy")
|
63 | 69 | self.systems = dpdata.MultiSystems()
|
64 | 70 | self.systems.from_deepmd_npy_mixed("tmp.deepmd.mixed", fmt="deepmd/npy/mixed")
|
65 |
| - self.system_1 = self.ms["C1H4A0B0D0"] |
66 |
| - self.system_2 = self.systems["C1H4A0B0D0"] |
| 71 | + self.ms_1 = self.ms |
| 72 | + self.ms_2 = self.systems |
67 | 73 | mixed_sets = glob("tmp.deepmd.mixed/*/set.*")
|
68 | 74 | self.assertEqual(len(mixed_sets), 2)
|
69 | 75 | for i in mixed_sets:
|
@@ -112,7 +118,7 @@ def test_str(self):
|
112 | 118 |
|
113 | 119 |
|
114 | 120 | class TestMixedMultiSystemsDumpLoadSetSize(
|
115 |
| - unittest.TestCase, CompLabeledSys, MultiSystems, IsNoPBC |
| 121 | + unittest.TestCase, CompLabeledMultiSys, MultiSystems, MSAllIsNoPBC |
116 | 122 | ):
|
117 | 123 | def setUp(self):
|
118 | 124 | self.places = 6
|
@@ -163,8 +169,8 @@ def setUp(self):
|
163 | 169 | self.place_holder_ms.from_deepmd_npy("tmp.deepmd.mixed", fmt="deepmd/npy")
|
164 | 170 | self.systems = dpdata.MultiSystems()
|
165 | 171 | self.systems.from_deepmd_npy_mixed("tmp.deepmd.mixed", fmt="deepmd/npy/mixed")
|
166 |
| - self.system_1 = self.ms["C1H4A0B0D0"] |
167 |
| - self.system_2 = self.systems["C1H4A0B0D0"] |
| 172 | + self.ms_1 = self.ms |
| 173 | + self.ms_2 = self.systems |
168 | 174 | mixed_sets = glob("tmp.deepmd.mixed/*/set.*")
|
169 | 175 | self.assertEqual(len(mixed_sets), 5)
|
170 | 176 | for i in mixed_sets:
|
@@ -213,7 +219,7 @@ def test_str(self):
|
213 | 219 |
|
214 | 220 |
|
215 | 221 | class TestMixedMultiSystemsTypeChange(
|
216 |
| - unittest.TestCase, CompLabeledSys, MultiSystems, IsNoPBC |
| 222 | + unittest.TestCase, CompLabeledMultiSys, MultiSystems, MSAllIsNoPBC |
217 | 223 | ):
|
218 | 224 | def setUp(self):
|
219 | 225 | self.places = 6
|
@@ -265,8 +271,8 @@ def setUp(self):
|
265 | 271 | self.place_holder_ms.from_deepmd_npy("tmp.deepmd.mixed", fmt="deepmd/npy")
|
266 | 272 | self.systems = dpdata.MultiSystems(type_map=["TOKEN"])
|
267 | 273 | self.systems.from_deepmd_npy_mixed("tmp.deepmd.mixed", fmt="deepmd/npy/mixed")
|
268 |
| - self.system_1 = self.ms["TOKEN0C1H4A0B0D0"] |
269 |
| - self.system_2 = self.systems["TOKEN0C1H4A0B0D0"] |
| 274 | + self.ms_1 = self.ms |
| 275 | + self.ms_2 = self.systems |
270 | 276 | mixed_sets = glob("tmp.deepmd.mixed/*/set.*")
|
271 | 277 | self.assertEqual(len(mixed_sets), 2)
|
272 | 278 | for i in mixed_sets:
|
|
0 commit comments