From e5e813fc90d2c8523fbbf64e5d76806376e84fc1 Mon Sep 17 00:00:00 2001 From: Dimos Tsouros Date: Tue, 13 May 2025 19:01:51 +0200 Subject: [PATCH 1/5] default values for job-shop --- pycona/benchmarks/job_shop_scheduling.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pycona/benchmarks/job_shop_scheduling.py b/pycona/benchmarks/job_shop_scheduling.py index 7e65b50..b59f28b 100644 --- a/pycona/benchmarks/job_shop_scheduling.py +++ b/pycona/benchmarks/job_shop_scheduling.py @@ -8,7 +8,7 @@ from ..problem_instance import ProblemInstance, absvar -def construct_job_shop_scheduling_problem(n_jobs, machines, horizon, seed=0): +def construct_job_shop_scheduling_problem(n_jobs=10, machines=2, horizon=15, seed=0): """ :return: a ProblemInstance object, along with a constraint-based oracle """ From e2ef0af8260d1a78840db9b63fe79a7bf60731f6 Mon Sep 17 00:00:00 2001 From: Dimos Tsouros Date: Tue, 13 May 2025 19:01:57 +0200 Subject: [PATCH 2/5] default sudoku --- pycona/benchmarks/sudoku.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pycona/benchmarks/sudoku.py b/pycona/benchmarks/sudoku.py index 93233a8..f27bd56 100644 --- a/pycona/benchmarks/sudoku.py +++ b/pycona/benchmarks/sudoku.py @@ -4,7 +4,7 @@ from ..problem_instance import ProblemInstance, absvar -def construct_sudoku(block_size_row, block_size_col, grid_size): +def construct_sudoku(block_size_row=3, block_size_col=3, grid_size=9): """ :return: a ProblemInstance object, along with a constraint-based oracle """ From 00c0ae4073beed89af41364fe2167c6aa1a23052 Mon Sep 17 00:00:00 2001 From: Dimos Tsouros Date: Tue, 13 May 2025 19:03:48 +0200 Subject: [PATCH 3/5] change exam tt default values --- pycona/benchmarks/exam_timetabling.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pycona/benchmarks/exam_timetabling.py b/pycona/benchmarks/exam_timetabling.py index bb6cca4..a82ca4f 100644 --- a/pycona/benchmarks/exam_timetabling.py +++ b/pycona/benchmarks/exam_timetabling.py @@ -8,7 +8,7 @@ def day_of_exam(course, slots_per_day): return course // slots_per_day -def construct_examtt_simple(nsemesters=9, courses_per_semester=6, slots_per_day=9, days_for_exams=14): +def construct_examtt_simple(nsemesters=6, courses_per_semester=3, slots_per_day=3, days_for_exams=10): """ :return: a ProblemInstance object, along with a constraint-based oracle """ From 98cca30069b9af9db8c32466dbb9f670a6bc66c8 Mon Sep 17 00:00:00 2001 From: Dimos Tsouros Date: Tue, 13 May 2025 19:04:03 +0200 Subject: [PATCH 4/5] use default constructors in benchmarks for tests --- tests/test_algorithms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_algorithms.py b/tests/test_algorithms.py index 102b631..9e2e880 100644 --- a/tests/test_algorithms.py +++ b/tests/test_algorithms.py @@ -11,7 +11,7 @@ # Modify the problem generators for fast tests fast_problem_generators = [construct_murder_problem()] # Keep only the smallest problem -problem_generators = [construct_murder_problem(), construct_examtt_simple(6, 3, 2, 10), construct_nurse_rostering()] +problem_generators = [construct_murder_problem(), construct_examtt_simple(), construct_nurse_rostering()] classifiers = [DecisionTreeClassifier(), RandomForestClassifier()] algorithms = [ca.QuAcq(), ca.MQuAcq(), ca.MQuAcq2(), ca.GQuAcq(), ca.PQuAcq()] From 8c30643437333e8509bd2fc08c51390bb89b5394 Mon Sep 17 00:00:00 2001 From: Dimos Tsouros Date: Tue, 13 May 2025 19:05:44 +0200 Subject: [PATCH 5/5] smaller sudoku --- pycona/benchmarks/sudoku.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pycona/benchmarks/sudoku.py b/pycona/benchmarks/sudoku.py index f27bd56..aff334e 100644 --- a/pycona/benchmarks/sudoku.py +++ b/pycona/benchmarks/sudoku.py @@ -4,7 +4,7 @@ from ..problem_instance import ProblemInstance, absvar -def construct_sudoku(block_size_row=3, block_size_col=3, grid_size=9): +def construct_sudoku(block_size_row=2, block_size_col=2, grid_size=4): """ :return: a ProblemInstance object, along with a constraint-based oracle """