From ff892255a4841e40c956437fe9c8ddf3d43b6a04 Mon Sep 17 00:00:00 2001 From: Shawnsdaddy Date: Fri, 31 Jan 2025 20:28:58 -0800 Subject: [PATCH] =?UTF-8?q?#715=20=E5=AE=BF=E8=88=8D=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E5=8F=98=E6=88=90=E4=B8=8B=E7=8F=AD=E6=9D=A5=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E8=BD=AC=E7=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arknights_mower/solvers/base_schedule.py | 4 +++- arknights_mower/tests/scheduler_task_tests.py | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/arknights_mower/solvers/base_schedule.py b/arknights_mower/solvers/base_schedule.py index 60d5db36a..3fece1dee 100644 --- a/arknights_mower/solvers/base_schedule.py +++ b/arknights_mower/solvers/base_schedule.py @@ -1412,7 +1412,9 @@ def plan_solver(self): datetime.now() + timedelta(minutes=0.75 * len(re_order_dorm_plan)) ): logger.info(f"新增宿舍移位任务{re_order_dorm_plan}") - task = SchedulerTask(task_plan=re_order_dorm_plan) + task = SchedulerTask( + task_plan=re_order_dorm_plan, task_type=TaskTypes.SHIFT_OFF + ) self.tasks.append(task) def resting(self): diff --git a/arknights_mower/tests/scheduler_task_tests.py b/arknights_mower/tests/scheduler_task_tests.py index 5630b4062..8bb3d46f9 100644 --- a/arknights_mower/tests/scheduler_task_tests.py +++ b/arknights_mower/tests/scheduler_task_tests.py @@ -379,6 +379,9 @@ def test_reorder_1(self): op_data.dorm[2].name = "夕" plan = try_reorder(op_data) self.assertEqual(len(plan), 2) + tasks = [SchedulerTask(task_plan=plan, task_type=TaskTypes.SHIFT_OFF)] + check_dorm_ordering(tasks, op_data) + self.assertEqual(len(tasks), 2) def test_reorder_2(self): # 非高优高效不会被移动 @@ -392,6 +395,9 @@ def test_reorder_2(self): self.assertEqual(len(plan), 3) self.assertEqual(plan["dormitory_1"][2], "夕") self.assertEqual(plan["dormitory_1"][4], "凯尔希") + tasks = [SchedulerTask(task_plan=plan, task_type=TaskTypes.SHIFT_OFF)] + check_dorm_ordering(tasks, op_data) + self.assertEqual(len(tasks), 2) def test_reorder_3(self): # 如果高优都占了，则不动 @@ -407,6 +413,9 @@ def test_reorder_3(self): plan = try_reorder(op_data) self.assertEqual(plan["dormitory_1"][2], "夕") self.assertEqual(plan["dormitory_1"][3], "见行者") + tasks = [SchedulerTask(task_plan=plan, task_type=TaskTypes.SHIFT_OFF)] + check_dorm_ordering(tasks, op_data) + self.assertEqual(len(tasks), 2) def init_opdata(self): agent_base_config = PlanConfig(