fix list of matched words

handler.py

@@ -376,13 +376,14 @@ class FocusingQuestionModel:
 def load_math_terms():
     math_regexes = []
     math_terms_dict = {}
+    for term in MATH_PREFIXES:
+        math_terms_dict[rf"\b{term}(s|es|d|ed)?\b"] = term
+        math_regexes.append(rf"\b{term}(s|es|d|ed)?\b")
+
     for term in MATH_WORDS:
-        if term in MATH_PREFIXES:
-            math_terms_dict[rf"\b{term}(s|es|d|ed)?\b"] = term
-            math_regexes.append(rf"\b{term}(s|es|d|ed)?\b")
-        else:
-            math_regexes.append(rf"\b{term}\b")
+        if not term in MATH_PREFIXES:
             math_terms_dict[rf"\b{term}\b"] = term
+            math_regexes.append(rf"\b{term}\b")
     return math_regexes, math_terms_dict
 
 def run_math_density(transcript):
@@ -409,9 +410,9 @@ def run_math_density(transcript):
                     if math_terms_dict[regex] not in student_math_word_cloud:
                         student_math_word_cloud[math_terms_dict[regex]] = 0
                     student_math_word_cloud[math_terms_dict[regex]] += len(matches)
-                match_list.append(math_terms_dict[regex])                    
-            # Update matched positions
-            matched_positions.update((match.start(), match.end()) for match in matches)
+            for match in matches:
+                match_list.append(match.group())
+                matched_positions.add((match.start(), match.end()))
             num_matches += len(matches)
             # print("match group list: ", [match.group(0) for match in matches])
         utt.num_math_terms = num_matches