[src/all] Remove option to not refuse rentals

indyfree · indyfree · commit 6e28a68c2e2f · 2019-04-16T14:51:40.000+02:00
diff --git a/src/evsim/controller/controller.py b/src/evsim/controller/controller.py
@@ -9,13 +9,7 @@
 
 class Controller:
     def __init__(
-        self,
-        cfg,
-        strategy,
-        accuracy=(100, 100),
-        risk=(0, 0),
-        imbalance_costs=1000,
-        refuse_rentals=True,
+        self, cfg, strategy, accuracy=(100, 100), risk=(0, 0), imbalance_costs=1000
     ):
         self.logger = logging.getLogger(__name__)
 
@@ -42,9 +36,6 @@ def __init__(
         self.env = None
         self.vpp = None
 
-        # Strategy specific optionals
-        self.refuse_rentals = refuse_rentals
-
     def log(self, message, level=None):
         if level is None:
             level = self.logger.info
diff --git a/src/evsim/entities/ev.py b/src/evsim/entities/ev.py
@@ -62,16 +62,7 @@ def charge_timestep(self):
             self.debug("Remove from VPP. Too full!")
             self.vpp.remove(self)
 
-    def drive(
-        self,
-        rental,
-        duration,
-        trip_charge,
-        end_charger,
-        trip_price,
-        account,
-        refuse=True,
-    ):
+    def drive(self, rental, duration, trip_charge, end_charger, trip_price, account):
         self.log("Starting trip %d." % rental)
 
         # 1. Check if enough battery for trip left
@@ -87,11 +78,7 @@ def drive(
 
         # TODO: Check overcommitments with perfect benchmark strategy
         # 2. Refuse rental if other EVs in VPP can not substitute capacity
-        if (
-            refuse
-            and self.vpp.contains(self)
-            and self.vpp.commited_capacity > self.vpp.capacity()
-        ):
+        if self.vpp.contains(self) and self.vpp.commited_capacity > self.vpp.capacity():
             self.log(
                 (
                     "Refusing rental! "
diff --git a/src/evsim/evsim.py b/src/evsim/evsim.py
@@ -97,28 +97,15 @@ def cli(ctx, debug, name, logs):
     default=(0.0, 0.0),
     show_default=True,
 )
-@click.option(
-    "--refuse-rentals/--no-refuse-rentals",
-    default=True,
-    help="Refuses rentals of EV that are commited to VPP.",
-)
 def simulate(
-    ctx,
-    ev_capacity,
-    charging_speed,
-    charging_strategy,
-    industry_tariff,
-    refuse_rentals,
-    accuracy,
-    risk,
+    ctx, ev_capacity, charging_speed, charging_strategy, industry_tariff, accuracy, risk
 ):
     click.echo("--- Simulation Settings: ---")
     click.echo("Debug is %s." % (ctx.obj["DEBUG"] and "on" or "off"))
     click.echo("Writing Logs to file is %s." % (ctx.obj["LOGS"] and "on" or "off"))
     click.echo("EV battery capacity is set to %skWh." % ev_capacity)
     click.echo("Charging speed is set to %skW." % charging_speed)
     click.echo("Industry electricity tariff is set to %sEUR/MWh." % industry_tariff)
-    click.echo("Refusing rentals is set to %s." % (refuse_rentals and "on" or "off"))
     click.echo("Charging strategy is set to %s" % charging_strategy)
     click.echo("Prediction accuracy is set to (%d%%, %d%%)." % accuracy)
     click.echo("Bidding risk is set to (%.2f, %.2f)." % risk)
@@ -136,9 +123,7 @@ def simulate(
         ctx.obj["NAME"], charging_speed, ev_capacity, industry_tariff
     )
 
-    controller = Controller(
-        cfg, s, accuracy=accuracy, risk=risk, refuse_rentals=refuse_rentals
-    )
+    controller = Controller(cfg, s, accuracy=accuracy, risk=risk)
     sim = Simulation(cfg, controller)
 
     click.echo("--- Starting Simulation: ---")
diff --git a/src/evsim/simulation/simulation.py b/src/evsim/simulation/simulation.py
@@ -127,7 +127,6 @@ def lifecycle(self):
                         trip.end_charging,
                         trip.trip_price,
                         account=self.controller.account,
-                        refuse=self.controller.refuse_rentals,
                     )
                 )
 

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,6 @@ def lifecycle(self):`
`127`	`127`	`trip.end_charging,`
`128`	`128`	`trip.trip_price,`
`129`	`129`	`account=self.controller.account,`
`130`		`- refuse=self.controller.refuse_rentals,`
`131`	`130`	`)`
`132`	`131`	`)`
`133`	`132`