Merge pull request #147 from NREL/feature/reorder-dispatcher

nreinicke · web-flow · commit baa0bcd97131 · 2023-03-30T08:34:32.000-06:00
reorder dispatchers so charge instructions trump rides.
diff --git a/nrel/hive/initialization/load.py b/nrel/hive/initialization/load.py
@@ -91,8 +91,8 @@ def load_simulation(
 
     if custom_instruction_generators is None:
         instruction_generators = (
-            ChargingFleetManager(env.config.dispatcher),
             Dispatcher(env.config.dispatcher),
+            ChargingFleetManager(env.config.dispatcher),
         )
         update = Update.build(env.config, instruction_generators)
     else:

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,8 @@ def load_simulation(`
`91`	`91`
`92`	`92`	`if custom_instruction_generators is None:`
`93`	`93`	`instruction_generators = (`
`94`		`- ChargingFleetManager(env.config.dispatcher),`
`95`	`94`	`Dispatcher(env.config.dispatcher),`
	`95`	`+ ChargingFleetManager(env.config.dispatcher),`
`96`	`96`	`)`
`97`	`97`	`update = Update.build(env.config, instruction_generators)`
`98`	`98`	`else:`