Minor random fixes

orangecontrib/network/network/__init__.py

@@ -1 +1 @@
-from .base import Network
+from .base import Network, DirectedEdges, UndirectedEdges

orangecontrib/network/network/base.py

@@ -228,6 +228,11 @@ def as_edges(edges):
             self.edges = [as_edges(e) for e in edges]
         else:
             self.edges = [as_edges(edges)]
+        if not all(edges.edges.shape[0] == edges.edges.shape[1]
+                   for edges in self.edges):
+            raise ValueError("Edges must be square matrices")
+        if not all(edges.edges.shape[0] == len(nodes) for edges in self.edges):
+            raise ValueError("Number of nodes and edge matrix dimension must match")
         self.name = name
         self.coordinates = coordinates
 

orangecontrib/network/network/twomode.py

@@ -24,7 +24,7 @@ def to_single_mode(net, mode_mask, conn_mask, weighting):
         single-mode network
     """
     mode_edges = _filtered_edges(net, mode_mask, conn_mask)
-    new_edges = Weighting[weighting].func(mode_edges)
+    new_edges = Weighting[weighting].func(mode_edges, np.sum(mode_mask))
     return Network(net.nodes[mode_mask], new_edges)
 
 
@@ -38,7 +38,7 @@ def _normalize(a, *nominators):
 
 
 def _dot_edges(normalization):
-    def norm_dot(edges):
+    def norm_dot(edges, dim):
         edges = normalization(
             edges, wuu=lambda: edges.sum(axis=0), wvv=lambda: edges.sum(axis=1))
         new_edges = np.dot(edges, edges.T).tocoo()
@@ -47,12 +47,12 @@ def norm_dot(edges):
 
         return sp.csr_matrix(
             (new_edges.data[mask], (new_edges.row[mask], new_edges.col[mask])),
-            shape=new_edges.shape)
+            shape=(dim, dim))
     return norm_dot
 
 
-def _weight_no_weights(edges):
-    new_edges = _weight_connections(edges)
+def _weight_no_weights(edges, dim):
+    new_edges = _weight_connections(edges, dim)
     new_edges[new_edges.nonzero()] = 1
     return new_edges
 

orangecontrib/network/networks/makeNetworkList.py

@@ -1,4 +1,4 @@
-import os
+import os
 import os.path
 import glob
 

orangecontrib/network/widgets/tests/test_ownxsinglemode.py

@@ -112,7 +112,7 @@ def test_show_errors(self):
         self.assertFalse(no_categorical())
         self.assertTrue(same_values())
 
-        net = Network(range(3), sp.csr_matrix([[0, 1], [1, 2]]))
+        net = Network(range(3), sp.csr_matrix([[0, 1, 0], [1, 2, 0], [0, 0, 0]]))
         self.send_signal(widget.Inputs.network, net)
         self.assertTrue(no_data())
         self.assertFalse(no_categorical())