Skip to content

Remove conditionals that wrap around identical regex assignments #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jwendt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove conditionals that wrap around identical regex assignments #108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 5 additions & 17 deletions spider2-lite/evaluation_suite/evaluate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,11 +261,8 @@ def evaluate_spider2sql(args):
error_info = dbms_error_info
else:
pred_pd = pd.read_csv(os.path.join("temp", f"{id}.csv"))
if '_' in id:
pattern = re.compile(rf'^{re.escape(id)}(_[a-z])?\.csv$')
else:
pattern = re.compile(rf'^{re.escape(id)}(_[a-z])?\.csv$')

pattern = re.compile(rf'^{re.escape(id)}(_[a-z])?\.csv$')

all_files = os.listdir(gold_result_dir)
csv_files = [file for file in all_files if pattern.match(file)]
csv_files = sorted(csv_files)
Expand Down Expand Up @@ -293,10 +290,7 @@ def evaluate_spider2sql(args):
error_info = dbms_error_info
else:
pred_pd = pd.read_csv(os.path.join("temp", f"{id}.csv"))
if '_' in id:
pattern = re.compile(rf'^{re.escape(id)}(_[a-z])?\.csv$')
else:
pattern = re.compile(rf'^{re.escape(id)}(_[a-z])?\.csv$')
pattern = re.compile(rf'^{re.escape(id)}(_[a-z])?\.csv$')

all_files = os.listdir(gold_result_dir)
csv_files = [file for file in all_files if pattern.match(file)]
Expand Down Expand Up @@ -324,10 +318,7 @@ def evaluate_spider2sql(args):
error_info = dbms_error_info
else:
pred_pd = pd.read_csv(os.path.join("temp", f"{id}.csv"))
if '_' in id:
pattern = re.compile(rf'^{re.escape(id)}(_[a-z])?\.csv$')
else:
pattern = re.compile(rf'^{re.escape(id)}(_[a-z])?\.csv$')
pattern = re.compile(rf'^{re.escape(id)}(_[a-z])?\.csv$')

all_files = os.listdir(gold_result_dir)
csv_files = [file for file in all_files if pattern.match(file)]
Expand All @@ -350,10 +341,7 @@ def evaluate_spider2sql(args):
elif mode == "exec_result":
try:
pred_pd = pd.read_csv(os.path.join(args.result_dir, f"{id}.csv"))
if '_' in id:
pattern = re.compile(rf'^{re.escape(id)}(_[a-z])?\.csv$')
else:
pattern = re.compile(rf'^{re.escape(id)}(_[a-z])?\.csv$')
pattern = re.compile(rf'^{re.escape(id)}(_[a-z])?\.csv$')
all_files = os.listdir(gold_result_dir)
csv_files = [file for file in all_files if pattern.match(file)]
csv_files = sorted(csv_files)
Expand Down