requirements update20

src/eval_adb.py

@@ -1,6 +1,6 @@
 from pathlib import Path
-from safe_subprocess import run
-from generic_eval import main
+from .safe_subprocess import run
+from .generic_eval import main
 
 
 LANG_NAME = "Ada"

src/eval_clj.py

@@ -3,7 +3,7 @@ Evaluates a generated Clojure program (.clj).
 """
 import os
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 from libeval import run_without_exn
 
 

src/eval_cpp.py

@@ -1,6 +1,6 @@
 from pathlib import Path
-from safe_subprocess import run
-from generic_eval import main
+from .safe_subprocess import run
+from .generic_eval import main
 
 LANG_NAME = "C++"
 LANG_EXT = ".cpp"

src/eval_cs.py

@@ -6,7 +6,7 @@ import os
 import subprocess
 import tempfile
 from pathlib import Path
-from generic_eval import main
+from .generic_eval import main
 
 LANG_NAME = "CSharp"
 LANG_EXT = ".cs"

src/eval_dart.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 
 
 def eval_script(path: Path):

src/eval_dfy.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 
 # 0 – success
 # 1 – invalid command-line arguments

src/eval_dlang.py

@@ -1,7 +1,7 @@
 import os
 import subprocess
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 import sys
 import re
 

src/eval_elixir.py

@@ -2,7 +2,7 @@ import argparse
 from sys import exit
 import subprocess
 from pathlib import Path
-from generic_eval import main as gmain
+from .generic_eval import main as gmain
 
 
 def eval_script(path: Path):

src/eval_fs.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 
 def eval_script(path: Path):
     r = run(["dotnet", "fsi", "-d:DEBUG", str(path)])

src/eval_go.py

@@ -2,7 +2,7 @@ import argparse
 from sys import exit
 import subprocess
 from pathlib import Path
-from generic_eval import main as gmain
+from .generic_eval import main as gmain
 
 
 def eval_script(path: Path):

src/eval_hs.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 
 def eval_script(path: Path):
     r = run(["runghc", str(path)])

src/eval_java.py

@@ -1,8 +1,8 @@
 import os
 import tempfile
-from safe_subprocess import run
+from .safe_subprocess import run
 from pathlib import Path
-from generic_eval import main
+from .generic_eval import main
 
 LANG_NAME = "Java"
 LANG_EXT = ".java"

src/eval_julia.py

@@ -1,4 +1,4 @@
-from safe_subprocess import run
+from .safe_subprocess import run
 from pathlib import Path
 
 def eval_script(path: Path):

src/eval_lean.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 import subprocess
 
 def eval_script(path: Path):

src/eval_lua.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 
 def eval_script(path: Path):
     r = run(["lua", str(path)])

src/eval_luau.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 
 
 def eval_script(path: Path):

src/eval_matlab.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 
 def eval_script(path): 
     # Matlab has the requirement that all functions must appear at the end 

src/eval_ocaml.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 
 def eval_script(path: Path):
     r = run(["ocaml", str(path)])

src/eval_php.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 
 LANG_NAME = "PHP"
 LANG_EXT = ".php"

src/eval_pl.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 
 def eval_script(path: Path):
     r = run(["perl", path])

src/eval_python.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 
 def eval_script(path: Path):
     r = run(["python3", str(path)])

src/eval_racket.py

@@ -3,7 +3,7 @@ Evaluates a generated Racket program (.rkt).
 """
 import os
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 from libeval import run_without_exn
 
 

src/eval_ruby.py

@@ -2,7 +2,7 @@ import argparse
 from sys import exit
 import subprocess
 from pathlib import Path
-from generic_eval import main as gmain
+from .generic_eval import main as gmain
 
 def eval_script(path: Path):
     try:

src/eval_rust.py

@@ -2,7 +2,7 @@ import os
 import subprocess
 import tempfile
 from pathlib import Path
-from generic_eval import main
+from .generic_eval import main
 
 LANG_NAME = "Rust"
 LANG_EXT = ".rs"

