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

Author: tomvanmele

.bumpversion.cfg

@@ -29,6 +29,6 @@ search = __version__ = '{current_version}'
 replace = __version__ = '{new_version}'
 
 [bumpversion:file:CHANGELOG.md]
-search = [Unreleased]
-replace = {new_version}
+search = Unreleased
+replace = [{new_version}] {now:%Y-%m-%d}
 

CHANGELOG.md

@@ -9,33 +9,102 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Support for relative mesh references in URDF.
+### Changed
+
+- Fix exception on Rhino Mac.
+- Fix missing import on `compas_rhino.geometry`.
+
+### Removed
+
+## [0.5.0] 2019-03-15
+
+### Added
+
+- Add `Circle` and `Sphere` primitives to `compas.geometry`.
+- Add functions to `Plane` and `Box` primitives.
+- Add functions to `compas_rhino` curve: `length` and `is_closed`.
+- Add functions to `compas_rhino` surface: `kinks`, `closest_point`, `closest_point_on_boundaries`, and functions for mapping/remapping between XYZ and UV(0) spaces based on surface's parametrization (`point_xyz_to_uv`, `point_uv_to_xyz`, `line_uv_to_xyz`, `polyline_uv_to_xyz`, `mesh_uv_to_xyz`)
+- Add `is_scalable` to `compas.robots.Joint`.
+
+### Changed
 
-## 0.5.0
+- Fix exception in `Plane.transform`.
+- Fix installer to remove old symlinks.
+- Fix RPC proxy server.
+
+## [0.4.22] 2019-03-05
 
 ### Added
 
+- Add pretty print option to JSON formatter.
+- Add remeshing based on `triangle`.
+- Add compatibility with ETO forms to `compas_rhino` edge modifiers.
+
+## [0.4.21] 2019-03-04
+
+### Changed
+
+- Fix import in `compas_rhino` vertex modifiers.
+
+## [0.4.20] 2019-03-04
+
+### Removed
+
+- Remove `download_image_from_remote` utility function.
+
+## [0.4.12] 2019-03-04
+
+### Changed
+
+- Small fixes on Rhino forms support.
+
+## [0.4.11] 2019-03-03
+
+### Added
+
+- New function to join network edges into polylines: `network_polylines`.
+- New mesh functions: `mesh_offset`, `mesh_thicken`, `mesh_weld` and `meshes_join_and_weld`.
+- New mesh functions: `face_skewness`, `face_aspect_ratio`, `face_curvature` and `vertex_curvature`.
+- New functions to get disconnected elements of  `Mesh`: `mesh_disconnected_vertices`, `mesh_disconnected_faces`, `mesh_explode`.
+- New functions to get disconnected elements of  `Network`: `network_disconnected_vertices`, `network_disconnected_edges`, `network_explode`.
+- Add statistics utility functions: `average`, `variance`, `standard_deviation`.
+- Add `binomial_coefficient` function.
+- Add option to create `Network` and `Mesh` from dictionaries of vertices and faces.
+- Add `face_adjacency_vertices` to `Mesh`
+- Add optional prefix to the rhino name attribute processor
+- Add `mesh_move_vertices` to `compas_rhino`.
+- Add support for relative mesh references in URDF.
+
+### Changed
+
+- Fix mesh centroid and mesh normal calculation.
+- Refactor of drawing functions in `compas_blender`.
+- Fix material creation in `compas_blender`.
+- New default for subdivision: `catmullclark`.
+
+## [0.4.9] 2019-02-10
+
+### Added
+
+- New class methods for `Polyhedron`: `from_platonicsolid` and `from_vertices_and_faces`.
 - Constrained and conforming Delaunay triangulations based on Triangle.
 - Predicate-based filtering of vertices and edges.
 
 ### Changed
 
-- Updated Rhino installation merging Win32 and Mac implementations and defaulting the bootstrapper to the active python even if no CONDA environment is active during install.
+- Fix exception in `angle_vectors_signed` if vectors aligned
+- Fix exception in `Polyline.point`
+- Update Rhino installation merging Win32 and Mac implementations and defaulting the bootstrapper to the active python even if no CONDA environment is active during install.
 
 ### Removed
 
 - Bound mesh operations.
 
-## [0.4.8] - 2019-01-28
+## [0.4.8] 2019-01-28
 
 ### Added
 
 - Curve tangent at parameter.
 - Box shape.
 - Numpy-based mesh transformations.
 - Option to share axes among plotters.
-
-### Changed
-
-### Removed
-

README.md

