ubc-solar-physics 1.7.10__cp310-cp310-win_amd64.whl → 1.7.11__cp310-cp310-win_amd64.whl

physics/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.7.10'
-__version_tuple__ = version_tuple = (1, 7, 10)
+__version__ = version = '1.7.11'
+__version_tuple__ = version_tuple = (1, 7, 11)

physics/environment/gis/base_gis.py

@@ -33,6 +33,7 @@ class BaseGIS(ABC):
             average_lap_speeds: ArrayLike,
             simulation_dt: int,
             driving_allowed: ArrayLike,
-            idle_time: int
+            idle_time: int,
+            laps_per_speed: int
     ) -> NDArray[float]:
         raise NotImplementedError

physics/environment/gis/gis.py

@@ -88,7 +88,8 @@ class GIS(BaseGIS):
             average_lap_speeds: ArrayLike,
             simulation_dt: int,
             driving_allowed: ArrayLike,
-            idle_time: int
+            idle_time: int,
+            laps_per_speed: int
     ) -> NDArray[float]:
         """
         Generate valid driving speeds as a simulation-time array given a set of average speeds for each
@@ -105,6 +106,7 @@ class GIS(BaseGIS):
             are allowed to drive, and `False` is when we are not. Requires that (at least) the first element is
             `False` due to the race beginning in the morning before we are allowed to drive.
         :param idle_time: The length of time to pause driving upon processing a "0m/s" average speed.
+        :param laps_per_speed: The amount of laps that we expect to use with each speed value.
         :return: A simulation-time array of driving speeds in m/s, or an error if there weren't enough
             laps provided to fill the entire simulation time.
         """
@@ -112,7 +114,7 @@ class GIS(BaseGIS):
             np.array(average_lap_speeds).astype(np.float64),
             simulation_dt,
             np.array(driving_allowed).astype(bool),
-            self.path_length,
+            self.path_length  * laps_per_speed,
             idle_time
         )
 

{ubc_solar_physics-1.7.10.dist-info → ubc_solar_physics-1.7.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ubc-solar-physics
-Version: 1.7.10
+Version: 1.7.11
 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>

{ubc_solar_physics-1.7.10.dist-info → ubc_solar_physics-1.7.11.dist-info}/RECORD

@@ -1,6 +1,6 @@
-physics_rs.cp310-win_amd64.pyd,sha256=vBurKdf0Hm2xnqK9utMK-DGMfzesA-m-bLjUXPoXFXw,403968
+physics_rs.cp310-win_amd64.pyd,sha256=tPzjm7Ur2FiwPbrkk44N199yUvie-YNPZcwbMQA2Lpg,403968
 physics/__init__.py,sha256=jRV9J_eGh0vNXEfFrILqcM6xxVjyqm3XwKAg1B1IPBs,183
-physics/_version.py,sha256=zbyvF0vz47l4h-H6959cL3Wr3-3fvCmzNwo4YNvowmQ,429
+physics/_version.py,sha256=HRGXDoKiVvyY2WqCYXoS14uXeoAhguOg9D8CgX6rGAs,429
 physics/environment.rs,sha256=OghmBkvHLZvzzuVsXUmV2lR3X_tEwuB9sT2TGZLQC6E,36
 physics/lib.rs,sha256=bvDbtWtLCH-YGSgvzsdKj-S7QVySc3sree6GUqfs-m0,7332
 physics/models.rs,sha256=747ABP-D1XKxA6X_MNh1PbmST0zsxpxhP_pEWjbR46c,63
@@ -9,8 +9,8 @@ physics/environment/environment.rs,sha256=-VztdV2_GSlRbyIV_Pt6gKPVxpuNXpjLgAmoer
 physics/environment/gis.rs,sha256=9R7G0cjf5PxQAz-CSryA6-KGfrh1eSwRhJ6qF8KfjDE,12
 physics/environment/meteorology.rs,sha256=naWb7qYrtMkCE_tLAkM474fmxaufhCkyhy3TTUQ4Yw4,20
 physics/environment/gis/__init__.py,sha256=SjqhVjuDbZln636zOFROq1tWPfadghkuYz8aheflyxA,96
-physics/environment/gis/base_gis.py,sha256=BsrF-r67XMwhjeKqB3zuNOmiC4jFV7HXfpZ_g6ZPASE,1084
-physics/environment/gis/gis.py,sha256=jESOVeHvBRxA1SXTLrjbLo5eqH1AmMmHNm1FVLY5FTU,13580
+physics/environment/gis/base_gis.py,sha256=uURk7bcbhMRT8Zoeqm8MJ_z4qnn3X1eG4owt3TpQb10,1118
+physics/environment/gis/gis.py,sha256=jUO4iU9mWcx4wB8Mh4qJYVcTY8Ktyk7u2g4KTEa8Fmg,13728
 physics/environment/gis/gis.rs,sha256=nyCekzEJCJTpm4Zy6shIm0AEoGsk6TljP-j7KlLn-38,4978
 physics/environment/meteorology/__init__.py,sha256=mvjJw_0nNLIdh80F_yTaRC3Sw3oI-z1L0J5cOK_ei0k,157
 physics/environment/meteorology/base_meteorology.py,sha256=n0JsEXQLuciEatQp_S0QBXd_HQzCY5LeIQeVKgl5O-8,2487
@@ -50,8 +50,8 @@ physics/models/regen/base_regen.py,sha256=lY44jrTSHEo8Xv7hKCjo4C3Jx0PUgilyITHwQc
 physics/models/regen/basic_regen.py,sha256=SZl7nj75w-3uczfNfaZAMtcC4WO8M2mTmwbnB0HmrtU,2402
 physics/models/regen/regen.rs,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 physics_rs/__init__.pyi,sha256=e34ADL3WjwR8ioVMwa0iDxgbgqUXrwNZvk_WVmrlkho,4346
-ubc_solar_physics-1.7.10.dist-info/LICENSE,sha256=1Vq7OikLHh7N0xsmTPHCmPkOxk1AXrMK9k1a1icQFlk,1087
-ubc_solar_physics-1.7.10.dist-info/METADATA,sha256=xDRYcUanrdpqeTSW_n1hoWM1GqM1TkJ740D_auWWH0s,5145
-ubc_solar_physics-1.7.10.dist-info/WHEEL,sha256=BTGB_zWzsHeUI4fhF6ubao5Zqn1dFwb9evsd--VEXVY,101
-ubc_solar_physics-1.7.10.dist-info/top_level.txt,sha256=jBZ5oyp1QQOrKodHG2UH9PMPEiZtza_q3y6fp3lEmQs,19
-ubc_solar_physics-1.7.10.dist-info/RECORD,,
+ubc_solar_physics-1.7.11.dist-info/LICENSE,sha256=1Vq7OikLHh7N0xsmTPHCmPkOxk1AXrMK9k1a1icQFlk,1087
+ubc_solar_physics-1.7.11.dist-info/METADATA,sha256=yV3QjsBa0ZhyT5A9_xokZtxzj3pkJzqvCIG955SsObo,5145
+ubc_solar_physics-1.7.11.dist-info/WHEEL,sha256=BTGB_zWzsHeUI4fhF6ubao5Zqn1dFwb9evsd--VEXVY,101
+ubc_solar_physics-1.7.11.dist-info/top_level.txt,sha256=jBZ5oyp1QQOrKodHG2UH9PMPEiZtza_q3y6fp3lEmQs,19
+ubc_solar_physics-1.7.11.dist-info/RECORD,,