Bug fix

app.py

@@ -70,78 +70,109 @@ def parse_tgrl(file_obj):
 
 def extract_elements(tgrl_text):
 
-  # Extract actors
-  actors = re.findall("(?:.*?actor\s\S+\s?{\s?name\s?=\s?\")([A-Za-z\s;.,!?:-]*)(?:\")", tgrl_text)
-  # Extract goals
-  goals = re.findall("(?:.*?goal\s\S+\s?{\s?name\s?=\s?\")([A-Za-z\s;.,!?:-]*)(?:\")", tgrl_text)
-  # Extract softGoals
-  softGoals = re.findall("(?:.*?softGoal\s\S+\s?{\s?name\s?=\s?\")([A-Za-z\s;.,!?:-]*)(?:\")", tgrl_text)
-  # Extract tasks
-  tasks = re.findall("(?:.*?task\s\S+\s?{\s?name\s?=\s?\")([A-Za-z\s;.,!?:-]*)(?:\")", tgrl_text)
-  # Extract resources
-  resources = re.findall("(?:.*?resource\s\S+\s?{\s?name\s?=\s?\")([A-Za-z\s;.,!?:-]*)(?:\")", tgrl_text)
-
-  elements = {
+    # Extract actors
+    actors = re.findall("(?:.*?actor\s\S+\s?{\s?name\s?=\s?\")([A-Za-z\s;.,!?:-]*)(?:\")", tgrl_text)
+    # Extract goals
+    goals = re.findall("(?:.*?goal\s\S+\s?{\s?name\s?=\s?\")([A-Za-z\s;.,!?:-]*)(?:\")", tgrl_text)
+    # Extract softGoals
+    softGoals = re.findall("(?:.*?softGoal\s\S+\s?{\s?name\s?=\s?\")([A-Za-z\s;.,!?:-]*)(?:\")", tgrl_text)
+    # Extract tasks
+    tasks = re.findall("(?:.*?task\s\S+\s?{\s?name\s?=\s?\")([A-Za-z\s;.,!?:-]*)(?:\")", tgrl_text)
+    # Extract resources
+    resources = re.findall("(?:.*?resource\s\S+\s?{\s?name\s?=\s?\")([A-Za-z\s;.,!?:-]*)(?:\")", tgrl_text)
+
+    elements = {
     "actors": actors,
     "goals": goals,
     "softGoals": softGoals,
     "tasks": tasks,
     "resources": resources
-  }
-
-  # get elements per actor
-  elements_per_actor = {}
-
-  for goal in goals:
+    }
+    
+    # get elements per actor
+    elements_per_actor = {}
+    
+    for goal in goals:
     corresponding_actor = tgrl_text.rfind('actor', 0, tgrl_text.index(goal))
     corresponding_actor = re.split(' |{', tgrl_text[corresponding_actor:])[1]
     if corresponding_actor not in elements_per_actor:
         elements_per_actor[corresponding_actor] = []
     elements_per_actor[corresponding_actor].append(goal)
-  
-  for softGoal in softGoals:
+    
+    for softGoal in softGoals:
     corresponding_actor = tgrl_text.rfind('actor', 0, tgrl_text.index(softGoal))
     corresponding_actor = re.split(' |{', tgrl_text[corresponding_actor:])[1]
     if corresponding_actor not in elements_per_actor:
         elements_per_actor[corresponding_actor] = []
     elements_per_actor[corresponding_actor].append(softGoal)
-
-  for task in tasks:
+    
+    for task in tasks:
     corresponding_actor = tgrl_text.rfind('actor', 0, tgrl_text.index(task))
     corresponding_actor = re.split(' |{', tgrl_text[corresponding_actor:])[1]
     if corresponding_actor not in elements_per_actor:
         elements_per_actor[corresponding_actor] = []
     elements_per_actor[corresponding_actor].append(task)
 
