eflips-depot 4.1.1__tar.gz → 4.1.3__tar.gz

{eflips_depot-4.1.1 → eflips_depot-4.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eflips-depot
-Version: 4.1.1
+Version: 4.1.3
 Summary: Depot Simulation for eFLIPS
 Home-page: https://github.com/mpm-tu-berlin/eflips-depot
 License: AGPL-3.0-or-later
@@ -128,5 +128,5 @@ This project is licensed under the AGPLv3 license - see the [LICENSE](LICENSE.md
 
 ## Funding Notice
 
-This code was developed as part of the project [eBus2030+](https://www.eflip.de/) funded by the Federal German Ministry for Digital and Transport (BMDV) under grant number 03EMF0402.
+This code was developed as part of the project [eBus2030+]([https://www.eflip.de/](https://www.now-gmbh.de/projektfinder/e-bus-2030/)) funded by the Federal German Ministry for Digital and Transport (BMDV) under grant number 03EMF0402.
 

{eflips_depot-4.1.1 → eflips_depot-4.1.3}/README.md

@@ -104,4 +104,4 @@ This project is licensed under the AGPLv3 license - see the [LICENSE](LICENSE.md
 
 ## Funding Notice
 
-This code was developed as part of the project [eBus2030+](https://www.eflip.de/) funded by the Federal German Ministry for Digital and Transport (BMDV) under grant number 03EMF0402.
+This code was developed as part of the project [eBus2030+]([https://www.eflip.de/](https://www.now-gmbh.de/projektfinder/e-bus-2030/)) funded by the Federal German Ministry for Digital and Transport (BMDV) under grant number 03EMF0402.

{eflips_depot-4.1.1 → eflips_depot-4.1.3}/eflips/depot/api/__init__.py

@@ -33,6 +33,7 @@ import warnings
 from collections import OrderedDict
 from datetime import timedelta
 from enum import Enum
+from math import ceil
 from typing import Any, Dict, Optional, Union, List
 
 import numpy as np
@@ -47,7 +48,6 @@ from eflips.model import (
     Trip,
     Vehicle,
 )
-from math import ceil
 from sqlalchemy.orm import Session
 from sqlalchemy.sql import select
 
@@ -1270,7 +1270,11 @@ def _add_soc_to_events(dict_of_events, battery_log) -> None:
                 if log[0] < process_dict["end"] < battery_log_list[j + 1][0]:
                     soc_end = log[1]
 
+                if soc_start is not None:
+                    soc_start = min(soc_start, 1)  # so
                 process_dict["soc_start"] = soc_start
+                if soc_end is not None:
+                    soc_end = min(soc_end, 1)  # soc should not exceed 1
                 process_dict["soc_end"] = soc_end
 
             else:

{eflips_depot-4.1.1 → eflips_depot-4.1.3}/eflips/depot/api/private/smart_charging.py

@@ -153,7 +153,7 @@ def optimize_charging_events_even(charging_events: List[Event]) -> None:
 
         # Make sure the transferred energy is the same
         post_opt_energy = (
-            scipy.integrate.trapz(optimized_power, total_time) / 3600
+            scipy.integrate.trapezoid(optimized_power, total_time) / 3600
         )  # kWh
 
         if False:
@@ -238,7 +238,7 @@ def optimize_charging_events_even(charging_events: List[Event]) -> None:
         )  # +1 to include the last index
         powers = params_for_event["optimized_power"][start_index:end_index]
 
-        energies = scipy.integrate.cumtrapz(powers, initial=0) / (
+        energies = scipy.integrate.cumulative_trapezoid(powers, initial=0) / (
             3600 / TEMPORAL_RESOLUTION.total_seconds()
         )  # kWh
         socs = event.soc_start + energies / event.vehicle.vehicle_type.battery_capacity
@@ -306,13 +306,15 @@ def optimize_charging_events_even(charging_events: List[Event]) -> None:
         )
 
         # Energy transferred
-        total_energy = scipy.integrate.cumtrapz(total_power, total_time, initial=0)
+        total_energy = scipy.integrate.cumulative_trapezoid(
+            total_power, total_time, initial=0
+        )
         axs[1].plot(total_time, total_energy, label="Original energy transferred")
-        optimized_energy = scipy.integrate.cumtrapz(
+        optimized_energy = scipy.integrate.cumulative_trapezoid(
             optimized_power, total_time, initial=0
         )
         axs[1].plot(total_time, optimized_energy, label="Optimized energy transferred")
-        optimized_energy2 = scipy.integrate.cumtrapz(
+        optimized_energy2 = scipy.integrate.cumulative_trapezoid(
             optimized_power2, total_time, initial=0
         )
         axs[1].plot(total_time, optimized_energy2, label="Mean energy transferred")

{eflips_depot-4.1.1 → eflips_depot-4.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "eflips-depot"
-version = "4.1.1"
+version = "4.1.3"
 description = "Depot Simulation for eFLIPS"
 authors = ["Enrico Lauth <enrico.lauth@tu-berlin.de>",
     "Ludger Heide <ludger.heide@tu-berlin.de",