eflips-opt 0.3.2__tar.gz → 0.3.4__tar.gz

{eflips_opt-0.3.2 → eflips_opt-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eflips-opt
-Version: 0.3.2
+Version: 0.3.4
 Summary: A collection of pre-simulation optimization algorithms for eFLIPS.
 License: AGPLV3.md
 Author: Ludger Heide
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: dash-cytoscape (>=1.0.2,<2.0)
-Requires-Dist: eflips-model (>=3.0.0,<10.0.0)
+Requires-Dist: eflips-model (>=3.0.0,<11.0.0)
 Requires-Dist: eflips-schedule-rust (>=2.0.1,<3.0)
 Requires-Dist: gurobipy (>=12.0.1,<13.0)
 Requires-Dist: kaleido (==0.2.1)

{eflips_opt-0.3.2 → eflips_opt-0.3.4}/eflips/opt/depot_rotation_matching.py

@@ -22,8 +22,9 @@ from eflips.model import (
     Event,
     Vehicle,
 )
-from geoalchemy2.shape import to_shape
+from geoalchemy2.shape import to_shape, from_shape
 from pyomo.common.timing import report_timing  # type: ignore
+from shapely import Point  # type: ignore
 
 from eflips.opt.util import (
     get_vehicletype,
@@ -484,7 +485,9 @@ class DepotRotationOptimizer:
                     new_depot_station = Station(
                         name=depot["name"],
                         scenario_id=self.scenario_id,
-                        geom=f"POINT({depot['depot_station'][0]} {depot['depot_station'][1]} 0)",
+                        geom=from_shape(
+                            Point(depot["depot_station"][0], depot["depot_station"][1])
+                        ),
                         is_electrified=False,  # TODO Hardcoded for now
                     )
                     self.session.add(new_depot_station)
@@ -499,7 +502,6 @@ class DepotRotationOptimizer:
 
         assert isinstance(new_assign, pd.DataFrame), "Result data should be a DataFrame"
         for row in new_assign.itertuples():
-
             # Add depot if it is a new depot, else get the depot station id
             if isinstance(depot_from_user[row.new_depot_id]["depot_station"], Tuple):  # type: ignore
                 # newly added depot

{eflips_opt-0.3.2 → eflips_opt-0.3.4}/eflips/opt/smart_charging.py

@@ -208,6 +208,12 @@ class SmartChargingEvent:
         socs_list = list(socs)
         socs_float_list = [float(s) for s in socs]
 
+        # Handling rounding errors
+
+        for soc in socs_float_list:
+            if soc > 1.0 and soc - 1.0 < 1e-6:
+                socs_float_list[socs_float_list.index(soc)] = 1.0
+
         # Create timeseries dictionary and update event
         tz = time_step_starts[0].tzinfo
         times_datetime = [datetime.fromtimestamp(t, tz) for t in times]

{eflips_opt-0.3.2 → eflips_opt-0.3.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "eflips-opt"
-version = "0.3.2"
+version = "0.3.4"
 description = "A collection of pre-simulation optimization algorithms for eFLIPS."
 authors = [
     { name = "Ludger Heide", email = "ludger.heide@tu-berlin.de" },
@@ -10,7 +10,7 @@ readme = "README.md"
 license = "AGPLV3.md"
 requires-python = ">=3.10, <3.14"
 dependencies = [
-    "eflips-model (>=3.0.0, <10.0.0)",
+    "eflips-model (>=3.0.0, <11.0.0)",
     "pandas (>=2.1, <3.0)",
     "shapely (>=2.0.3, <3.0)",
     "openrouteservice (>=2.3.3, <3.0)",