src/eval_scala.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 import tempfile
-from safe_subprocess import run
+from .safe_subprocess import run
 
 LANG_NAME = "Scala"
 LANG_EXT = ".scala"

src/eval_sh.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 
 LANG_NAME = "bash"
 LANG_EXT = ".sh"

src/eval_swift.py

@@ -1,7 +1,7 @@
 import subprocess
 from pathlib import Path
 import os
-from safe_subprocess import run
+from .safe_subprocess import run
 
 def eval_script(path: Path):
     basename = ".".join(str(path).split(".")[:-1])

src/eval_ts.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 
 
 def eval_script(path: Path):

src/eval_v.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from safe_subprocess import run
+from .safe_subprocess import run
 import subprocess
 
 # return codes for coqc:

src/libeval.py

@@ -0,0 +1,40 @@
+import os
+import signal
+import subprocess
+from typing import List
+import generic_eval
+
+def testing_mail(x, y, z):
+    generic_eval.gmain(x, y, z)
+
+def run_without_exn(args: List[str]):
+    """
+    Runs the given program with a five second timeout. Does not throw an exception
+    no matter what happens. The output is a dictionary of the format that we expect
+    for our evaluation scripts. The "status" field is "OK" when the exit code is
+    zero. If that isn't enough, you may want to tweak the status based on the
+    captured stderr and stdout.
+    """
+    p = subprocess.Popen(
+        args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, start_new_session=True
+    )
+    try: 
+        stdout, stderr = p.communicate(timeout=5)
+        exit_code = p.returncode
+        status = "OK" if exit_code == 0 else "Exception"
+    except subprocess.TimeoutExpired as exc:
+        stdout, stderr = p.stdout.read(), p.stderr.read()
+        os.killpg(os.getpgid(p.pid), signal.SIGTERM)
+        exit_code = -1
+        status = "Timeout"
+
+    if stdout is None:
+        stdout = b""
+    if stderr is None:
+        stderr = b""
+    return {
+        "status": status,
+        "exit_code": exit_code,
+        "stdout": stdout.decode("utf-8", errors="ignore"),
+        "stderr": stderr.decode("utf-8", errors="ignore"),
+    }

src/safe_subprocess/module_test.py

@@ -1,4 +1,4 @@
-from safe_subprocess import run
+from . import run
 import time
 from pathlib import Path
 

test.py

@@ -1,68 +1,49 @@
-from collections import defaultdict
+import difflib
 
-def remove_longest_prefix(A, B, n):
-    len_A, len_B = len(A), len(B)
+def remove_prefix_by_last_line(a: str, b: str, threshold: float = 0.85) -> str:
+    """
+    基于A的最后一行定位B中的截断点，删除B中该行之前的所有内容
+    :param a: 前缀字符串A
+    :param b: 目标字符串B
+    :param threshold: 行相似度阈值
+    :return: 删除前缀后的B字符串
+    """
+    a_lines = a.splitlines()
+    b_lines = b.splitlines()
     
-    if n >= len_A:
-        return B[len_A:] if len_A <= len_B else B
+    if not a_lines:
+        return b
     
-    max_match = 0
-    best_pos = 0
+    last_a_line = a_lines[-1]
+    cut_index = -1
     
-    # 构建字符位置映射表（包含偏移量限制）
-    char_index = defaultdict(list)
-    max_offset = min(len_A + n, len_B)  # 添加偏移量限制
-    for i, c in enumerate(B[:max_offset]):
-        char_index[c].append(i)
+    for i, b_line in enumerate(b_lines):
+        similarity = difflib.SequenceMatcher(
+            None, last_a_line, b_line
+        ).ratio()
+        if similarity >= threshold:
+            cut_index = i
+            break
     
