eflips-depot 1.1.0__py3-none-any.whl → 1.1.1__py3-none-any.whl

eflips/depot/api/__init__.py

@@ -833,13 +833,20 @@ def _add_evaluation_to_database(
                 f"Could not find Rotation {schedule_id} in scenario {scenario_id}."
             )
         else:
-            rotation_q.update({"vehicle_id": vehicle_id})
-            for trip in rotation_q.one().trips:
-                for event in trip.events:
-                    assert event.vehicle_id is None
-                    assert event.event_type == EventType.DRIVING
-                    event.vehicle_id = vehicle_id
-                    event.time_end = event.time_end - timedelta(seconds=1)
+            old_vehicle_id = rotation_q.one().vehicle_id
+            if old_vehicle_id is None:
+                rotation_q.update({"vehicle_id": vehicle_id})
+                for trip in rotation_q.one().trips:
+                    for event in trip.events:
+                        event.vehicle_id = vehicle_id
+            else:
+                # If there already is a vehicle assigned to this rotation, we need to change all teh events by this
+                # vehicle to the new vehicle
+                event_q = session.query(Event).filter(
+                    Event.vehicle_id == old_vehicle_id
+                )
+                event_q.update({"vehicle_id": vehicle_id})
+                rotation_q.update({"vehicle_id": vehicle_id})
 
     # Write Events
     session.add_all(list_of_events)

{eflips_depot-1.1.0.dist-info → eflips_depot-1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eflips-depot
-Version: 1.1.0
+Version: 1.1.1
 Summary: Depot Simulation for eFLIPS
 License: AGPLv3
 Author: Enrico Lauth

{eflips_depot-1.1.0.dist-info → eflips_depot-1.1.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 eflips/depot/__init__.py,sha256=n7jte8R6j_Ad4Mp4hkklKwil5r8u8Q_SbXrCC-nf5jM,1556
-eflips/depot/api/__init__.py,sha256=Xcobz0SyC6VsYbyF4HZvx-YKpg2Tpr0tnjUuHSPe-M4,35823
+eflips/depot/api/__init__.py,sha256=0gORABah_O9IHEzKNYNje2XhzY9pZ1RsC5hw0aEzxEE,36171
 eflips/depot/api/defaults/default_settings.json,sha256=0eUDTw_rtLQFvthP8oJL93iRXlmAOravAg-4qqGMQAY,5375
 eflips/depot/api/private.py,sha256=69YtWfg4s62YJW5qsdycUfxwNR1rSfCAOcuLp-kBabw,22129
 eflips/depot/configuration.py,sha256=Op3hlir-dEN7yHr0kTqbYANoCBKFWK6uKOv3NJl8w_w,35678
@@ -32,7 +32,7 @@ eflips/depot/simulation.py,sha256=tJHUVCGMf-7aZGYmb5lz02TRcTRxV1RRRqxmIuEtlJ4,10
 eflips/depot/smart_charging.py,sha256=C3BYqzn2-OYY4ipXm0ETtavbAM9QXZMYULBpVoChf0E,54311
 eflips/depot/standalone.py,sha256=VxcTzBaB67fNJUMmjPRwKXjhqTy6oQ41Coote2LvAmk,22338
 eflips/depot/validation.py,sha256=TIuY7cQtEJI4H2VVMSuY5IIVkacEEZ67weeMuY3NSAM,7097
-eflips_depot-1.1.0.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-1.1.0.dist-info/METADATA,sha256=2O0Dd55bGITf_jj-5mHmRxswGGr4YIU1tLLM_bpPZ9g,5597
-eflips_depot-1.1.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-eflips_depot-1.1.0.dist-info/RECORD,,
+eflips_depot-1.1.1.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-1.1.1.dist-info/METADATA,sha256=9Cy7r42VIiwAcO3SAz-ti0KXuhFIvcVsNLvGFxh_pOc,5597
+eflips_depot-1.1.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+eflips_depot-1.1.1.dist-info/RECORD,,