compas-timber 2.1.0.dev0__tar.gz → 2.1.1.dev0__tar.gz

{compas_timber-2.1.0.dev0/src/compas_timber.egg-info → compas_timber-2.1.1.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compas_timber
-Version: 2.1.0.dev0
+Version: 2.1.1.dev0
 Summary: COMPAS package for modeling, designing and fabricating timber assemblies.
 Author-email: Aleksandra Anna Apolinarska <apolinarska@arch.ethz.ch>, Chen Kasirer <kasirer@arch.ethz.ch>, Gonzalo Casas <casas@arch.ethz.ch>, Jonas Haldemann <haldemann@arch.ethz.ch>, Oliver Appling Bucklin <bucklin@arch.ethz.ch>, "Aurèle L. Gheyselinck" <gheyselinck@arch.ethz.ch>, Panayiotis Papacharalambous <papacharalambous@arch.ethz.ch>, Anastasiia Stryzhevska <astryzhevska@arch.ethz.ch>, Jelle Feringa <jelleferinga@gmail.com>, Joseph Kenny <jk6372@princeton.edu>, Beverly Lytle <lytle@arch.ethz.ch>, Eric Gozzi <eric.gozzi@arch.ethz.ch>, Rodrigo Arca Zimmermann <rodrigo.arca@gmail.com>, Nicolas Benjamin Boscoboinik <boscoboinik@arch.ethz.ch>
 License-Expression: MIT
@@ -22,7 +22,7 @@ Requires-Dist: compas_model==0.9.1
 Requires-Dist: scipy>=1.1
 Provides-Extra: dev
 Requires-Dist: bump-my-version; extra == "dev"
-Requires-Dist: compas_invocations2; extra == "dev"
+Requires-Dist: compas_invocations2[mkdocs]>=1.0.2; extra == "dev"
 Requires-Dist: invoke>=0.14; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: twine; extra == "dev"
@@ -38,23 +38,6 @@ Provides-Extra: gh
 Requires-Dist: compas_invocations2; extra == "gh"
 Requires-Dist: tomlkit; extra == "gh"
 Requires-Dist: pythonnet; extra == "gh"
-Provides-Extra: docs
-Requires-Dist: markdown-callouts>=0.4; extra == "docs"
-Requires-Dist: markdown-exec>=1.8; extra == "docs"
-Requires-Dist: mike; extra == "docs"
-Requires-Dist: mkdocs>=1.6; extra == "docs"
-Requires-Dist: mkdocs-autorefs>=1.4; extra == "docs"
-Requires-Dist: mkdocs-coverage>=1.0; extra == "docs"
-Requires-Dist: mkdocs-git-revision-date-localized-plugin>=1.2; extra == "docs"
-Requires-Dist: mkdocs-llmstxt>=0.2; extra == "docs"
-Requires-Dist: mkdocs-material>=9.5; extra == "docs"
-Requires-Dist: mkdocs-minify-plugin>=0.8; extra == "docs"
-Requires-Dist: mkdocs-redirects>=1.2; extra == "docs"
-Requires-Dist: mkdocs-section-index>=0.3; extra == "docs"
-Requires-Dist: mkdocs-mermaid2-plugin; extra == "docs"
-Requires-Dist: mkdocstrings[python]; extra == "docs"
-Requires-Dist: pydantic>=2.10; extra == "docs"
-Requires-Dist: tomli>=2.0; python_version < "3.11" and extra == "docs"
 Dynamic: license-file
 
 <h1>

{compas_timber-2.1.0.dev0 → compas_timber-2.1.1.dev0}/pyproject.toml

@@ -45,7 +45,7 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
     "bump-my-version",
-    "compas_invocations2",
+    "compas_invocations2[mkdocs]>=1.0.2",
     "invoke >=0.14",
     "ruff",
     "twine",
@@ -65,25 +65,6 @@ gh = [
     "pythonnet",
 ]
 
-docs = [
-    "markdown-callouts >=0.4",
-    "markdown-exec >=1.8",
-    "mike",
-    "mkdocs >=1.6",
-    "mkdocs-autorefs >=1.4",
-    "mkdocs-coverage >=1.0",
-    "mkdocs-git-revision-date-localized-plugin >=1.2",
-    "mkdocs-llmstxt >=0.2",
-    "mkdocs-material >=9.5",
-    "mkdocs-minify-plugin >=0.8",
-    "mkdocs-redirects >=1.2",
-    "mkdocs-section-index >=0.3",
-    "mkdocs-mermaid2-plugin",
-    "mkdocstrings[python]",
-    "pydantic >=2.10",
-    "tomli >=2.0; python_version < '3.11'",
-]
-
 [project.urls]
 Homepage = "https://gramaziokohler.github.io/compas_timber/latest/"
 Repository = "https://github.com/gramaziokohler/compas_timber"
@@ -115,7 +96,7 @@ where = ["src"]
 # ============================================================================
 
 [tool.bumpversion]
-current_version = "2.1.0-dev0"
+current_version = "2.1.1-dev0"
 message = "Bump version to {new_version}"
 commit = true
 tag = true

{compas_timber-2.1.0.dev0 → compas_timber-2.1.1.dev0}/src/compas_timber/__init__.py

@@ -1,7 +1,7 @@
 import os
 import compas
 
-__version__ = "2.1.0-dev0"
+__version__ = "2.1.1-dev0"
 
 HERE = os.path.dirname(__file__)
 HOME = os.path.abspath(os.path.join(HERE, "..", ".."))

{compas_timber-2.1.0.dev0/src/compas_timber/connections → compas_timber-2.1.1.dev0/src/compas_timber}/analyzers.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import math
 from weakref import WeakKeyDictionary
 

{compas_timber-2.1.0.dev0 → compas_timber-2.1.1.dev0}/src/compas_timber/connections/__init__.py

@@ -36,13 +36,6 @@ from .plate_miter_joint import PlateMiterJoint
 from .panel_butt_joint import PanelLButtJoint
 from .panel_butt_joint import PanelTButtJoint
 from .panel_miter_joint import PanelMiterJoint
-from .analyzers import NBeamKDTreeAnalyzer
-from .analyzers import TripletAnalyzer
-from .analyzers import QuadAnalyzer
-from .analyzers import CompositeAnalyzer
-from .analyzers import Cluster
-from .analyzers import BeamGroupAnalyzer
-from .analyzers import MaxNCompositeAnalyzer
 
 __all__ = [
     "Joint",
@@ -84,11 +77,4 @@ __all__ = [
     "PanelLButtJoint",
     "PanelTButtJoint",
     "PanelMiterJoint",
-    "NBeamKDTreeAnalyzer",
-    "TripletAnalyzer",
-    "QuadAnalyzer",
-    "CompositeAnalyzer",
-    "Cluster",
-    "BeamGroupAnalyzer",
-    "MaxNCompositeAnalyzer",
 ]

{compas_timber-2.1.0.dev0 → compas_timber-2.1.1.dev0}/src/compas_timber/connections/joint.py

@@ -3,12 +3,43 @@ from itertools import combinations
 from compas.data import Data
 from compas.geometry import Point
 from compas.geometry import distance_point_line
+from compas.tolerance import TOL
 
 from compas_timber.errors import BeamJoiningError
+from compas_timber.utils import distance_segment_segment_points
 
 from .solver import JointTopology
 
 
+def location_from_centerlines(beams):
+    """Compute the approximate joint location from two beam centerlines.
+
+    Returns the closest point between the two centerlines, or the midpoint
+    between them when the beams are skew (non-intersecting).
+
+    Parameters
+    ----------
+    beams : list(:class:`~compas_timber.elements.Beam`)
+        A list of two beams for which to calculate the joint location.
+
+    Returns
+    -------
+    :class:`~compas.geometry.Point`
+
+    """
+    if len(beams) != 2:
+        raise ValueError(
+            "Automatic location calculation only works for joints connecting 2 elements. "
+            "Please set the location manually or implement a custom location calculation for your joint type."
+        )
+    beam_a, beam_b = beams
+    distance, point_a, point_b = distance_segment_segment_points(beam_a.centerline, beam_b.centerline)
+    point_a, point_b = Point(*point_a), Point(*point_b)
+    if not TOL.is_zero(distance):
+        return (point_a + point_b) / 2.0
+    return point_a
+
+
 class Joint(Data):
     """Base class for a joint connecting two beams.
 
@@ -48,13 +79,16 @@ class Joint(Data):
 
     def __init__(self, topology=None, location=None, name=None, **kwargs):
         super().__init__(name=name)
-        self._topology = topology if topology is not None else JointTopology.TOPO_UNKNOWN
-        self._location = location or Point(0, 0, 0)
+        self._topology = None
+        self._location = None
+        self.topology = topology
+        if location:
+            self.location = location
 
     @property
     def __data__(self):
         # type: () -> dict
-        return {"name": self.name}
+        return {"name": self.name, "topology": self.topology, "location": self._location}
 
     def __repr__(self):
         return '{}(name="{}")'.format(self.__class__.__name__, self.name)
@@ -65,11 +99,16 @@ class Joint(Data):
 
     @topology.setter
     def topology(self, value):
-        """Set the topology of the joint."""
-        self._topology = value
+        self._topology = value or JointTopology.TOPO_UNKNOWN
 
     @property
     def location(self):
+        if self._location is None and all(self.elements):
+            self._location = location_from_centerlines(self.elements)
+
+        if self._location is None:
+            raise ValueError("Location of the joint could not be determined. Please set it manually.")
+
         return self._location
 
     @location.setter

{compas_timber-2.1.0.dev0 → compas_timber-2.1.1.dev0}/src/compas_timber/connections/joint_candidate.py

@@ -5,7 +5,7 @@ from .plate_joint import PlateJoint
 class JointCandidate(Joint):
     """A JointCandidate is an information-only joint, which does not add any features to the elements it connects.
 
-    It is used to create a first-pass joinery information which can be later used to perform analysis using :class:`~compas_timber.connections.analyzers.BeamGroupAnalyzer`.
+    It is used to create a first-pass joinery information which can be later used to perform analysis using :class:`~compas_timber.analyzers.BeamGroupAnalyzer`.
 
     Please use `JointCandidate.create()` to properly create an instance of this class and associate it with an model.
 
@@ -70,7 +70,7 @@ class JointCandidate(Joint):
 class PlateJointCandidate(PlateJoint, JointCandidate):
     """A PlateJointCandidate is an information-only joint for plate connections.
 
-    It is used to create a first-pass joinery information which can be later used to perform analysis using :class:`~compas_timber.connections.analyzers.BeamGroupAnalyzer`.
+    It is used to create a first-pass joinery information which can be later used to perform analysis using :class:`~compas_timber.analyzers.BeamGroupAnalyzer`.
 
     Parameters
     ----------

{compas_timber-2.1.0.dev0 → compas_timber-2.1.1.dev0}/src/compas_timber/connections/plate_joint.py

@@ -1,6 +1,7 @@
 from abc import ABC
 from abc import abstractmethod
 
+from compas.geometry import Point
 from compas.geometry import dot_vectors
 
 from compas_timber.errors import BeamJoiningError
@@ -26,6 +27,8 @@ class PlateJoint(Joint, ABC):
         The index of the segment in plate_a's outline where the plates are connected.
     b_segment_index : int
         The index of the segment in plate_b's outline where the plates are connected.
+    location : :class:`compas.geometry.Point`, optional
+        The location of the joint. If not provided, defaults to the origin.
     **kwargs : dict, optional
         Additional keyword arguments to pass to the parent class.
 
@@ -101,6 +104,16 @@ class PlateJoint(Joint, ABC):
             return (self.plate_b.outlines[1], self.plate_b.outlines[0])
         return (self.plate_b.outlines[0], self.plate_b.outlines[1])
 
+    @property
+    def location(self):
+        if self._location is None:
+            self._location = Point(0, 0, 0)
+        return self._location
+
+    @location.setter
+    def location(self, value):
+        self._location = value
+
     def calculate_topology(self, allow_reordering=False):
         """Calculate the topology of the joint based on the plates."""
         topo_results = PlateConnectionSolver().find_topology(self.plate_a, self.plate_b)

{compas_timber-2.1.0.dev0 → compas_timber-2.1.1.dev0}/src/compas_timber/fabrication/free_contour.py

@@ -47,6 +47,7 @@ class FreeContour(BTLxProcessing):
 
     def __init__(self, contour_param_object, tool_id=0, counter_sink=False, tool_position=AlignmentType.LEFT, depth_bounded=True, **kwargs):
         super(FreeContour, self).__init__(tool_id=tool_id, counter_sink=counter_sink, tool_position=tool_position, **kwargs)
+        self._process_id = 1
         self.contour_param_object = contour_param_object
         self.depth_bounded = depth_bounded
 

{compas_timber-2.1.0.dev0 → compas_timber-2.1.1.dev0/src/compas_timber.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compas_timber
-Version: 2.1.0.dev0
+Version: 2.1.1.dev0
 Summary: COMPAS package for modeling, designing and fabricating timber assemblies.
 Author-email: Aleksandra Anna Apolinarska <apolinarska@arch.ethz.ch>, Chen Kasirer <kasirer@arch.ethz.ch>, Gonzalo Casas <casas@arch.ethz.ch>, Jonas Haldemann <haldemann@arch.ethz.ch>, Oliver Appling Bucklin <bucklin@arch.ethz.ch>, "Aurèle L. Gheyselinck" <gheyselinck@arch.ethz.ch>, Panayiotis Papacharalambous <papacharalambous@arch.ethz.ch>, Anastasiia Stryzhevska <astryzhevska@arch.ethz.ch>, Jelle Feringa <jelleferinga@gmail.com>, Joseph Kenny <jk6372@princeton.edu>, Beverly Lytle <lytle@arch.ethz.ch>, Eric Gozzi <eric.gozzi@arch.ethz.ch>, Rodrigo Arca Zimmermann <rodrigo.arca@gmail.com>, Nicolas Benjamin Boscoboinik <boscoboinik@arch.ethz.ch>
 License-Expression: MIT
@@ -22,7 +22,7 @@ Requires-Dist: compas_model==0.9.1
 Requires-Dist: scipy>=1.1
 Provides-Extra: dev
 Requires-Dist: bump-my-version; extra == "dev"
-Requires-Dist: compas_invocations2; extra == "dev"
+Requires-Dist: compas_invocations2[mkdocs]>=1.0.2; extra == "dev"
 Requires-Dist: invoke>=0.14; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: twine; extra == "dev"
@@ -38,23 +38,6 @@ Provides-Extra: gh
 Requires-Dist: compas_invocations2; extra == "gh"
 Requires-Dist: tomlkit; extra == "gh"
 Requires-Dist: pythonnet; extra == "gh"
-Provides-Extra: docs
-Requires-Dist: markdown-callouts>=0.4; extra == "docs"
-Requires-Dist: markdown-exec>=1.8; extra == "docs"
-Requires-Dist: mike; extra == "docs"
-Requires-Dist: mkdocs>=1.6; extra == "docs"
-Requires-Dist: mkdocs-autorefs>=1.4; extra == "docs"
-Requires-Dist: mkdocs-coverage>=1.0; extra == "docs"
-Requires-Dist: mkdocs-git-revision-date-localized-plugin>=1.2; extra == "docs"
-Requires-Dist: mkdocs-llmstxt>=0.2; extra == "docs"
-Requires-Dist: mkdocs-material>=9.5; extra == "docs"
-Requires-Dist: mkdocs-minify-plugin>=0.8; extra == "docs"
-Requires-Dist: mkdocs-redirects>=1.2; extra == "docs"
-Requires-Dist: mkdocs-section-index>=0.3; extra == "docs"
-Requires-Dist: mkdocs-mermaid2-plugin; extra == "docs"
-Requires-Dist: mkdocstrings[python]; extra == "docs"
-Requires-Dist: pydantic>=2.10; extra == "docs"
-Requires-Dist: tomli>=2.0; python_version < "3.11" and extra == "docs"
 Dynamic: license-file
 
 <h1>

{compas_timber-2.1.0.dev0 → compas_timber-2.1.1.dev0}/src/compas_timber.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE
 README.md
 pyproject.toml
 src/compas_timber/__init__.py
+src/compas_timber/analyzers.py
 src/compas_timber/base.py
 src/compas_timber/errors.py
 src/compas_timber/geometry.py
@@ -14,7 +15,6 @@ src/compas_timber.egg-info/not-zip-safe
 src/compas_timber.egg-info/requires.txt
 src/compas_timber.egg-info/top_level.txt
 src/compas_timber/connections/__init__.py
-src/compas_timber/connections/analyzers.py
 src/compas_timber/connections/ball_node.py
 src/compas_timber/connections/butt_joint.py
 src/compas_timber/connections/joint.py

compas_timber-2.1.1.dev0/src/compas_timber.egg-info/requires.txt

@@ -0,0 +1,24 @@
+rtree
+compas<3.0,>=2.0
+compas_model==0.9.1
+scipy>=1.1
+
+[dev]
+bump-my-version
+compas_invocations2[mkdocs]>=1.0.2
+invoke>=0.14
+ruff
+twine
+wheel
+pytest-mock
+pytest>=8.0
+build
+tomlkit
+pytest-cov
+pytest-randomly
+pre-commit
+
+[gh]
+compas_invocations2
+tomlkit
+pythonnet

compas_timber-2.1.0.dev0/src/compas_timber.egg-info/requires.txt

@@ -1,44 +0,0 @@
-rtree
-compas<3.0,>=2.0
-compas_model==0.9.1
-scipy>=1.1
-
-[dev]
-bump-my-version
-compas_invocations2
-invoke>=0.14
-ruff
-twine
-wheel
-pytest-mock
-pytest>=8.0
-build
-tomlkit
-pytest-cov
-pytest-randomly
-pre-commit
-
-[docs]
-markdown-callouts>=0.4
-markdown-exec>=1.8
-mike
-mkdocs>=1.6
-mkdocs-autorefs>=1.4
-mkdocs-coverage>=1.0
-mkdocs-git-revision-date-localized-plugin>=1.2
-mkdocs-llmstxt>=0.2
-mkdocs-material>=9.5
-mkdocs-minify-plugin>=0.8
-mkdocs-redirects>=1.2
-mkdocs-section-index>=0.3
-mkdocs-mermaid2-plugin
-mkdocstrings[python]
-pydantic>=2.10
-
-[docs:python_version < "3.11"]
-tomli>=2.0
-
-[gh]
-compas_invocations2
-tomlkit
-pythonnet