-    # 逆向扫描关键字符
-    for a_pos in reversed(range(len_A)):
-        target_char = A[a_pos]
-        if target_char not in char_index:
-            continue
-            
-        # 检查可能匹配的位置范围
-        for b_start in char_index[target_char]:
-            # 增加位置有效性验证
-            if b_start < max(0, a_pos - n) or b_start > min(len_B, a_pos + n):
-                continue
-                
-            # 计算动态窗口范围
-            window_start = max(0, b_start - a_pos)
-            window_size = min(a_pos + n + 1, len_A, len_B - window_start)
-            
-            # 初始化DP数组（修复索引问题）
-            prev_row = list(range(window_start, window_start + window_size + 1))
-            
-            # 动态规划计算（添加边界保护）
-            for i in range(1, window_size + 1):
-                current_row = [prev_row[0] + 1]  # 第一个元素单独处理
-                for j in range(1, window_size + 1):
-                    # 添加索引有效性检查
-                    if (window_start + j - 1) >= len_B:
-                        break
-                        
-                    cost = 0 if A[i-1] == B[window_start + j -1] else 1
-                    current_row.append(min(
-                        prev_row[j-1] + cost,
-                        prev_row[j] + 1 if j < len(prev_row) else float('inf'),
-                        current_row[j-1] + 1
-                    ))
-                    # 提前终止条件
-                    if current_row[-1] > n:
-                        break
-                prev_row = current_row
-                if all(v > n for v in current_row):
-                    break
-                    
-            # 更新最佳匹配（添加有效性验证）
-            if window_size > 0 and prev_row[-1] <= n and (a_pos +1) > max_match:
-                max_match = a_pos +1
-                best_pos = window_start + window_size
-                
-    return B[best_pos:] if max_match >0 else B
+    if cut_index != -1:
+        return '\n'.join(b_lines[cut_index+1:])
+    else:
+        return b
+
 
 A = "#include<assert.h>\n#include<bits/stdc++.h>\n// Check if in given vector of numbers, are any two numbers closer to each other than\n// given threshold.\n// >>> has_close_elements((std::vector<float>({(float)1.0f, (float)2.0f, (float)3.0f})), (0.5f))\n// (false)\n// >>> has_close_elements((std::vector<float>({(float)1.0f, (float)2.8f, (float)3.0f, (float)4.0f, (float)5.0f, (float)2.0f})), (0.3f))\n// (true)\nbool has_close_elements(std::vector<float> numbers, float threshold) {\n"
 B = "#include <assert.h>\n#include <bits/stdc++.h>\n\n// Check if in given vector of numbers, are any two numbers closer to each other than\n// given threshold.\n// >>> has_close_elements((std::vector<float>({(float)1.0f, (float)2.0f, (float)3.0f})), (0.5f))\n// (false)\n// >>> has_close_elements((std::vector<float>({(float)1.0f, (float)2.8f, (float)3.0f, (float)4.0f, (float)5.0f, (float)2.0f})), (0.3f))\n// (true)\nbool has_close_elements(std::vector<float> numbers, float threshold) {\n    // Sort the vector in ascending order\n    std::sort(numbers.begin(), numbers.end());\n\n    // Iterate over the sorted vector\n    for (size_t i = 0; i < numbers.size() - 1; ++i) {\n        // Check if the difference between the current element and the next element is less than the threshold\n        if (numbers[i + 1] - numbers[i] < threshold) {\n            return true; // If a pair of elements is found that are closer than the threshold, return true\n        }\n    }\n\n    // If no pair of elements is found that are closer than the threshold, return false\n    return false;\n}\n\nint main() {\n    std::vector<float> numbers1 = {1.0f, 2.0f, 3.0f};\n    std::vector<float> numbers2 = {1.0f, 2.8f, 3.0f, 4.0f, 5.0f, 2.0f};\n\n    std::cout << std::boolalpha << has_close_elements(numbers1, 0.5f) << std::endl; // Output: false\n    std::cout << std::boolalpha << has_close_elements(numbers2, 0.3f) << std::endl; // Output: true\n\n    return 0;\n}\n"
