compas-cem 0.8.4__tar.gz → 0.8.5__tar.gz

{compas_cem-0.8.4 → compas_cem-0.8.5}/CHANGELOG.rst

@@ -6,6 +6,21 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog <https://keepachangelog.com/en/1.0.0/>`_
 and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0.html>`_.
 
+0.8.5
+----------
+
+**Added**
+
+- Implemented `FormDiagram.from_equilibrium_state` constructor for compatibility with `jax_cem`.
+
+**Changed**
+
+**Fixed**
+
+**Deprecated**
+
+**Removed**
+
 0.8.4
 ----------
 

{compas_cem-0.8.4 → compas_cem-0.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: compas_cem
-Version: 0.8.4
+Version: 0.8.5
 Summary: The Combinatorial Equilibrium Modeling framework for COMPAS
 Home-page: https://github.com/arpastrana/compas_cem
 Author: Rafael Pastrana

{compas_cem-0.8.4 → compas_cem-0.8.5}/setup.py

@@ -28,7 +28,7 @@ optional_requirements = {}
 
 setup(
     name="compas_cem",
-    version="0.8.4",
+    version="0.8.5",
     description="The Combinatorial Equilibrium Modeling framework for COMPAS",
     long_description=long_description,
     long_description_content_type="text/markdown",

{compas_cem-0.8.4 → compas_cem-0.8.5}/src/compas_cem/__init__.py

@@ -27,7 +27,7 @@ __author__ = ["Rafael Pastrana"]
 __copyright__ = "Copyright 2020 - Princeton University"
 __license__ = "MIT License"
 __email__ = "arpj@princeton.edu"
-__version__ = "0.8.4"
+__version__ = "0.8.5"
 
 
 # Directories

compas_cem-0.8.5/src/compas_cem/diagrams/form.py

@@ -0,0 +1,117 @@
+from compas_cem.elements import Node
+from compas_cem.elements import Edge
+
+from compas_cem.diagrams import Diagram
+
+
+__all__ = ["FormDiagram"]
+
+# ==============================================================================
+# Form Diagram
+# ==============================================================================
+
+
+class FormDiagram(Diagram):
+    """
+    The heart of life.
+
+    Parameters
+    ----------
+    *args : ``list``
+        Arguments.
+    **kwargs : ``dict``
+        Keyword arguments.
+
+    Returns
+    -------
+    form : :class:`compas_cem.diagrams.FormDiagram`
+        A form diagram.
+    """
+    def __init__(self, *args, **kwargs):
+        super(FormDiagram, self).__init__(*args, **kwargs)
+
+# ==============================================================================
+# Constructors
+# ==============================================================================
+
+    @classmethod
+    def from_topology_diagram(cls, topology):
+        """
+        Construct a form diagram from a topology diagram.
+        """
+        form = topology.copy(cls=cls)
+
+        del form.attributes["_trails"]
+        del form.attributes["_auxiliary_trails"]
+        del form.attributes["_aux_length"]
+        del form.attributes["_aux_vector"]
+
+        return form
+
+    @classmethod
+    def from_equilibrium_state(cls, eq_state, structure):
+        """
+        Build a form diagram from an equilibrium state.
+        """
+        return form_from_eqstate(eq_state, structure, cls)
+
+
+# ==============================================================================
+# Helpers
+# ==============================================================================
+
+def form_from_eqstate(eqstate, structure, cls=None):
+    """
+    Generate a form diagram from an equilibrium state calculated with JAX CEM.
+    """
+    if cls is None:
+        cls = FormDiagram
+    form = cls()
+
+    # Add nodes
+    for node in structure.nodes:
+        form.add_node(Node(int(node)))
+
+    # Assign support nodes
+    for node in structure.support_nodes:
+        form.node_attribute(int(node), "type", "support")
+
+    # Add edges
+    for u, v in structure.edges:
+        form.add_edge(Edge(int(u), int(v), {}))
+
+    # Update form attributes
+    form_update(form, eqstate, structure)
+
+    return form
+
+
+def form_update(form, eqstate, structure):
+    """
+    Update in-place the attributes of a form diagram with an equilibrium state.
+    """
+    xyz = eqstate.xyz.tolist()
+    loads = eqstate.loads.tolist()
+    reactions = eqstate.reactions.tolist()
+    lengths = eqstate.lengths.tolist()
+    forces = eqstate.forces.tolist()
+
+    # Update q values and lengths on edges
+    for edge in structure.edges:
+        idx = structure.edge_index[tuple(edge)]
+        form.edge_attribute(edge, name="force", value=forces[idx].pop())
+        form.edge_attribute(edge, name="lengths", value=lengths[idx].pop())
+
+    # Update residuals on nodes
+    for node in structure.nodes:
+        form.node_attributes(node, "xyz", xyz[node])
+        form.node_attributes(node, ["rx", "ry", "rz"], reactions[node])
+        form.node_attributes(node, ["qx", "qy", "qz"], loads[node])
+
+# ==============================================================================
+# Main
+# ==============================================================================
+
+
+if __name__ == "__main__":
+    pass

{compas_cem-0.8.4 → compas_cem-0.8.5}/src/compas_cem.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: compas-cem
-Version: 0.8.4
+Version: 0.8.5
 Summary: The Combinatorial Equilibrium Modeling framework for COMPAS
 Home-page: https://github.com/arpastrana/compas_cem
 Author: Rafael Pastrana

compas_cem-0.8.4/src/compas_cem/diagrams/form.py

@@ -1,54 +0,0 @@
-from compas_cem.diagrams import Diagram
-
-
-__all__ = ["FormDiagram"]
-
-# ==============================================================================
-# Form Diagram
-# ==============================================================================
-
-
-class FormDiagram(Diagram):
-    """
-    The heart of life.
-
-    Parameters
-    ----------
-    *args : ``list``
-        Arguments.
-    **kwargs : ``dict``
-        Keyword arguments.
-
-    Returns
-    -------
-    form : :class:`compas_cem.diagrams.FormDiagram`
-        A form diagram.
-    """
-    def __init__(self, *args, **kwargs):
-        super(FormDiagram, self).__init__(*args, **kwargs)
-
-# ==============================================================================
-# Constructors
-# ==============================================================================
-
-    @classmethod
-    def from_topology_diagram(cls, topology):
-        """
-        Construct the base of a form diagram from a topology diagram.
-        """
-        form = topology.copy(cls=cls)
-
-        del form.attributes["_trails"]
-        del form.attributes["_auxiliary_trails"]
-        del form.attributes["_aux_length"]
-        del form.attributes["_aux_vector"]
-
-        return form
-
-# ==============================================================================
-# Main
-# ==============================================================================
-
-
-if __name__ == "__main__":
-    pass