Merge pull request #82 from smoia/fix/matchdim

smoia · web-flow · commit e1ac63635115 · 2023-12-12T10:30:50.000+01:00
Fix laplacian and degree shape check in `laplacian.normalisation`
diff --git a/nigsp/operations/laplacian.py b/nigsp/operations/laplacian.py
@@ -159,7 +159,7 @@ def normalisation(lapl, degree, norm="symmetric", fix_zeros=True):
             )
         deg = deepcopy(deg.diagonal())
 
-    if deg.shape != lapl.shape[:-1]:
+    if deg.shape != lapl.shape[1:]:
         raise ValueError(
             f"The provided degree matrix has shape {deg.shape} while the "
             f"provided matrix has shape {lapl.shape}."
diff --git a/nigsp/workflow.py b/nigsp/workflow.py
@@ -295,6 +295,7 @@ def nigsp(
         outprefix = os.path.join(outdir, f"{os.path.split(outprefix)[1]}_")
     else:
         outprefix = f"{outdir}{os.sep}"
+        outext = None
 
     # #### Read in data #### #
 

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ def normalisation(lapl, degree, norm="symmetric", fix_zeros=True):`
`159`	`159`	`)`
`160`	`160`	`deg = deepcopy(deg.diagonal())`
`161`	`161`
`162`		`- if deg.shape != lapl.shape[:-1]:`
	`162`	`+ if deg.shape != lapl.shape[1:]:`
`163`	`163`	`raise ValueError(`
`164`	`164`	`f"The provided degree matrix has shape {deg.shape} while the "`
`165`	`165`	`f"provided matrix has shape {lapl.shape}."`