Allow from_gsd constructor to build from dirs other than Binarized, a…

…nd test accordingly
compass-stc · Jan 22, 2025 · c985fba · c985fba
1 parent dbf8973
commit c985fba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/StructuralGT/networks.py b/StructuralGT/networks.py
@@ -720,7 +720,8 @@ def from_gsd(cls, filename, frame=0, depth=None, dim=2):
         assert os.path.exists(filename)
         _dir = os.path.abspath(filename)
         _dir = os.path.split(os.path.split(filename)[0])[0]
-        N = cls(_dir, depth=depth, dim=dim)
+        binarized_dir = os.path.split(os.path.split(filename)[0])[-1]
+        N = cls(_dir, depth=depth, dim=dim, binarized_dir=binarized_dir)
         if dim==2: N._2d = True
         else: N._2d = False
 

diff --git a/StructuralGT/pytest/test_Networks.py b/StructuralGT/pytest/test_Networks.py
@@ -80,12 +80,12 @@ def test_unweighted_network(self, test_crop):
         return test_crop
 
     def test_from_gsd(self):
-        writeNetwork = Network(Small_path)
+        writeNetwork = Network(Small_path, binarized_dir='HighThresh')
         writeNetwork.binarize(options=options.agnwn)
         writeNetwork.img_to_skel()
         writeNetwork.set_graph()
 
-        testNetwork = Network.from_gsd(Small_path + 'Binarized/network.gsd')
+        testNetwork = Network.from_gsd(Small_path + 'HighThresh/network.gsd')
 
         testNetwork.Gr.vs['o'][0]