fairyfly-core 0.2.9__tar.gz → 0.2.11__tar.gz

{fairyfly_core-0.2.9 → fairyfly_core-0.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fairyfly-core
-Version: 0.2.9
+Version: 0.2.11
 Summary: A library to represent construction detail geometry for environmental simulation.
 Home-page: https://github.com/ladybug-tools/fairyfly-core
 Author: Ladybug Tools
@@ -18,7 +18,7 @@ Classifier: Programming Language :: Python :: Implementation :: IronPython
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ladybug-core==0.44.30
+Requires-Dist: ladybug-core==0.44.31
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{fairyfly_core-0.2.9 → fairyfly_core-0.2.11}/fairyfly/model.py

@@ -606,6 +606,27 @@ class Model(_Base):
         for i in reversed(i_to_remove):
             self._shapes.pop(i)
 
+    def remove_duplicate_vertices(self, tolerance=None):
+        """Remove any duplicate vertices from the model.
+
+        Any degenerate shapes found while removing duplicate vertices will be
+        automatically removed from the model.
+
+        Args:
+            tolerance: The minimum distance between a vertex and the boundary segments
+                at which point the vertex is considered distinct. If None, the
+                Model's tolerance will be used. (Default: None).
+        """
+        tolerance = self.tolerance if tolerance is None else tolerance
+        i_to_remove = []
+        for i, shape in enumerate(self._shapes):
+            try:
+                shape.remove_duplicate_vertices(tolerance)
+            except ValueError:  # degenerate shape found!
+                i_to_remove.append(i)
+        for i in reversed(i_to_remove):
+            self._shapes.pop(i)
+
     def check_all(self, raise_exception=True, detailed=False, all_ext_checks=False):
         """Check all of the aspects of the Model for validation errors.
 

{fairyfly_core-0.2.9 → fairyfly_core-0.2.11}/fairyfly/shape.py

@@ -247,6 +247,21 @@ class Shape(_Base):
         self._geometry = self.geometry.scale(factor, origin)
         self.properties.scale(factor, origin)
 
+    def remove_duplicate_vertices(self, tolerance=0.01):
+        """Remove all duplicate vertices from this object's geometry.
+
+        Args:
+            tolerance: The minimum distance between a vertex and the boundary segments
+                at which point the vertex is considered duplicate. Default: 0.01,
+                suitable for objects in millimeters.
+        """
+        try:
+            self._geometry = self.geometry.remove_duplicate_vertices(tolerance)
+        except AssertionError as e:  # usually a sliver face of some kind
+            raise ValueError(
+                'Shape "{}" is invalid with dimensions less than the '
+                'tolerance.\n{}'.format(self.full_id, e))
+
     def remove_colinear_vertices(self, tolerance=0.01):
         """Remove all colinear and duplicate vertices from this object's geometry.
 
@@ -472,6 +487,17 @@ class Shape(_Base):
         # snap all polygons together
         polygon_2ds = Polygon2D.snap_polygons(polygon_2ds, tol)
 
+        # remove colinear and degenerate geometry
+        i_to_remove = []
+        for i, poly in enumerate(polygon_2ds):
+            try:
+                poly.remove_colinear_vertices(tol)
+            except ValueError:  # degenerate shape found!
+                i_to_remove.append(i)
+        for i in reversed(i_to_remove):
+            polygon_2ds.pop(i)
+            is_holes.pop(i)
+
         # intersect the Room2D polygons within the 2D space
         int_poly = Polygon2D.intersect_polygon_segments(polygon_2ds, tol)
 

{fairyfly_core-0.2.9 → fairyfly_core-0.2.11}/fairyfly_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fairyfly-core
-Version: 0.2.9
+Version: 0.2.11
 Summary: A library to represent construction detail geometry for environmental simulation.
 Home-page: https://github.com/ladybug-tools/fairyfly-core
 Author: Ladybug Tools
@@ -18,7 +18,7 @@ Classifier: Programming Language :: Python :: Implementation :: IronPython
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ladybug-core==0.44.30
+Requires-Dist: ladybug-core==0.44.31
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

fairyfly_core-0.2.11/fairyfly_core.egg-info/requires.txt

@@ -0,0 +1 @@
+ladybug-core==0.44.31

fairyfly_core-0.2.11/requirements.txt

@@ -0,0 +1 @@
+ladybug-core==0.44.31

fairyfly_core-0.2.9/fairyfly_core.egg-info/requires.txt

@@ -1 +0,0 @@
-ladybug-core==0.44.30

fairyfly_core-0.2.9/requirements.txt

@@ -1 +0,0 @@
-ladybug-core==0.44.30