irie 0.0.57__tar.gz → 0.0.58__tar.gz

{irie-0.0.57 → irie-0.0.58}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: irie
-Version: 0.0.57
+Version: 0.0.58
 Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab

{irie-0.0.57 → irie-0.0.58}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "irie"
-version = "0.0.57"
+version = "0.0.58"
 authors = [
   {name="Claudio M. Perez", email="50180406+claudioperez@users.noreply.github.com"}
 ]

{irie-0.0.57 → irie-0.0.58}/src/irie/apps/evaluation/identification.py

@@ -21,14 +21,9 @@
                 bb[event] += 1/(len(aa)-1)
 
 """
-import os
-import json
-from collections import defaultdict
 
 import numpy as np
-from irie.apps.events.models import EventRecord
-from irie.apps.site.view_utils import raise404
-from irie.apps.inventory.models import Asset
+from irie.apps.evaluation.models import Evaluation
 
 def mkdd(asset, pid, key):
     evaluations = list(reversed(sorted(Evaluation.objects.filter(asset=asset),

{irie-0.0.57 → irie-0.0.58}/src/irie/apps/inventory/models.py

@@ -111,10 +111,54 @@ class Datum(models.Model):
     locate_y = models.CharField(max_length=240) # eg, center of deck
     orient_z = models.CharField(max_length=240) # eg, vertical upwards
     locate_z = models.CharField(max_length=240) # eg, deck surface
+
+    angle_x = models.DecimalField(decimal_places=2, max_digits=10, default=0.0, null=True, blank=True)
+    angle_y = models.DecimalField(decimal_places=2, max_digits=10, default=0.0, null=True, blank=True)
     asset    = models.ForeignKey(Asset, on_delete=models.RESTRICT)
 
     def __str__(self):
         return f"{self.name}"
+    
+    def to_cardinal(self):
+        """
+        Create rotation matrix from datum basis to cardinal basis.
+        The cardinal basis is defined as:
+        cx = North, 
+        cy = East, 
+        cz = Up
+
+        The datum basis is defined as:
+        ex = Exp(orient_x cz) cx
+        ey = Exp(orient_y cz) cy
+        ez = Exp(orient_z cz) cz
+        where orient_x, orient_y, and orient_z are the angles in radians and
+        Exp is the exponential map which encodes the Rodrigues' rotation formula.
+
+        We want to return the rotation Rec  such that:
+            Rec @ [ex, ey, ez] = [cx, cy, cz]
+        """
+        import numpy as np
+        from shps.rotor import exp
+
+        orient_x = self.angle_x
+        orient_y = self.angle_y
+
+        ex, ey, ez = np.eye(3)
+        cz = ez
+        cx = exp(-orient_x*cz) @ ex
+        cy = exp(-orient_y*cz) @ ey
+
+        rotation = np.column_stack((cx, cy, cz))
+
+        return rotation
+    
+    def to_other(self, other: "Datum"):
+        """
+        Create rotation matrix from this datum to another datum.
+        """
+        R_cs = self.to_cardinal()
+        R_cm = other.to_cardinal()
+        return R_cm.T @ R_cs
 
 class SensorGroup(models.Model):
     name    = models.CharField(max_length=100)
@@ -123,6 +167,7 @@ class SensorGroup(models.Model):
     datum   = models.ForeignKey(Datum, on_delete=models.RESTRICT)
 #   network = models.CharField(max_length=100)
 #   events  = None
+
     def __str__(self):
         return f"{self.asset.calid} - {self.name} ({self.datum})"
 
@@ -145,7 +190,7 @@ class Sensor(models.Model):
                                on_delete=models.RESTRICT)
 
     def __str__(self):
-        return f"{self.group.asset.calid} - {self.name} ({self.group.name})"
+        return f"{self.group.asset.cesmd} / {self.name}"
 
 
     def acceleration(self, event):