Merge pull request #22 from OpenSEMBA/21-change-step2gmsh-input-requeriments

Change step2gmsh input requeriments

Author: lmdiazangulo

partially_filled_coax.areas.json

@@ -11,26 +11,31 @@ def __init__(self):
             "geometries": []
         }
 
-    def addComputedArea(self, geometry:str, area:float):
+    def addComputedArea(self, geometry:str, label:str, area:float):
         geometry:Dict ={
             "geometry": geometry,
-            "area": area,
+            "label": label,
+            "area": round(area,6),
         }
         self.computedAreas['geometries'].append(geometry)
 
-    def addPhysicalModelOfDimension(self, dimension=2):
+    def addPhysicalModelOfDimension(self, mappedElements:Dict[str,str],  dimension=2):
         physicalGroups = gmsh.model.getPhysicalGroups(dimension)
         for physicalGroup in physicalGroups:
             entityTags = gmsh.model.getEntitiesForPhysicalGroup(*physicalGroup)
             geometryName = gmsh.model.getPhysicalName(*physicalGroup)
+            label = ''
+            for key, geometry in mappedElements.items():
+                if geometry == geometryName:
+                    label = key
             for tag in entityTags:
                 if dimension == 1:
                     rad = gmsh.model.occ.getMass(dimension, tag) / (2*np.pi)
                     area = rad*rad*np.pi
                 if dimension == 2:
                     area = gmsh.model.occ.getMass(dimension, tag)
                 if geometryName != AreaExporterService._EMPTY_NAME_CASE:
-                    self.addComputedArea(geometryName, area)
+                    self.addComputedArea(geometryName, label, area)
 
     def exportToJson(self, exportFileName:str):
         with open(exportFileName + ".areas.json", 'w') as f:

src/AreaExporterService.py

@@ -0,0 +1,119 @@
+from collections import defaultdict, deque
+from typing import Dict, List, Tuple
+
+class Graph:
+    def __init__(self):
+        self._nodes:List = []     
+        self._edges:List[Tuple] = []
+
+    @property
+    def roots(self) -> List:
+        roots:List = []
+        for node in self._nodes:
+            isChild = False
+            for edge in self._edges:
+                if edge[-1] == node:
+                    isChild = True
+                    continue
+            if isChild == False:
+                roots.append(node)
+        return roots.copy()
+    
+    @property
+    def nodes(self) -> List:
+        return self._nodes.copy()
+
+    @property
+    def edges(self) -> List:
+        return self._edges.copy()
+
+    @nodes.setter
+    def nodes(self, nodes):
+        self._nodes = list(nodes)
+
+    @edges.setter
+    def edges(self, edges):
+        self._edges = [tuple(e) for e in edges]
+
+    def add_node(self, node):
+        if node not in self._nodes:
+            self._nodes.append(node)
+
+    def add_edge(self, source, destination):
+        if source not in self._nodes:
+            self.add_node(source)
+        if destination not in self._nodes:
+            self.add_node(destination)
+        if (source, destination) not in self._edges:
+            self._edges.append((source, destination))
+
+    def get_connections(self):
+        connections = {node: [] for node in self._nodes}
+        for source, destination in self._edges:
+            connections[source].append(destination)
+        return connections
+    
+    def getParentNodes(self) -> List:
+        return [edge[0] for edge in self._edges]
+    
+    def getChildNodes(self) -> List:
+        return [edge[-1] for edge in self._edges]
+    
+    #Necesita una revisión pero por ahora hace lo que necesito
+    def prune_to_longest_paths(self):
+        connections = self.get_connections()
+        roots = [n for n in self._nodes if n not in self.getChildNodes()]
+
+        longest_paths = []
+
+        def dfs(node, path):
+            path = path + [node]
+            if node not in connections or not connections[node]:
+                longest_paths.append(path)
+                return
+            for child in connections[node]:
+                dfs(child, path)
+
+        for root in roots:
+            dfs(root, [])
+
+        leaf_to_path = {}
+        for path in longest_paths:
+            leaf = path[-1]
+            if leaf not in leaf_to_path or len(path) > len(leaf_to_path[leaf]):
+                leaf_to_path[leaf] = path
+
+        new_nodes = set()
+        new_edges = set()
+        for path in leaf_to_path.values():
+            new_nodes.update(path)
+            new_edges.update([(path[i], path[i+1]) for i in range(len(path)-1)])
+
+        self._nodes = list(new_nodes)
+        self._edges = list(new_edges)
+
+    def getAdyacencyTree(self) -> Dict:
+        tree = defaultdict(list)
+        for root in self.roots:
+            tree[''].append(root)
+        for parent, child in self._edges:
+            tree[parent].append(child)
+        return tree
+    
+    def getNodesByLevels(self) -> List:
+        adyacencyTree = self.getAdyacencyTree()
+        qeue = deque([('',0)])
+        nodeList = []
+        while qeue:
+            node,level = qeue.popleft()
+            nodeList.append(node)
+            for child in adyacencyTree[node]:
+                qeue.append((child, level+1))
+        return nodeList[1:] #Removes case 0 that is not part of nodes
+
+    def _reorderData(self) -> None:
+        self._edges = sorted(self._edges)
+        self._nodes = sorted(self._nodes)
+
+    def __str__(self):
+        return f"Graph(Nodes: {self._nodes},\n Edges: {self._edges})"