update code

src/compas_fd/__init__.py

@@ -1,47 +1,27 @@
-"""
-********************************************************************************
-compas_fd
-********************************************************************************
-
-.. currentmodule:: compas_fd
-
-
-.. toctree::
-    :maxdepth: 1
-
-    compas_fd.constraints
-    compas_fd.datastructures
-    compas_fd.fd
-    compas_fd.loads
-
-"""
-
 from __future__ import print_function
 
 import os
 import compas
 
 
-__author__ = ['tom van mele <van.mele@arch.ethz.ch>']
-__copyright__ = 'Block Research Group - ETH Zurich'
-__license__ = 'MIT License'
-__email__ = 'van.mele@arch.ethz.ch'
-__version__ = '0.4.1'
+__author__ = ["tom van mele <tom.v.mele@gmail.com>"]
+__copyright__ = "Block Research Group - ETH Zurich"
+__license__ = "MIT License"
+__email__ = "tom.v.mele@gmail.com"
+__version__ = "0.4.1"
 
 
 get = compas.get
 
 
 HERE = os.path.dirname(__file__)
 
-HOME = os.path.abspath(os.path.join(HERE, '../../'))
-DATA = os.path.abspath(os.path.join(HOME, 'data'))
-DOCS = os.path.abspath(os.path.join(HOME, 'docs'))
-TEMP = os.path.abspath(os.path.join(HOME, 'temp'))
+HOME = os.path.abspath(os.path.join(HERE, "../../"))
+DATA = os.path.abspath(os.path.join(HOME, "data"))
+DOCS = os.path.abspath(os.path.join(HOME, "docs"))
+TEMP = os.path.abspath(os.path.join(HOME, "temp"))
 
 
-__all__ = ['HOME', 'DATA', 'DOCS', 'TEMP', 'get']
+__all__ = ["HOME", "DATA", "DOCS", "TEMP", "get"]
 
-__all_plugins__ = [
-    'compas_fd.install'
-]
+__all_plugins__ = ["compas_fd.install"]

src/compas_fd/constraints/__init__.py

@@ -1,36 +1,3 @@
-"""
-***************************
-constraints
-***************************
-
-.. currentmodule:: compas_fd.constraints
-
-Base Class
-==========
-
-.. autosummary::
-    :toctree: generated/
-    :nosignatures:
-
-    Constraint
-
-Classes
-=======
-
-.. autosummary::
-    :toctree: generated/
-    :nosignatures:
-
-    CircleConstraint
-    CurveConstraint
-    FrameConstraint
-    LineConstraint
-    PlaneConstraint
-    SurfaceConstraint
-    VectorConstraint
-
-"""
-
 from __future__ import print_function
 from __future__ import absolute_import
 from __future__ import division

src/compas_fd/constraints/circleconstraint.py

@@ -15,19 +15,14 @@ def __init__(self, curve, **kwargs):
         super(CircleConstraint, self).__init__(geometry=curve, **kwargs)
 
     @property
-    def data(self):
+    def __data__(self):
         return {
             "geometry": self.geometry.data,
             "rhino_guid": str(self._rhino_guid),
         }
 
-    @data.setter
-    def data(self, data):
-        self.geometry = Circle.from_data(data["geometry"])
-        self._rhino_guid = str(data["rhino_guid"])
-
     @classmethod
-    def from_data(cls, data):
+    def __from_data__(cls, data):
         curve = Circle.from_data(data["geometry"])
         constraint = cls(curve)
         constraint._rhino_guid = str(data["rhino_guid"])

src/compas_fd/constraints/constraint.py

@@ -18,6 +18,10 @@ class Constraint(Data):
 
     GEOMETRY_CONSTRAINT = {}
 
+    @staticmethod
+    def register(gtype, ctype):
+        Constraint.GEOMETRY_CONSTRAINT[gtype] = ctype
+
     @staticmethod
     def get_constraint_cls(geometry, **kwargs):
         gtype = type(geometry)
@@ -37,8 +41,8 @@ def __new__(cls, *args, **kwargs):
         cls = Constraint.get_constraint_cls(geometry)
         return super(Constraint, cls).__new__(cls)
 
-    def __init__(self, geometry, **kwargs):
-        super(Constraint, self).__init__(**kwargs)
+    def __init__(self, geometry, name=None):
+        super(Constraint, self).__init__(name=name)
         self._geometry = None
         self._location = None
         self._residual = None
@@ -48,10 +52,6 @@ def __init__(self, geometry, **kwargs):
         self._param = None
         self.geometry = geometry
 
-    @staticmethod
-    def register(gtype, ctype):
-        Constraint.GEOMETRY_CONSTRAINT[gtype] = ctype
-
     @property
     def geometry(self):
         return self._geometry

src/compas_fd/constraints/curveconstraint.py

@@ -14,19 +14,14 @@ def __init__(self, curve, **kwargs):
         super(CurveConstraint, self).__init__(geometry=curve, **kwargs)
 
     @property
