Merge branch 'master' of https://github.com/compas-dev/compas

Author: tomvanmele

src/compas/geometry/average.py

@@ -326,7 +326,7 @@ def center_of_mass_polyhedron(polyhedron):
 # ==============================================================================
 
 if __name__ == "__main__":
-    
+
     from compas.geometry import Polyhedron
 
     p = Polyhedron.generate(6)

src/compas/hpc/algorithms/drx_numba.py

@@ -104,11 +104,16 @@ def drx_numba(network, factor=1.0, tol=0.1, steps=10000, summary=0, update=False
     # Update
 
     if update:
-        k_i = network.key_index()
-        for key in network.vertices():
-            i = k_i[key]
+
+        i_k = network.index_key()
+        for i in sorted(list(network.vertices()), key=int):
             x, y, z = X[i, :]
-            network.set_vertex_attributes(i, {'x': x, 'y': y, 'z': z})
+            network.set_vertex_attributes(i_k[i], {'x': x, 'y': y, 'z': z})
+
+        uv_i = network.uv_index()
+        for edge in network.edges():
+            i = uv_i[edge]
+            network.set_edge_attribute(edge, 'f', float(f[i]))
 
     return X, f, l