kattis-cli 1.0.4__tar.gz → 1.0.5__tar.gz

{kattis_cli-1.0.4 → kattis_cli-1.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kattis-cli
-Version: 1.0.4
+Version: 1.0.5
 Summary: A command-line tool for Kattis
 Home-page: https://github.com/rambasnet/kattis-cli
 Author: Ram Basnet

{kattis_cli-1.0.4 → kattis_cli-1.0.5}/kattis_cli/main.py

@@ -7,7 +7,7 @@ build.sh script copies the contents of this file to main.py.
 Change the __version__ to match in pyproject.toml
 Has to be higher than the pypi version.
 """
-__version__ = '1.0.4'
+__version__ = '1.0.5'
 
 from math import inf
 from typing import Tuple

{kattis_cli-1.0.4 → kattis_cli-1.0.5}/kattis_cli/test_solution.py

@@ -2,6 +2,7 @@
 """
 
 from typing import Any, List, Dict
+from math import inf
 import glob
 import time
 import os
@@ -26,7 +27,7 @@ def test_samples(
         problem_root_folder: str,
         files: List[str],
         lang_config: Dict[Any, Any],
-        accuracy: float = 0
+        accuracy: float = inf
 ) -> None:
     """Tests a problem by running all the .in files in
     the problem folder and comparing the output to the .ans files.
@@ -118,28 +119,31 @@ def test_samples(
                 input_content = f.read()
                 input_content.replace(b'\r\n', b'\n')  # Windows fix
             out_file = in_file.replace('.in', '.ans')
-            with open(out_file, 'rb') as f:
-                expected = f.read()
-                expected.replace(b'\r\n', b'\n')
+            try:
+                with open(out_file, 'rb') as f:
+                    expected = f.read()
+                    expected.replace(b'\r\n', b'\n')
+            except FileNotFoundError:
+                try:
+                    out_file = in_file.replace('.in', '.out')
+                    with open(out_file, 'rb') as f:
+                        expected = f.read()
+                        expected.replace(b'\r\n', b'\n')
+                except FileNotFoundError:
+                    expected = b"No .ans or .out file found!"
             # Run the program
             code, ans, error = run_program.run(lang_config, mainclass, in_file)
-            expected = expected.strip()
             if code != 0:
                 ans = error
             # console.print(f"{ans=} {error=}")
-            if accuracy == 0:  # string comparison
-                if expected == ans.encode('utf-8').strip():
-                    result = "[bold green]✅[/bold green]"
-                    count += 1
-                else:
-                    result = "[bold red]❌[/bold red]"
-            else:  # floating point comparison
-                if utility.compare_floats(expected.decode('utf-8'),
-                                          ans, accuracy):
-                    result = "[bold green]✅[/bold green]"
-                    count += 1
-                else:
-                    result = "[bold red]❌[/bold red]"
+
+            # floating point comparison
+            if utility.check_answer(expected.decode('utf-8'),
+                                    ans, accuracy):
+                result = "[bold green]✅[/bold green]"
+                count += 1
+            else:
+                result = "[bold red]❌[/bold red]"
 
             # UI Table Row ---
             in_filename = Path(in_file).parts[-1]

{kattis_cli-1.0.4 → kattis_cli-1.0.5}/kattis_cli/utils/utility.py

@@ -2,6 +2,7 @@
 
 from pathlib import Path
 import os
+from math import inf
 from typing import Union
 import yaml
 
@@ -60,21 +61,28 @@ def find_problem_root_folder(
     raise FileNotFoundError("Error: Problem root folder not found.")
 
 
-def compare_floats(expected: str, ans: str, places: float) -> bool:
-    """Compare two floating point numbers with given accuracy.
+def check_answer(expected: str, ans: str, places: float = inf) -> bool:
+    """Compare two numeric strings with given precision.
 
     Args:
         expected (str): expected result
         ans (str): actual result
-        places (float): decimal places for approximation
+        places (float): decimal places for approximation;
+        default inf for string comparison
 
     Returns:
-        bool: True if the two numbers are equal within the given accuracy
+        bool: True if the two values are equal, False otherwise
     """
     expect_ans = expected.strip().split('\n')
     actual_ans = ans.strip().split('\n')
     if len(expect_ans) != len(actual_ans):
         return False
+
+    if places == inf:
+        if expect_ans == actual_ans:
+            return True
+        else:
+            return False
     try:
         for i, ex_ans in enumerate(expect_ans):
             flt_expected = float(ex_ans)

{kattis_cli-1.0.4 → kattis_cli-1.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kattis-cli"
-version = "1.0.4"
+version = "1.0.5"
 authors = ["Ram Basnet <rbasnet@coloradomesa.edu>"]
 description = "A command-line tool for Kattis"
 readme = "README.md"