ubc-solar-physics 1.0.5__tar.gz → 1.1.0__tar.gz

{ubc_solar_physics-1.0.5 → ubc_solar_physics-1.1.0}/PKG-INFO

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

{ubc_solar_physics-1.0.5 → ubc_solar_physics-1.1.0}/physics/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0.5'
-__version_tuple__ = version_tuple = (1, 0, 5)
+__version__ = version = '1.1.0'
+__version_tuple__ = version_tuple = (1, 1, 0)

{ubc_solar_physics-1.0.5 → ubc_solar_physics-1.1.0}/physics/environment/__init__.py

@@ -1,8 +1,3 @@
-from .race import (
-    Race,
-    compile_races
-)
-
 from .gis import (
     GIS,
 )
@@ -17,6 +12,4 @@ __all__ = [
     "IrradiantMeteorology",
     "CloudedMeteorology",
     "GIS",
-    "Race",
-    "compile_races"
 ]

{ubc_solar_physics-1.0.5 → ubc_solar_physics-1.1.0}/physics/environment/meteorology/clouded_meteorology.py

@@ -1,7 +1,6 @@
 from physics.environment.meteorology.base_meteorology import BaseMeteorology
 from physics.environment.gis.gis import calculate_path_distances
 import numpy as np
-from physics.environment.race import Race
 from numba import jit
 import core
 from typing import Optional
@@ -28,7 +27,7 @@ class CloudedMeteorology(BaseMeteorology):
 
         self.last_updated_time = self._weather_forecast[0, 0, 2]
 
-    def spatially_localize(self, cumulative_distances: np.ndarray) -> None:
+    def spatially_localize(self, cumulative_distances: np.ndarray, simplify_weather: bool = False) -> None:
         """
 
         IMPORTANT: we only have weather coordinates for a discrete set of coordinates. However, the car could be at any
@@ -46,14 +45,14 @@ class CloudedMeteorology(BaseMeteorology):
         `get_weather_forecast_in_time()` method.
 
         :param np.ndarray cumulative_distances: NumPy Array representing cumulative distances theoretically achievable for a given input speed array
-
+        :param bool simplify_weather: enable to only use a single weather coordinate (for track races without varying weather)
         """
 
-        # if racing FSGP, there is no need for distance calculations. We will return only the origin coordinate
+        # If racing a track race, there is no need for distance calculations. We will return only the origin coordinate
         # This characterizes the weather at every point along the FSGP tracks
         # with the weather at a single coordinate on the track, which is great for reducing the API calls and is a
         # reasonable assumption to make for FSGP only.
-        if self._race.race_type == Race.FSGP:
+        if simplify_weather:
             self._weather_indices = np.zeros_like(cumulative_distances, dtype=int)
             return
 

{ubc_solar_physics-1.0.5 → ubc_solar_physics-1.1.0}/physics/environment/meteorology/irradiant_meteorology.py

@@ -1,7 +1,6 @@
 from physics.environment.meteorology.base_meteorology import BaseMeteorology
 from physics.environment.gis.gis import calculate_path_distances
 import numpy as np
-from physics.environment.race import Race
 import core
 from typing import Optional
 
@@ -25,16 +24,18 @@ class IrradiantMeteorology(BaseMeteorology):
 
         super().__init__()
 
-    def spatially_localize(self, cumulative_distances: np.ndarray) -> None:
+    def spatially_localize(self, cumulative_distances: np.ndarray, simplify_weather: bool = False) -> None:
         """
 
         :param np.ndarray cumulative_distances: NumPy Array representing cumulative distances theoretically achievable for a given input speed array
+        :param bool simplify_weather: enable to only use a single weather coordinate (for track races without varying weather)
+
         """
-        # if racing FSGP, there is no need for distance calculations. We will return only the origin coordinate
+        # If racing a track race, there is no need for distance calculations. We will return only the origin coordinate
         # This characterizes the weather at every point along the FSGP tracks
         # with the weather at a single coordinate on the track, which is great for reducing the API calls and is a
         # reasonable assumption to make for FSGP only.
-        if self._race.race_type == Race.FSGP:
+        if simplify_weather:
             self._weather_indices = np.zeros_like(cumulative_distances, dtype=int)
             return
 

{ubc_solar_physics-1.0.5 → ubc_solar_physics-1.1.0}/ubc_solar_physics.egg-info/PKG-INFO

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

{ubc_solar_physics-1.0.5 → ubc_solar_physics-1.1.0}/ubc_solar_physics.egg-info/SOURCES.txt

@@ -34,7 +34,6 @@ physics/environment/__init__.py
 physics/environment/environment.rs
 physics/environment/gis.rs
 physics/environment/meteorology.rs
-physics/environment/race.py
 physics/environment/gis/__init__.py
 physics/environment/gis/base_gis.py
 physics/environment/gis/gis.py

ubc_solar_physics-1.0.5/physics/environment/race.py

@@ -1,89 +0,0 @@
-"""
-This class collects the constants that are related to a specific competition.
-"""
-import pathlib
-
-import numpy as np
-import pickle
-import enum
-import json
-import os
-
-
-class Race:
-    class RaceType(enum.Enum):
-        ASC = "ASC"
-        FSGP = "FSGP"
-
-        def __str__(self):
-            match self.value:
-                case "ASC":
-                    return "ASC"
-                case "FSGP":
-                    return "FSGP"
-
-        def __reduce__(self):
-            return self.__class__, (self.name,)
-
-        def __contains__(self, item):
-            return item == "ASC" or item == "FSGP"
-
-        def __repr__(self):
-            return str(self)
-
-    ASC = RaceType.ASC
-    FSGP = RaceType.FSGP
-
-    def __init__(self, race_type: RaceType, race_constants: dict):
-        self.race_type = race_type
-
-        self.days = race_constants["days"]
-        self.tiling = race_constants["tiling"]
-        self.date = (race_constants["start_year"], race_constants["start_month"], race_constants["start_day"])
-
-        self.race_duration = len(self.days) * 24 * 60 * 60  # Duration (s)
-        self.driving_boolean = self.make_time_boolean("driving")
-        self.charging_boolean = self.make_time_boolean("charging")
-
-    def __str__(self):
-        return str(self.race_type)
-
-    def write(self, race_directory: pathlib.Path):
-        with open(race_directory / f"{str(self.race_type)}.pkl", 'wb') as outfile:
-            pickle.dump(self, outfile, protocol=pickle.HIGHEST_PROTOCOL)
-
-    def make_time_boolean(self, boolean_type: str):
-        boolean: np.ndarray = np.empty(self.race_duration, dtype=np.int8)
-        DAY_LENGTH: int = 24 * 60 * 60  # Length of a day in seconds
-
-        for tick in range(len(boolean)):
-            day: int = tick // DAY_LENGTH    # Integer division to determine how many days have passed
-            time_of_day = tick % DAY_LENGTH  # Time of day in seconds where 0 is midnight and 43200 is noon
-            begin, end = self.days[str(day)][boolean_type]
-
-            # If the time of day is between the beginning and end, then the boolean is True, else False
-            boolean[tick] = begin <= time_of_day < end
-
-        return boolean
-
-
-def load_race(race_type: Race.RaceType, race_directory: pathlib.Path) -> Race:
-    with open(race_directory / f"{str(race_type)}.pkl", 'rb') as infile:
-        return pickle.load(infile)
-
-
-def compile_races(config_directory: pathlib.Path, race_directory: pathlib.Path):
-    fsgp_config_path = os.path.join(config_directory, f"settings_FSGP.json")
-    asc_config_path = os.path.join(config_directory, f"settings_ASC.json")
-
-    with open(fsgp_config_path) as f:
-        fsgp_race_constants = json.load(f)
-
-    with open(asc_config_path) as f:
-        asc_race_constants = json.load(f)
-
-    fsgp = Race(Race.FSGP, fsgp_race_constants)
-    fsgp.write(race_directory)
-
-    asc = Race(Race.ASC, asc_race_constants)
-    asc.write(race_directory)