correction of double in XML

.gitignore

@@ -17,3 +17,7 @@ temp.jpg
 Evaluation.ipynb
 
 study/
+
+result_bpmn.bpmn
+
+BPMN_creation.ipynb

app.py

@@ -245,6 +245,8 @@ def load_models():
         st.session_state.model_arrow = model_arrow
         st.session_state.model_object = model_object
 
+        return model_object, model_arrow
+
 # Function to prepare the image for processing
 def prepare_image(image, pad=True, new_size=(1333, 1333)):
     original_size = image.size
@@ -415,7 +417,7 @@ def main():
     # Load the models using the defined function
     if 'model_object' not in st.session_state or 'model_arrow' not in st.session_state:
         clear_memory()
-        load_models()
+        _, _ = load_models()
 
     model_arrow = st.session_state.model_arrow
     model_object = st.session_state.model_object

modules/eval.py

@@ -279,47 +279,51 @@ def create_links(keypoints, boxes, labels, class_dict):
 
     return links, best_points
 
-def correction_labels(boxes, labels, class_dict, pool_dict, flow_links): 
+def correction_labels(boxes, labels, class_dict, pool_dict, flow_links):
+    sequence_flow_index = list(class_dict.values()).index('sequenceFlow')
+    message_flow_index = list(class_dict.values()).index('messageFlow')
+    data_association_index = list(class_dict.values()).index('dataAssociation')
+    data_object_index = list(class_dict.values()).index('dataObject')
+    data_store_index = list(class_dict.values()).index('dataStore')
+
     for pool_index, elements in pool_dict.items():
         print(f"Pool {pool_index} contains elements: {elements}")
-        #check if the label sequenceflow is good
-        for i in range(len(flow_links)):
-            if labels[i] == list(class_dict.values()).index('sequenceFlow'):
-                id1, id2 = flow_links[i]
+        
+        # Check if the label sequenceFlow or messageFlow is good
+        for i, (id1, id2) in enumerate(flow_links):
+            if labels[i] in {sequence_flow_index, message_flow_index}:
                 if id1 is not None and id2 is not None:
-                    #check if each link is in the same pool
+                    # Check if each link is in the same pool
                     if id1 in elements and id2 in elements:
-                        #check if the link is between a dataObject or a dataStore
-                        if labels[id1] == 8 or labels[id2] == 8 or labels[id1] == 9 or labels[id2] == 9:
-                            print('change the link from sequenceFlow to dataAssociation')
-                            labels[i]=list(class_dict.values()).index('dataAssociation')
+                        # Check if the link is between a dataObject or a dataStore
+                        if labels[id1] in {data_object_index, data_store_index} or labels[id2] in {data_object_index, data_store_index}:
+                            print('Change the link from sequenceFlow/messageFlow to dataAssociation')
+                            labels[i] = data_association_index
                         else:
                             continue
                     elif id1 not in elements and id2 not in elements:
                         continue
                     else:
-                        print('change the link from sequenceFlow to messageFlow')
-                        labels[i]=list(class_dict.values()).index('messageFlow')
+                        print('Change the link from sequenceFlow to messageFlow')
+                        labels[i] = message_flow_index
 
-                    
-
-    for i in range(len(labels)):
-        #check if dataAssociation is connected to a dataObject
-        if labels[i] == list(class_dict.values()).index('dataAssociation'):
-            id1, id2 = flow_links[i]
-            if (id1 and id2) is not None:
+    # Check if dataAssociation is connected to a dataObject
+    for i, (id1, id2) in enumerate(flow_links):
+        if labels[i] == data_association_index:
+            if id1 is not None and id2 is not None:
                 label1 = labels[id1]
                 label2 = labels[id2]
-                if label1 == list(class_dict.values()).index('dataObject') or label2 == list(class_dict.values()).index('dataObject'):
+                print(label1, label2)
+                if data_object_index in {label1, label2} or data_store_index in {label1, label2}:
                     continue
                 else:
