2
2
3
3
from pathlib import Path
4
4
5
- import pytest
6
5
import numpy
6
+ import pytest
7
7
8
- from diffpy .morph .morphapp import (
9
- create_option_parser ,
10
- single_morph ,
11
- )
8
+ from diffpy .morph .morphapp import create_option_parser , single_morph
9
+ from diffpy .morph .morphpy import morph , morphpy
12
10
from diffpy .morph .tools import getRw
13
- from diffpy .morph .morphpy import (
14
- morph ,
15
- morphpy ,
16
- )
17
11
18
12
thisfile = locals ().get ("__file__" , "file.py" )
19
13
tests_dir = Path (thisfile ).parent .resolve ()
@@ -78,15 +72,25 @@ def test_morph(self, setup_morph):
78
72
morph_results = {}
79
73
morph_file = self .testfiles [0 ]
80
74
for target_file in self .testfiles [1 :]:
81
- mr , grm = morph (morph_file , target_file , scale = 1 , stretch = 0 , sort_by = "temperature" )
75
+ mr , grm = morph (
76
+ morph_file ,
77
+ target_file ,
78
+ scale = 1 ,
79
+ stretch = 0 ,
80
+ sort_by = "temperature" ,
81
+ )
82
82
_ , grt = morph (target_file , target_file )
83
83
morph_results .update ({target_file .name : mr })
84
+
84
85
class Chain :
85
86
xyallout = grm [:, 0 ], grm [:, 1 ], grt [:, 0 ], grt [:, 1 ]
87
+
86
88
chain = Chain ()
87
89
rw = getRw (chain )
88
90
del chain
89
- assert numpy .allclose ([rw ], [self .morphapp_results [target_file .name ]["Rw" ]])
91
+ assert numpy .allclose (
92
+ [rw ], [self .morphapp_results [target_file .name ]["Rw" ]]
93
+ )
90
94
assert morph_results == self .morphapp_results
91
95
92
96
def test_morphpy (self , setup_morph ):
@@ -95,7 +99,9 @@ def test_morphpy(self, setup_morph):
95
99
for target_file in self .testfiles [1 :]:
96
100
_ , grm0 = morph (morph_file , morph_file )
97
101
_ , grt = morph (target_file , target_file )
98
- mr , grm = morphpy (grm0 , grt , scale = 1 , stretch = 0 , sort_by = "temperature" )
102
+ mr , grm = morphpy (
103
+ grm0 , grt , scale = 1 , stretch = 0 , sort_by = "temperature"
104
+ )
99
105
morph_results .update ({target_file .name : mr })
100
106
101
107
class Chain :
@@ -104,7 +110,9 @@ class Chain:
104
110
chain = Chain ()
105
111
rw = getRw (chain )
106
112
del chain
107
- assert numpy .allclose ([rw ], [self .morphapp_results [target_file .name ]["Rw" ]])
113
+ assert numpy .allclose (
114
+ [rw ], [self .morphapp_results [target_file .name ]["Rw" ]]
115
+ )
108
116
assert morph_results == self .morphapp_results
109
117
110
118
0 commit comments