Fixed evaluation metrics errors

Solver_inf.py

@@ -110,4 +110,38 @@ class Solver:
             print(letter_frac_log)
             print(letter_acc_log)
         
-        return letter_frac_log, letter_acc_log
+        return letter_frac_log, letter_acc_log
+    
+    def evaluate1(self, solution):
+        # print puzzle accuracy results given a generated solution
+        letters_correct = 0
+        letters_total = 0
+        for i in range(len(self.crossword.letter_grid)):
+            for j in range(len(self.crossword.letter_grid[0])):
+                if self.crossword.letter_grid[i][j] != "":
+                    letters_correct += (self.crossword.letter_grid[i][j] == solution[i][j])
+                    letters_total += 1
+        words_correct = 0
+        words_total = 0
+        for var in self.crossword.variables:
+            cells = self.crossword.variables[var]["cells"]
+            matching_cells = [self.crossword.letter_grid[cell[0]][cell[1]] == solution[cell[0]][cell[1]] for cell in cells]
+            if len(cells) == sum(matching_cells):
+                words_correct += 1
+            else:
+                # print('evaluation: correct word', ''.join([self.crossword.letter_grid[cell[0]][cell[1]] for cell in cells]), 'our prediction:', ''.join([solution[cell[0]][cell[1]] for cell in cells]))
+                pass
+            words_total += 1
+        
+        print("Letters Correct: {}/{} | Words Correct: {}/{}".format(int(letters_correct), int(letters_total), int(words_correct), int(words_total)))
+        print("Letters Correct: {}% | Words Correct: {}%".format(float(letters_correct/letters_total*100), float(words_correct/words_total*100)))
+        
+        info = {
+            "total_letters" : int(letters_total),
+            "total_words" : int(words_total),
+            "correct_letters" : int(letters_correct),
+            "correct_words" : int(words_correct),
+            "correct_letters_percent" : float(letters_correct/letters_total*100),
+            "correct_words_percent" : float(words_correct/words_total*100),
+        }
+        return info

main.py

@@ -64,8 +64,8 @@ async def solve_puzzle(json):
 
         solution = await solve_method_async()
         
-        evaluation1 = await asyncio.to_thread(solver.evaluate, solution['first pass model']['grid'])
-        evaluation2 = await asyncio.to_thread(solver.evaluate, solution['second pass model']['final grid'])
+        evaluation1 = await asyncio.to_thread(solver.evaluate1, solution['first pass model']['grid'])
+        evaluation2 = await asyncio.to_thread(solver.evaluate1, solution['second pass model']['final grid'])
         
         return solution['second pass model']['final grid'], evaluation1, solution['second pass model']['final grid'], evaluation2