-                    print('change the link from dataAssociation to messageFlow')
-                    labels[i]=list(class_dict.values()).index('messageFlow')
-                
+                    print('Change the link from dataAssociation to messageFlow')
+                    labels[i] = message_flow_index
 
     return labels, flow_links
 
 
+
 def last_correction(boxes, labels, scores, keypoints, links, best_points, pool_dict):
 
     #delete pool that are have only messageFlow on it
@@ -398,6 +402,11 @@ def full_prediction(model_object, model_arrow, image, score_threshold=0.5, iou_t
         labels, flow_links = correction_labels(boxes, labels, class_dict, pool_dict, flow_links)
         #give a link to event to allow the creation of the BPMN id with start, indermediate and end event
         flow_links = give_link_to_element(flow_links, labels)
+
+        #change every datastore to dataobject [TO DO: change it to make the dataStore work]
+        for i in range(len(labels)):
+            if labels[i] == list(class_dict.values()).index('dataStore'):
+                labels[i] = list(class_dict.values()).index('dataObject')
         
         boxes,labels,scores,keypoints,flow_links,best_points,pool_dict = last_correction(boxes,labels,scores,keypoints,flow_links,best_points, pool_dict)         
 
@@ -425,10 +434,6 @@ def full_prediction(model_object, model_arrow, image, score_threshold=0.5, iou_t
         # give a unique BPMN id to each element
         data = create_BPMN_id(data)   
 
-        
-
-        
-
         return image, data
 
 def evaluate_model_by_class(pred_boxes, true_boxes, pred_labels, true_labels, model_dict, iou_threshold=0.5):

modules/toXML.py

@@ -22,7 +22,8 @@ def create_BPMN_id(data):
         'pool': 1,
         'dataObject': 1,
         'dataStore': 1,
-        'timerEvent': 1
+        'timerEvent': 1,
+        'eventBasedGateway': 1
     }
 
     BPMN_name = [class_dict[label] for label in data['labels']]
@@ -40,7 +41,8 @@ def create_BPMN_id(data):
             'dataAssociation': 'dataAssociation',
             'pool': 'pool',
             'dataStore': 'dataStore',
-            'timerEvent': 'timerEvent'
+            'timerEvent': 'timerEvent',
+            'eventBasedGateway': 'eventBasedGateway'
         }.get(Bpmn_id, None)
 
         if key:
