ubc-solar-physics 1.3.0__tar.gz → 1.4.0__tar.gz

{ubc_solar_physics-1.3.0 → ubc_solar_physics-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ubc-solar-physics
-Version: 1.3.0
+Version: 1.4.0
 Summary: UBC Solar's Simulation Environment
 Author: Fisher Xue, Mihir Nimgade, Chris Chang, David Widjaja, Justin Hua, Ilya Veksler, Renu Rajamagesh, Ritchie Xia, Erik Langille, Chris Aung, Nicolas Ric, Ishaan Trivedi, Jason Liang, Felix Toft, Mack Wilson, Jonah Lee, Tamzeed Quazi, Joshua Riefman
 Author-email: UBC Solar <strategy@ubcsolar.com>
@@ -42,7 +42,7 @@ License-File: LICENSE
 Requires-Dist: backports.tarfile==1.2.0
 Requires-Dist: certifi==2024.7.4
 Requires-Dist: charset-normalizer==3.3.2
-Requires-Dist: dill==0.3.8
+Requires-Dist: dill>=0.3.8
 Requires-Dist: haversine==2.8.1
 Requires-Dist: idna==3.7
 Requires-Dist: importlib_metadata==8.2.0

{ubc_solar_physics-1.3.0 → ubc_solar_physics-1.4.0}/physics/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.3.0'
-__version_tuple__ = version_tuple = (1, 3, 0)
+__version__ = version = '1.4.0'
+__version_tuple__ = version_tuple = (1, 4, 0)

{ubc_solar_physics-1.3.0 → ubc_solar_physics-1.4.0}/physics/models/regen/basic_regen.py

@@ -12,6 +12,18 @@ class BasicRegen(BaseRegen):
         self.vehicle_mass = vehicle_mass
         self.kmh_to_mps = 0.278
 
+    def get_regen_efficiency(self, speed_array):
+        """
+        Returns a numpy array of regen efficiency percentage based on the vehicle speed in m/s.
+
+        :param speed_array: a numpy array of speeds in m/s
+        :returns: numpy array of regen efficiency percentage
+        """
+        # Efficiency polynomial, more details can be found in regen_analysis folder located in data_analysis
+        efficiency_poly = [0.022288416685942, 0.026545396753597]
+
+        return np.polyval(efficiency_poly, speed_array)
+
     def calculate_produced_energy(self, speed_kmh, gis_route_elevations, min_regen_speed, max_power):
         """
         Returns a numpy array containing the energy produced by regen
@@ -29,7 +41,8 @@ class BasicRegen(BaseRegen):
 
         # create regen energy produced array
         # if delta_energy is negative, we regen that energy back at the set efficiency rate; else 0 energy regen
-        produced_energy = np.where(delta_energy < 0, abs(delta_energy) * self.EFFICIENCY, 0)
+        efficiencies = self.get_regen_efficiency(speed_ms)
+        produced_energy = np.where(delta_energy < 0, abs(delta_energy) * efficiencies, 0)
 
         # Regen does not occur below a certain speed
         produced_energy = np.where(speed_ms >= min_regen_speed, produced_energy, 0)

{ubc_solar_physics-1.3.0 → ubc_solar_physics-1.4.0}/pyproject.toml

@@ -52,7 +52,7 @@ dependencies = [
     "backports.tarfile==1.2.0",
     "certifi==2024.7.4",
     "charset-normalizer==3.3.2",
-    "dill==0.3.8",
+    "dill>=0.3.8",
     "haversine==2.8.1",
     "idna==3.7",
     "importlib_metadata==8.2.0",

{ubc_solar_physics-1.3.0 → ubc_solar_physics-1.4.0}/ubc_solar_physics.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ubc-solar-physics
-Version: 1.3.0
+Version: 1.4.0
 Summary: UBC Solar's Simulation Environment
 Author: Fisher Xue, Mihir Nimgade, Chris Chang, David Widjaja, Justin Hua, Ilya Veksler, Renu Rajamagesh, Ritchie Xia, Erik Langille, Chris Aung, Nicolas Ric, Ishaan Trivedi, Jason Liang, Felix Toft, Mack Wilson, Jonah Lee, Tamzeed Quazi, Joshua Riefman
 Author-email: UBC Solar <strategy@ubcsolar.com>
@@ -42,7 +42,7 @@ License-File: LICENSE
 Requires-Dist: backports.tarfile==1.2.0
 Requires-Dist: certifi==2024.7.4
 Requires-Dist: charset-normalizer==3.3.2
-Requires-Dist: dill==0.3.8
+Requires-Dist: dill>=0.3.8
 Requires-Dist: haversine==2.8.1
 Requires-Dist: idna==3.7
 Requires-Dist: importlib_metadata==8.2.0

{ubc_solar_physics-1.3.0 → ubc_solar_physics-1.4.0}/ubc_solar_physics.egg-info/requires.txt

@@ -1,7 +1,7 @@
 backports.tarfile==1.2.0
 certifi==2024.7.4
 charset-normalizer==3.3.2
-dill==0.3.8
+dill>=0.3.8
 haversine==2.8.1
 idna==3.7
 importlib_metadata==8.2.0