put phrases first

constants.py

@@ -23,7 +23,7 @@
 DOCUMENT_PROPERTIES_FILE = "properties.txt"
 
 ## Cut off points
-RICCO_MIN_CUTOFF_POINT = 0.01
+ROCCHIO_MIN_CUTOFF_POINT = 0.01
 
 ## Weights
 SINGLE_TERMS_WEIGHT = 1

queries.txt

@@ -1 +1 @@
-"a statement along" "the case) the" "Australia. The submissions" "a drastic effect" "wrote the note,"
+"MR DATO’" AND "Miscellaneous Other Wrongs" AND "proceeding. In my" AND "Q. I was" AND "couple of points."

query_expander.py

@@ -114,7 +114,7 @@ def trimVector(vector):
     """
     new_vector = dict()
     for key, value in vector.items():
-        if value > RICCO_MIN_CUTOFF_POINT:
+        if value > ROCCHIO_MIN_CUTOFF_POINT:
             new_vector[key] = value
     return new_vector
 

search.py

@@ -66,8 +66,8 @@ def main():
             if NO_PHRASES and "\"" in query_data[i]:
                 query2 = get_query(query_data, query_line=i, multiple_queries=MULTIPLE_QUERIES_IN_FILE, no_phrases=NO_PHRASES)
                 result2 = get_best_documents(p, dictionary, doc_properties, query2)
-                result = list(filter(lambda x: x not in result2, result))
-                result = result2 + result
+                result2 = list(filter(lambda x: x not in result, result2))
+                result = result + result2
 
         with open(file_of_output, 'w+') as f:
             f.write(' '.join([str(x) for x in result]) + END_LINE_MARKER)