check types with collections

Author: Robin Oval

src/compas/datastructures/mesh/_mesh.py

@@ -4,6 +4,7 @@
 
 import pickle
 import json
+import collections
 
 from copy import deepcopy
 from ast import literal_eval
@@ -644,17 +645,17 @@ def from_vertices_and_faces(cls, vertices, faces):
         """
         mesh = cls()
 
-        if type(vertices) == list:
+        if isinstance(vertices, collections.MutableSequence):
             for x, y, z in iter(vertices):
                 mesh.add_vertex(x=x, y=y, z=z)
-        elif type(vertices) == dict:
+        elif isinstance(vertices, collections.Mapping):
             for key, xyz in vertices.items():
                 mesh.add_vertex(key = key, attr_dict = {i: j for i, j in zip(['x', 'y', 'z'], xyz)})
 
-        if type(faces) == list:
+        if isinstance(faces, collections.MutableSequence):
             for face in iter(faces):
                 mesh.add_face(face)
-        elif type(faces) == dict:
+        elif isinstance(faces, collections.Mapping):
             for fkey, vertices in faces.items():
                 mesh.add_face(vertices, fkey)
 
@@ -3178,19 +3179,19 @@ def plot(self,
 
     # # mesh.add_face([a, b, c, d, e, f, g, h])
 
-    for k in mesh.faces():
-        print(k, mesh.is_face_on_boundary(k))
+    # for k in mesh.faces():
+    #     print(k, mesh.is_face_on_boundary(k))
 
 
-    print(list(mesh.edges(True)))
+    # print(list(mesh.edges(True)))
 
 
-    plotter = MeshPlotter(mesh)
+    # plotter = MeshPlotter(mesh)
 
-    plotter.draw_vertices()
-    plotter.draw_edges()
-    plotter.draw_faces(text='key')
-    plotter.show()
+    # plotter.draw_vertices()
+    # plotter.draw_edges()
+    # plotter.draw_faces(text='key')
+    # plotter.show()
 
     # print(mesh.get_vertices_attribute('x'))
     # print(mesh.get_vertices_attributes('xy'))
@@ -3213,8 +3214,27 @@ def plot(self,
     mesh = Mesh.from_vertices_and_faces(vertices, faces)
 
     plotter = MeshPlotter(mesh)
-    plotter.draw_vertices()
+    plotter.draw_vertices(text='key')
     plotter.draw_edges()
     plotter.draw_faces(text='key')
     plotter.show()
 
+    vertices = [
+        [0, 0, 0],
+        [1, 1, 0],
+        [1, -1, 0],
+        [-1, -1, 0],
+        [-1, 1, 0]
+    ]
+    faces = [
+        [0, 2, 1],
+        [0, 4, 3]
+    ]
+
+    mesh = Mesh.from_vertices_and_faces(vertices, faces)
+
+    plotter = MeshPlotter(mesh)
+    plotter.draw_vertices(text='key')
+    plotter.draw_edges()
+    plotter.draw_faces(text='key')
+    plotter.show()

src/compas/datastructures/network/_network.py

@@ -5,6 +5,7 @@
 import pickle
 import pprint
 import json
+import collections
 
 from copy import deepcopy
 from ast import literal_eval
@@ -462,10 +463,10 @@ def from_vertices_and_edges(cls, vertices, edges):
         """
         network = cls()
 
-        if type(vertices) == list:
+        if isinstance(vertices, collections.MutableSequence):
             for x, y, z in vertices:
                 network.add_vertex(x=x, y=y, z=z)
-        if type(vertices) == dict:
+        elif isinstance(vertices, collections.Mapping):
             for key, xyz in vertices.items():
                 network.add_vertex(key = key, attr_dict = {i: j for i, j in zip(['x', 'y', 'z'], xyz)})
 
@@ -1356,3 +1357,16 @@ def plot(self,
     plotter.draw_vertices(text='key', radius=0.2)
     plotter.draw_edges()
     plotter.show()
+
+    vertices = [[0.0, 0.0, 0.0], [1.0, 0.0, 0.0], [2.0, 0.0, 0.0]]
+    edges = [(0, 1), (1, 2)]
+
+    network = Network.from_vertices_and_edges(vertices, edges)
+    print(network)
+
+    plotter = NetworkPlotter(network, figsize=(10, 7))
+    plotter.defaults['vertex.fontsize'] = 8
+    plotter.draw_vertices(text='key', radius=0.2)
+    plotter.draw_edges()
+    plotter.show()
+