-    def data(self):
+    def __data__(self):
         return {
             "geometry": self.geometry.data,
             "rhino_guid": str(self._rhino_guid),
         }
 
-    @data.setter
-    def data(self, data):
-        self.geometry = NurbsCurve.from_data(data["geometry"])
-        self._rhino_guid = str(data["rhino_guid"])
-
     @classmethod
-    def from_data(cls, data):
+    def __from_data__(cls, data):
         curve = NurbsCurve.from_data(data["geometry"])
         constraint = cls(curve)
         constraint._rhino_guid = str(data["rhino_guid"])

src/compas_fd/constraints/frameconstraint.py

@@ -13,19 +13,14 @@ def __init__(self, frame, **kwargs):
         super(FrameConstraint, self).__init__(geometry=frame, **kwargs)
 
     @property
-    def data(self):
+    def __data__(self):
         return {
             "geometry": self.geometry.data,
             "rhino_guid": str(self._rhino_guid),
         }
 
-    @data.setter
-    def data(self, data):
-        self.geometry = Frame.from_data(data["geometry"])
-        self._rhino_guid = str(data["rhino_guid"])
-
     @classmethod
-    def from_data(cls, data):
+    def __from_data__(cls, data):
         frame = Frame.from_data(data["geometry"])
         constraint = cls(frame)
         constraint._rhino_guid = str(data["rhino_guid"])

src/compas_fd/constraints/lineconstraint.py

@@ -16,19 +16,14 @@ def __init__(self, line, **kwargs):
         super(LineConstraint, self).__init__(geometry=line, **kwargs)
 
     @property
-    def data(self):
+    def __data__(self):
         return {
             "geometry": self.geometry.data,
             "rhino_guid": str(self._rhino_guid),
         }
 
-    @data.setter
-    def data(self, data):
-        self.geometry = Line.from_data(data["geometry"])
-        self._rhino_guid = str(data["rhino_guid"])
-
     @classmethod
-    def from_data(cls, data):
+    def __from_data__(cls, data):
         line = Line.from_data(data["geometry"])
         constraint = cls(line)
         constraint._rhino_guid = str(data["rhino_guid"])

src/compas_fd/constraints/planeconstraint.py

@@ -15,19 +15,14 @@ def __init__(self, plane, **kwargs):
         super(PlaneConstraint, self).__init__(geometry=plane, **kwargs)
 
     @property
-    def data(self):
+    def __data__(self):
         return {
             "geometry": self.geometry.data,
             "rhino_guid": str(self._rhino_guid),
         }
 
-    @data.setter
-    def data(self, data):
-        self.geometry = Plane.from_data(data["geometry"])
-        self._rhino_guid = str(data["rhino_guid"])
-
     @classmethod
-    def from_data(cls, data):
+    def __from_data__(cls, data):
         plane = Plane.from_data(data["geometry"])
         constraint = cls(plane)
         constraint._rhino_guid = str(data["rhino_guid"])

src/compas_fd/constraints/surfaceconstraint.py

@@ -14,19 +14,14 @@ def __init__(self, surface, **kwargs):
         super(SurfaceConstraint, self).__init__(geometry=surface, **kwargs)
 
     @property
-    def data(self):
+    def __data__(self):
         return {
             "geometry": self.geometry.data,
             "rhino_guid": str(self._rhino_guid),
         }
 
-    @data.setter
-    def data(self, data):
-        self.geometry = NurbsSurface.from_data(data["geometry"])
-        self._rhino_guid = str(data["rhino_guid"])
-
     @classmethod
-    def from_data(cls, data):
+    def __from_data__(cls, data):
         srf = NurbsSurface.from_data(data["geometry"])
         constraint = cls(srf)
         constraint._rhino_guid = str(data["rhino_guid"])

src/compas_fd/constraints/vectorconstraint.py

@@ -12,19 +12,14 @@ def __init__(self, vector, **kwargs):
         super(VectorConstraint, self).__init__(geometry=vector, **kwargs)
 
     @property
-    def data(self):
+    def __data__(self):
         return {
             "geometry": self.geometry.data,
             "rhino_guid": str(self._rhino_guid),
         }
 
-    @data.setter
-    def data(self, data):
-        self.geometry = Vector.from_data(data["geometry"])
-        self._rhino_guid = str(data["rhino_guid"])
-
     @classmethod
-    def from_data(cls, data):
+    def __from_data__(cls, data):
         vector = Vector.from_data(data["geometry"]).unitized()
         constraint = cls(vector)
         constraint._rhino_guid = str(data["rhino_guid"])

src/compas_fd/datastructures/__init__.py

@@ -1,20 +1,3 @@
-"""
-***************************
-datastructures
-***************************
-
-.. currentmodule:: compas_fd.datastructures
-
-Classes
-=======
-
-.. autosummary::
-    :toctree: generated/
-    :nosignatures:
-
-    CableMesh
-
-"""
 from __future__ import print_function
 from __future__ import absolute_import
 from __future__ import division