@@ -61,6 +61,11 @@ If you find a bug, please help us solve it by [filing a report](https://github.c
 If you want to contribute, check out the [contribution guidelines](https://compas-dev.github.io/main/contributions.html).
 
 
+## Changelog
+
+See changes between releases on the [changelog](https://compas-dev.github.io/main/changelog.html).
+
+
 ## License
 
 The main library of **COMPAS** is [released under the MIT license](https://compas-dev.github.io/main/license.html).

docs/changelog.rst

@@ -0,0 +1 @@
+.. mdinclude:: ../CHANGELOG.md

docs/conf.py

@@ -42,6 +42,7 @@
     'sphinx.ext.mathjax',
     'sphinx.ext.napoleon',
     'matplotlib.sphinxext.plot_directive',
+    'm2r',
 ]
 
 # autodoc options

docs/index.rst

@@ -13,5 +13,6 @@ The main library of COMPAS
    tutorials
    api
    contributions
+   changelog
    citing
    license

requirements-dev.txt

@@ -1,11 +1,12 @@
-sphinx>=1.6
-sphinx_compas_theme>=0.1.10
-ipython>=5.8
-invoke>=0.14
 bumpversion>=0.5
 check-manifest>=0.36
 flake8
-pytest==3.2
+invoke>=0.14
+ipython>=5.8
 isort
+m2r
+pytest==3.2
+sphinx_compas_theme>=0.1.10
+sphinx>=1.6
 twine
 -e .

src/compas/numerical/devo/devo_numpy.py

@@ -97,7 +97,9 @@ def devo_numpy(fn, bounds, population, generations, limit=0, elites=0.2, F=0.8,
 
     # Population
 
-    agents     = (rand(k, population) * (ub - lb) + lb)
+    agents = (rand(k, population) * (ub - lb) + lb)
+    agents[:, :int(round(population * 0.05))] *= 0
+
     candidates = tile(array(range(population)), (1, population))
     candidates = reshape(delete(candidates, where(eye(population).ravel() == 1)), (population, population - 1))
 
@@ -185,7 +187,7 @@ def devo_numpy(fn, bounds, population, generations, limit=0, elites=0.2, F=0.8,
             data[min(fbin), ts, :] = [1, 0, 0]
             data[max(fbin), ts, :] = [0, 0, 1]
 
-            if ts % 10 == 0:
+            if ts % printout == 0:
                 plt.imshow(data, origin='lower', aspect=aspect)
                 plt.plot([generations * 0.5] * 2, [0, ydiv], ':k')
                 plt.yticks(yticks, ylabels, rotation='horizontal')

src/compas/numerical/drx/drx_numpy.py

@@ -326,16 +326,26 @@ def _create_arrays(structure):
     ind_t = []
 
     uv_i = structure.uv_index()
+
     for ui, vi in structure.edges():
-        i = uv_i[(ui, vi)]
-        edge  = structure.edge[ui][vi]
-        E[i]  = edge.get('E', 0)
-        A[i]  = edge.get('A', 0)
-        l0[i] = edge.get('l0', structure.edge_length(ui, vi))
-        s0[i] = edge.get('s0', 0)
+
+        i    = uv_i[(ui, vi)]
+        E[i] = structure.get_edge_attribute(key=(ui, vi), name='E')
+        A[i] = structure.get_edge_attribute(key=(ui, vi), name='A')
+
+        if structure.get_edge_attribute(key=(ui, vi), name='l0'):
+            l0[i] = structure.get_edge_attribute(key=(ui, vi), name='l0')
+        else:
+            l0[i] = structure.edge_length(ui, vi)
+
+        if structure.get_edge_attribute(key=(ui, vi), name='s0'):
+            s0[i] = structure.get_edge_attribute(key=(ui, vi), name='s0')
+        else:
+            s0[i] = 0
+
         u[i]  = k_i[ui]
         v[i]  = k_i[vi]
-        ct = edge.get('ct', None)
+        ct = structure.get_edge_attribute(key=(ui, vi), name='ct')
         if ct == 'c':
             ind_c.append(i)
         elif ct == 't':

src/compas_blender/utilities/drawing.py

@@ -94,7 +94,7 @@ def xdraw_lines(lines, centroid=True, layer=None):
         object.data.fill_mode = 'FULL'
         object.data.bevel_depth = data.get('width', 0.05)
         object.data.bevel_resolution = 0
-        object.data.resolution_u = 2
+        object.data.resolution_u = 20
         object.data.materials.append(create_material(color=data.get('color', [1, 1, 1])))
         objects[c] = object
     return _link_objects(objects=objects, layer=layer)
@@ -273,7 +273,7 @@ def draw_line(start=[0, 0, 0], end=[1, 1, 1], width=0.05, centroid=True, name='l
     object.data.fill_mode = 'FULL'
     object.data.bevel_depth = width
     object.data.bevel_resolution = 0
-    object.data.resolution_u = 2
+    object.data.resolution_u = 20
     object.data.materials.append(create_material(color=color))
     bpy.context.collection.objects.link(object)
     if layer: