ubc-solar-physics 1.8.1__cp39-cp39-macosx_11_0_arm64.whl → 1.8.2__cp39-cp39-macosx_11_0_arm64.whl

physics/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.8.1'
-__version_tuple__ = version_tuple = (1, 8, 1)
+__version__ = version = '1.8.2'
+__version_tuple__ = version_tuple = (1, 8, 2)

physics/models/motor/advanced_motor.py

@@ -7,9 +7,9 @@ from physics.models.motor import BasicMotor
 class AdvancedMotor(BasicMotor):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
-        self.cornering_coefficient = 15  # tuned to Day 1 and 3 FSGP data
+        self.cornering_coefficient = 30  # tuned to Day 1 and 3 FSGP data
 
-    def calculate_energy_in(self, required_speed_kmh, gradients, wind_speeds, tick, coords):
+    def calculate_energy_in(self, required_speed_kmh, gradients, wind_speeds, tick, coords, plotting=False):
         """
         A function which takes in array of elevation, array of wind speed, required
             speed, returns the consumed energy.
@@ -19,11 +19,11 @@ class AdvancedMotor(BasicMotor):
         :param np.ndarray wind_speeds: (float[N]) speeds of wind in m/s, where > 0 means against the direction of the vehicle
         :param float tick: length of 1 update cycle in seconds
         :param np.ndarray coords: ([float[N,2]) The lat,lon coordinate  of the car at each tick
-        :returns: (float[N]) energy expended by the motor at every tick
+        :returns: (float[N] , float[N,3]) energy expended by the motor at every tick
         :rtype: np.ndarray
 
         """
-        net_force, required_angular_speed_rads = self.calculate_net_force(required_speed_kmh, wind_speeds, gradients)
+        net_force, required_angular_speed_rads, road_friction_array, drag_forces, g_forces = self.calculate_net_force(required_speed_kmh, wind_speeds, gradients)
 
         cornering_work = self.calculate_cornering_losses(required_speed_kmh, coords, tick)
 
@@ -39,8 +39,11 @@ class AdvancedMotor(BasicMotor):
         motor_controller_input_energies = np.where(motor_controller_input_energies > 0,
                                                    motor_controller_input_energies, 0)
 
-        return motor_controller_input_energies
-
+        if plotting:
+            return motor_controller_input_energies, cornering_work, gradients, road_friction_array, drag_forces, g_forces
+        else:
+            return motor_controller_input_energies
+        
     def calculate_cornering_losses(self, required_speed_kmh, coords, tick):
         """
         Calculate the energy losses due to cornering based on vehicle speed and trajectory.

physics/models/motor/basic_motor.py

@@ -130,7 +130,7 @@ class BasicMotor(BaseMotor):
 
         net_force = road_friction_array + drag_forces + g_forces + acceleration_force
 
-        return net_force, required_angular_speed_rads
+        return net_force, required_angular_speed_rads, road_friction_array, drag_forces, g_forces
 
     def calculate_energy_in(self, required_speed_kmh, gradients, wind_speeds, tick, **kwargs):
         """

{ubc_solar_physics-1.8.1.dist-info → ubc_solar_physics-1.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ubc-solar-physics
-Version: 1.8.1
+Version: 1.8.2
 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.8.1.dist-info → ubc_solar_physics-1.8.2.dist-info}/RECORD

@@ -1,11 +1,6 @@
 physics_rs.cpython-39-darwin.so,sha256=AUxZtx1IG-0wJM6cCAeRl4YLK35Yi3gJTcIn1x4SxMk,702192
-ubc_solar_physics-1.8.1.dist-info/RECORD,,
-ubc_solar_physics-1.8.1.dist-info/LICENSE,sha256=DAej6EJNqQWTair3XPAQiqoJbly4BAT1JMOsZxoZvH0,1066
-ubc_solar_physics-1.8.1.dist-info/WHEEL,sha256=Zesonz4Ava1_C5nhDPl253AOobZwhmAK4VwEBQq1e7c,107
-ubc_solar_physics-1.8.1.dist-info/top_level.txt,sha256=jBZ5oyp1QQOrKodHG2UH9PMPEiZtza_q3y6fp3lEmQs,19
-ubc_solar_physics-1.8.1.dist-info/METADATA,sha256=4LsfRJXbxi00HS2ll_dNHjTRNQhPaX19emja36CJa48,5002
 physics_rs/__init__.pyi,sha256=bMMIbLFgpSYq37i9xHpvdoVlMuI7IRZ9bdbLCcIBeO8,4235
-physics/_version.py,sha256=0CBOWvcgj3z82UQGmgPZNYucWtZfu-kClLlOblR1VJs,411
+physics/_version.py,sha256=wyeOGWTUT7rTWqRZmS_XmHAtprBx1jO6L7FxPeYTyMM,411
 physics/lib.rs,sha256=uMeIRNVeeIpaxvvNM7qvCoSUzTzOdwOBEff_fP9XH18,8161
 physics/models.rs,sha256=N5342VhLaLSlPLHZ7s1VDIEPY76-rQN03lY_wd2HS1A,59
 physics/__init__.py,sha256=7939mrehCy0ogupHq26hUk1MkAjh2xmbD30GscdC_D8,169
@@ -21,10 +16,10 @@ physics/models/lvs/basic_lvs.py,sha256=UH6VmVWrSo-tKvcbSOm3Ptp0edz1xDQiQsM4HlOJ_
 physics/models/lvs/lvs.rs,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 physics/models/lvs/__init__.py,sha256=GkO6SJxbbSnXYLdMDvsvTRhXotV3zaRNmYBgziQLGB8,107
 physics/models/lvs/base_lvs.py,sha256=PVwPgCaJ_TcV2mQf3X2pngi0aG-jTLTeloL-LQV3jMU,110
-physics/models/motor/advanced_motor.py,sha256=EL86tCDSQCTT55EdXnmtPaIL9YS2o5p2u3QiLuoZuCA,8758
+physics/models/motor/advanced_motor.py,sha256=ur6Dpkq3R740_c3F1GXSLkckuuV1Y3ROAiJmIbyBxxA,9000
 physics/models/motor/motor.rs,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 physics/models/motor/__init__.py,sha256=zkV7LiAozFNu9CRWWXeCbCDepjsaUIYT8Q2dkXJgLsM,183
-physics/models/motor/basic_motor.py,sha256=RF0xwruBwu6Cvs1JtAM92ujvFjbmAYxwJfulUM9tlYo,8636
+physics/models/motor/basic_motor.py,sha256=0QuUKwL0KqU6gtiYk21R6KwLtesJ4DJ_ARf0S4ekBrk,8680
 physics/models/motor/base_motor.py,sha256=GTK0cQ5RiXdrrfhenvc2_zwF2XKnqupHI8gZdi-w3oM,107
 physics/models/arrays/basic_array.py,sha256=cGBwyrYpR313ECJ-SwnrK3JzYo24NRE70j8sj-sxFQI,1332
 physics/models/arrays/base_array.py,sha256=ZUjehd7vwNOBdFLUk9WJUeGOi9DPopYplH1gqAMnKgA,95
@@ -55,3 +50,8 @@ physics/environment/gis/base_gis.py,sha256=iycttQ_bL2WXXQyXn9LokH8dv0ekQvCOJ0ONc
 physics/environment/gis/__init__.py,sha256=Kp85UC1WvcAMBxbgvwaMTEk8ELYzwUJLCtP0e1hnMvM,90
 physics/environment/gis/gis.rs,sha256=YEJ_0PkwYZfCg1TxEKLAKrpy4UdZTJLItQZVQMIULTc,5947
 physics/environment/gis/gis.py,sha256=KTtztphHaiU3oHgeUXVUtSa2XLUqg4iaYaSAFFJVBTQ,14531
+ubc_solar_physics-1.8.2.dist-info/RECORD,,
+ubc_solar_physics-1.8.2.dist-info/LICENSE,sha256=DAej6EJNqQWTair3XPAQiqoJbly4BAT1JMOsZxoZvH0,1066
+ubc_solar_physics-1.8.2.dist-info/WHEEL,sha256=Zesonz4Ava1_C5nhDPl253AOobZwhmAK4VwEBQq1e7c,107
+ubc_solar_physics-1.8.2.dist-info/top_level.txt,sha256=jBZ5oyp1QQOrKodHG2UH9PMPEiZtza_q3y6fp3lEmQs,19
+ubc_solar_physics-1.8.2.dist-info/METADATA,sha256=jqdWmcNeI0B8aGvx0n5YUMP-WNp6rzb7Ccc3tWWyirY,5002