-  # get decomposed elements
-
-  new_tgrl_text = tgrl_text
-  decomposed_elements = {}
-
-  main_elements_1 = re.findall("\w+(?=\s+decomposedBy)", new_tgrl_text)
-
-  for main_element in main_elements_1:
+    # get decomposed elements
+    
+    new_tgrl_text = tgrl_text
+    decomposed_elements = {}
+    
+    main_elements_1 = re.findall("\w+(?=\s+decomposedBy)", new_tgrl_text)
+    
+    for main_element in main_elements_1:
       sub_element_1 = (re.findall(main_element+"\s*(?: decomposedBy )([A-Za-z\s]*)", new_tgrl_text)[0])
       sub_element_1 = sub_element_1.replace(" ", "")
       sub_element_2 = (re.findall(main_element+"\s*(?: decomposedBy )"+ sub_element_1 +",\s*([A-Za-z\s]*)", new_tgrl_text)[0])
       new_tgrl_text = new_tgrl_text.replace(main_element+" decomposedBy "+sub_element_1+", "+sub_element_2+";", '')
       decomposed_elements[main_element] = [sub_element_1, sub_element_2]
-
-  # Replace elements IDs with names
-  new_decomposed_elements = {}
-
-  for key, _ in decomposed_elements.items():
-
+    
+    # Replace elements IDs with names
+    new_decomposed_elements = {}
+    
+    for key, _ in decomposed_elements.items():
+    
       new_key = re.findall("(?:"+key+"\s*{\s*name\s=\s\")([A-Za-z\s]*)", tgrl_text)[0]
       new_values = []
-
+    
       for element in decomposed_elements[key]:
           new_value = re.findall("(?:"+element+"\s*{\s*name\s=\s\")([A-Za-z\s;.,!?:-]*)", tgrl_text)[0]
           new_values.append(new_value)
-
+    
       new_decomposed_elements[new_key] = new_values
 
-  return elements, elements_per_actor, new_decomposed_elements
+    # get contributing elements
+      
+    new_tgrl_text = tgrl_text
+    contributing_elements = []
+    
+    main_elements_1 = re.findall("\w+(?=\s+contributesTo)", new_tgrl_text)
+    for main_element in main_elements_1:
+      sub_element_1 = (re.findall(main_element+"(?: contributesTo )([A-Za-z\s]*)", new_tgrl_text)[0])
+      sub_element_1 = sub_element_1.replace(" ", "")
+      contribution = (re.findall(main_element+"(?: contributesTo )"+ sub_element_1 +"\s{(-*[0-9A-Za-z]*)", new_tgrl_text)[0])
+      new_tgrl_text = new_tgrl_text.replace(main_element+" contributesTo "+sub_element_1, '')
+      contributing_elements.append([main_element, sub_element_1, contribution])
+    
+    contributing_elements_IDs_per_actor = {}
+    for element in contributing_elements:
+      corresponding_actor_1 = tgrl_text.rfind('actor', 0, tgrl_text.index(" "+element[0]))
+      corresponding_actor_1 = re.split(' |{', tgrl_text[corresponding_actor_1:])[1]
+      if corresponding_actor_1 not in contributing_elements_IDs_per_actor:
+          contributing_elements_IDs_per_actor[corresponding_actor_1] = []
+      contributing_elements_IDs_per_actor[corresponding_actor_1].append(element)
+    
+    # Replace elements IDs with names
+    contributing_elements_per_actor = {}
+    for key, values in contributing_elements_IDs_per_actor.items():
+      contributing_elements = []
+      for elements in contributing_elements_IDs_per_actor[key]:
+          element_name_1 = re.findall("(?:"+elements[0]+"\s*{\s*name\s=\s\")([A-Za-z\s;.,!?:-]*)", tgrl_text)[0]
+          element_name_2 = re.findall("(?:"+elements[1]+"\s*{\s*name\s=\s\")([A-Za-z\s;.,!?:-]*)", tgrl_text)[0]
+          contributing_elements.append([element_name_1, element_name_2, elements[2]])
+      contributing_elements_per_actor[key] = contributing_elements
+
+    return elements, elements_per_actor, new_decomposed_elements, contributing_elements_per_actor
 
 # ************************************************************************