@@ -156,7 +158,7 @@ def create_bpmn_object(process, bpmnplane, text_mapping, definitions, size, data
                         dataObject_idx = links[dataAssociation_idx][0]
                         dataObject_name = elements[dataObject_idx]
                         dataObject_ref = f'DataObjectReference_{dataObject_name.split("_")[1]}'
-                        sub_element = ET.SubElement(element, 'bpmn:dataInputAssociation', id=f'dataInputAssociation_{dataObject_ref.split("_")[1]}')
+                        sub_element = ET.SubElement(element, 'bpmn:dataInputAssociation', id=f'dataInAsso_{dataAssociation_idx}_{dataObject_ref.split("_")[1]}')
                         ET.SubElement(sub_element, 'bpmn:sourceRef').text = dataObject_ref
                         create_data_Association(bpmnplane, data, size, sub_element.attrib['id'], dataAssociation_idx, dataObject_name, element_id)
 
@@ -165,7 +167,7 @@ def create_bpmn_object(process, bpmnplane, text_mapping, definitions, size, data
                         dataObject_idx = links[dataAssociation_idx][1]
                         dataObject_name = elements[dataObject_idx]
                         dataObject_ref = f'DataObjectReference_{dataObject_name.split("_")[1]}'
-                        sub_element = ET.SubElement(element, 'bpmn:dataOutputAssociation', id=f'dataOutputAssociation_{dataObject_ref.split("_")[1]}')
+                        sub_element = ET.SubElement(element, 'bpmn:dataOutputAssociation', id=f'dataOutAsso_{dataAssociation_idx}_{dataObject_ref.split("_")[1]}')
                         ET.SubElement(sub_element, 'bpmn:targetRef').text = dataObject_ref
                         create_data_Association(bpmnplane, data, size, sub_element.attrib['id'], dataAssociation_idx, element_id, dataObject_name)
 
@@ -182,23 +184,27 @@ def create_bpmn_object(process, bpmnplane, text_mapping, definitions, size, data
                 element = ET.SubElement(process, 'bpmn:endEvent', id=element_id, name=text_mapping[element_id])
 
             status, datasAssociation_idx = check_data_association(i, data['links'], data['labels'], keep_elements)
+            print('status', status, datasAssociation_idx, element_id)
             if len(status) != 0:
+                print('ici')
                 for state, dataAssociation_idx in zip(status, datasAssociation_idx):
                     # Handle Data Input Association
                     if state == 'input':
+                        print('input')
                         dataObject_idx = links[dataAssociation_idx][0]
                         dataObject_name = elements[dataObject_idx]
                         dataObject_ref = f'DataObjectReference_{dataObject_name.split("_")[1]}'
-                        sub_element = ET.SubElement(element, 'bpmn:dataInputAssociation', id=f'dataInputAssociation_{dataObject_ref.split("_")[1]}')
+                        sub_element = ET.SubElement(element, 'bpmn:dataInputAssociation', id=f'dataInAsso_{dataAssociation_idx}_{dataObject_ref.split("_")[1]}')
                         ET.SubElement(sub_element, 'bpmn:sourceRef').text = dataObject_ref
                         create_data_Association(bpmnplane, data, size, sub_element.attrib['id'], dataAssociation_idx, dataObject_name, element_id)
 
                     # Handle Data Output Association
                     elif state == 'output':
+                        print('output')
                         dataObject_idx = links[dataAssociation_idx][1]
                         dataObject_name = elements[dataObject_idx]
                         dataObject_ref = f'DataObjectReference_{dataObject_name.split("_")[1]}'
-                        sub_element = ET.SubElement(element, 'bpmn:dataOutputAssociation', id=f'dataOutputAssociation_{dataObject_ref.split("_")[1]}')
+                        sub_element = ET.SubElement(element, 'bpmn:dataOutputAssociation', id=f'dataOutAsso_{dataAssociation_idx}_{dataObject_ref.split("_")[1]}')
                         ET.SubElement(sub_element, 'bpmn:targetRef').text = dataObject_ref
                         create_data_Association(bpmnplane, data, size, sub_element.attrib['id'], dataAssociation_idx, element_id, dataObject_name)
 
@@ -221,14 +227,14 @@ def create_bpmn_object(process, bpmnplane, text_mapping, definitions, size, data
                     if state == 'input' :
                         gateway_idx = links[link_idx][0]
                         gateway_name = elements[gateway_idx]
-                        sub_element = ET.SubElement(element, 'bpmn:eventBasedGateway', id=f'eventBasedGateway{gateway_name.split("_")[1]}')
+                        sub_element = ET.SubElement(element, 'bpmn:eventBasedGateway', id=f'eventBasedGateway_{link_idx}_{gateway_name.split("_")[1]}')
                         create_data_Association(bpmnplane, data, size, sub_element.attrib['id'], i, gateway_name, element_id)
 
                     # Handle Data Output Association
                     elif state == 'output':
                         gateway_idx = links[link_idx][1]
                         gateway_name = elements[gateway_idx]
-                        sub_element = ET.SubElement(element, 'bpmn:eventBasedGateway', id=f'eventBasedGateway{gateway_name.split("_")[1]}')
+                        sub_element = ET.SubElement(element, 'bpmn:eventBasedGateway', id=f'eventBasedGateway_{link_idx}_{gateway_name.split("_")[1]}')
                         create_data_Association(bpmnplane, data, size, sub_element.attrib['id'], i, element_id, gateway_name)