fixes

aimclub · Jan 22, 2024 · 194d5a0 · 194d5a0
1 parent d8b7d68
commit 194d5a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/sampo/scheduler/genetic/base.py b/sampo/scheduler/genetic/base.py
@@ -5,7 +5,8 @@
 from sampo.scheduler.genetic.operators import FitnessFunction, TimeFitness
 from sampo.scheduler.genetic.schedule_builder import build_schedule
 from sampo.scheduler.genetic.converter import ChromosomeType, ScheduleGenerationScheme
-from sampo.scheduler import HEFTScheduler, HEFTBetweenScheduler, LFTScheduler
+from sampo.scheduler.heft.base import HEFTScheduler, HEFTBetweenScheduler
+from sampo.scheduler.lft.base import LFTScheduler
 from sampo.scheduler.heft.prioritization import prioritization
 from sampo.scheduler.resource.average_req import AverageReqResourceOptimizer
 from sampo.scheduler.resource.base import ResourceOptimizer
@@ -196,7 +197,7 @@ def init_schedule(scheduler_class) -> tuple[Schedule | None, list[GraphNode] | N
                     return None, None, None
 
         return {
-            "lft": (init_lft_schedule, weights[0]),
+            "lft": (*init_lft_schedule, weights[0]),
             "heft_end": (*init_schedule(HEFTScheduler), weights[1]),
             "heft_between": (*init_schedule(HEFTBetweenScheduler), weights[2]),
             "12.5%": (*init_k_schedule(HEFTScheduler, 8), weights[3]),

diff --git a/sampo/scheduler/genetic/operators.py b/sampo/scheduler/genetic/operators.py
@@ -11,7 +11,8 @@
 
 from sampo.scheduler.genetic.converter import (convert_chromosome_to_schedule, convert_schedule_to_chromosome,
                                                ChromosomeType, ScheduleGenerationScheme)
-from sampo.scheduler import RandomizedTopologicalScheduler, RandomizedLFTScheduler
+from sampo.scheduler.topological.base import RandomizedTopologicalScheduler
+from sampo.scheduler.lft.base import RandomizedLFTScheduler
 from sampo.scheduler.utils import WorkerContractorPool
 from sampo.schemas.contractor import Contractor
 from sampo.schemas.graph import GraphNode, WorkGraph