-n = 5
-print(remove_longest_prefix(A, B, n))
+# print(remove_prefix_by_last_line(A, B))
+
+A = "#include<assert.h>\n#include<bits/stdc++.h>\n// Input to this function is a string containing multiple groups of nested parentheses. Your goal is to\n// separate those group into separate strings and return the vector of those.\n// Separate groups are balanced (each open brace is properly closed) and not nested within each other\n// Ignore any spaces in the input string.\n// >>> separate_paren_groups((\"( ) (( )) (( )( ))\"))\n// (std::vector<std::string>({(std::string)\"()\", (std::string)\"(())\", (std::string)\"(()())\"}))\nstd::vector<std::string> separate_paren_groups(std::string paren_string) {\n"
+B = "#include <assert.h>\n#include <bits/stdc++.h>\n\n// Input to this function is a string containing multiple groups of nested parentheses. Your goal is to\n// separate those group into separate strings and return the vector of those.\n// Separate groups are balanced (each open brace is properly closed) and not nested within each other\n// Ignore any spaces in the input string.\n// >>> separate_paren_groups(\"(( )) (( )( ))\")\n// (std::vector<std::string>({(std::string)\"()\", (std::string)\"(())\", (std::string)\"(()())\"}))\n\nstd::vector<std::string> separate_paren_groups(std::string paren_string) {\n    // Remove spaces from the input string\n    paren_string.erase(std::remove(paren_string.begin(), paren_string.end(), ' '), paren_string.end());\n\n    // Initialize an empty vector to store the groups\n    std::vector<std::string> groups;\n\n    // Initialize an empty string to build the current group\n    std::string current_group;\n\n    // Initialize a counter to keep track of the balance of parentheses\n    int balance = 0;\n\n    // Iterate over the characters in the input string\n    for (char c : paren_string) {\n        // If the character is an open parenthesis, increment the balance\n        if (c == '(') {\n            balance++;\n            current_group += c;\n        }\n        // If the character is a close parenthesis, decrement the balance\n        else if (c == ')') {\n            balance--;\n            current_group += c;\n            // If the balance is zero, it means we've found a complete group\n            if (balance == 0) {\n                groups.push_back(current_group);\n                current_group.clear();\n            }\n        }\n        // If the character is not a parenthesis, ignore it\n    }\n\n    // Return the vector of groups\n    return groups;\n}\n\nint main() {\n    std::string paren_string = \"(( )) (( )( ))\";\n    std::vector<std::string> groups = separate_paren_groups(paren_string);\n\n    // Print the groups\n    for (const auto& group : groups) {\n        std::cout << group << std::endl;\n    }\n\n    return 0;\n}\n"
+# print(remove_prefix_by_last_line(A, B))
+
+
+A = "#include<assert.h>\n#include<bits/stdc++.h>\n// The Fib4 number sequence is a sequence similar to the Fibbonacci sequnece that's defined as follows:\n// fib4(0) -> 0\n// fib4(1) -> 0\n// fib4(2) -> 2\n// fib4(3) -> 0\n// fib4(n) -> fib4(n-1) + fib4(n-2) + fib4(n-3) + fib4(n-4).\n// Please write a function to efficiently compute the n-th element of the fib4 number sequence.  Do not use recursion.\n// >>> fib4((5))\n// (4)\n// >>> fib4((6))\n// (8)\n// >>> fib4((7))\n// (14)\nlong fib4(long n) {\n"
+B = "#include <assert.h>\n#include <bits/stdc++.h>\n\n// The Fib4 number sequence is a sequence similar to the Fibonacci sequence that's defined as follows:\n// fib4(0) -> 0\n// fib4(1) -> 0\n// fib4(2) -> 2\n// fib4(3) -> 0\n// fib4(n) -> fib4(n-1) + fib4(n-2) + fib4(n-3) + fib4(n-4).\n// Please write a function to efficiently compute the n-th element of the fib4 number sequence.  Do not use recursion.\n\n// We can use dynamic programming to solve this problem efficiently. We will store the results of subproblems in an array to avoid redundant calculations.\n\nlong fib4(long n) {\n    // Base cases\n    if (n <= 1) {\n        return 0;\n    } else if (n == 2) {\n        return 2;\n    } else if (n == 3) {\n        return 0;\n    }\n\n    // Initialize an array to store the results of subproblems\n    long fib4[n + 1];\n\n    // Base cases\n    fib4[0] = 0;\n    fib4[1] = 0;\n    fib4[2] = 2;\n    fib4[3] = 0;\n\n    // Compute the n-th element of the fib4 number sequence\n    for (long i = 4; i <= n; i++) {\n        fib4[i] = fib4[i - 1] + fib4[i - 2] + fib4[i - 3] + fib4[i - 4];\n    }\n\n    // Return the n-th element of the fib4 number sequence\n    return fib4[n];\n}\n\nint main() {\n    // Test the function\n    std::cout << \"fib4(5) = \" << fib4(5) << std::endl;\n    std::cout << \"fib4(6) = \" << fib4(6) << std::endl;\n    std::cout << \"fib4(7) = \" << fib4(7) << std::endl;\n\n    return 0;\n}\n"
+# print(remove_prefix_by_last_line(A, B))
+
+A = "package check_if_last_char_is_a_letter_test\n\nimport (\n    \"testing\"\n    \"fmt\"\n)\n\n// Create a function that returns true if the last character\n// of a given string is an alphabetical character and is not\n// a part of a word, and false otherwise.\n// Note: \"word\" is a group of characters separated by space.\n// Examples:\n// >>> check_if_last_char_is_a_letter(\"apple pie\")\n// false\n// >>> check_if_last_char_is_a_letter(\"apple pi e\")\n// true\n// >>> check_if_last_char_is_a_letter(\"apple pi e \")\n// false\n// >>> check_if_last_char_is_a_letter(\"\")\n// false\nfunc check_if_last_char_is_a_letter(txt string) bool {\n"
+B = "package check_if_last_char_is_a_letter_test\n\nimport (\n    \"testing\"\n    \"fmt\"\n)\n\n// Create a function that returns true if the last character\n// of a given string is an alphabetical character and is not\n// a part of a word, and false otherwise.\n// Note: \"word\" is a group of characters separated by space.\n// Examples:\n// >>> check_if_last_char_is_a_letter(\"apple pie\")\n// false\n// >>> check_if_last_char_is_a_letter(\"apple pi e\")\n// true\n// >>> check_if_last_char_is_a_letter(\"apple pi e \")\n// false\n// >>> check_if_last_char_is_a_letter(\"\")\n// false\nfunc check_if_last_char_is_a_letter(txt string) bool {\n    // Remove trailing spaces from the string\n    txt = strings.TrimRight(txt, \" \")\n    \n    // Check if the string is empty\n    if len(txt) == 0 {\n        return false\n    }\n    \n    // Get the last character of the string\n    lastChar := txt[len(txt)-1]\n    \n    // Check if the last character is an alphabetical character\n    if !unicode.IsLetter(rune(lastChar)) {\n        return false\n    }\n    \n    // Check if the last character is not part of a word\n    if strings.Contains(txt[:len(txt)-1], \" \") {\n        return true\n    }\n    \n    return false\n}\n\nfunc TestCheckIfLastCharIsALetter(t *testing.T) {\n    tests := []struct {\n        input string\n        want  bool\n    }{\n        {\"apple pie\", false},\n        {\"apple pi e\", true},\n        {\"apple pi e \", false},\n        {\"\", false},\n        {\"hello world\", false},\n        {\"hello world \", false},\n        {\"hello world \", true},\n    }\n    \n    for _, tt := range tests {\n        got := check_if_last_char_is_a_letter(tt.input)\n        if got != tt.want {\n            t.Errorf(\"check_if_last_char_is_a_letter(%q) = %v, want %v\", tt.input, got, tt.want)\n        }\n    }\n}\n"
+print(remove_prefix_by_last_line(A, B))