population-trend 5.9.1__py3-none-any.whl → 5.10.1__py3-none-any.whl

population_trend/__init__.py

@@ -1,6 +1,6 @@
 """A population growth model package"""
 
-__version__ = "5.9.1"
+__version__ = "5.10.1"
 from .calculate_growth_rates import *  # noqa
 from .cli import *  # noqa
 from .filter_data import *  # noqa

population_trend/cli.py

@@ -68,7 +68,8 @@ def plot_population_trend(
     intervals_path: Annotated[str, typer.Option()],
     island: Annotated[str, typer.Option()] = "Guadalupe",
     variable_of_interest: Annotated[str, typer.Option()] = "Maxima_cantidad_nidos",
-    output_path=None,
+    tick_mode: Annotated[str, typer.Option()] = "full",
+    output_path: Annotated[str, typer.Option()] = "",
 ):
     fit_data = pd.read_csv(data_path)
     intervals_json = read_json(intervals_path)
@@ -77,7 +78,7 @@ def plot_population_trend(
     Modelo_Tendencia_Poblacional = Population_Trend_Model(
         fit_data, intervals_json, variable_of_interest
     )
-    Graficador = Plotter_Population_Trend_Model(fit_data, Modelo_Tendencia_Poblacional)
+    Graficador = Plotter_Population_Trend_Model(fit_data, Modelo_Tendencia_Poblacional, tick_mode)
     Graficador.plot_smooth()
     Graficador.plot_model()
     Graficador.plot_data()

population_trend/plotter_population_trend_from_cpue.py

@@ -4,13 +4,16 @@ import matplotlib.pyplot as plt
 
 
 class Plotter_Population_Trend_Model_From_CPUE(Plotter_Population_Trend_Model):
+    def __init__(self, data, population_model, tick_mode="full"):
+        super().__init__(data, population_model, tick_mode)
+
     def set_labels(self):
         plt.ylabel("CPUE", size=20)
         plt.xlabel("Seasons", size=20)
 
     def plot_data(self):
         plt.plot(
-            self.plot_seasons,
+            self.seasons_to_plot,
             self.data[self.interest_variable],
             "-Dk",
             label="Maximum CPUE",

population_trend/population_growth_model.py

@@ -4,12 +4,6 @@ from bootstrapping_tools import power_law, lambda_calculator
 import matplotlib.pyplot as plt
 
 
-def normalize_seasons(df):
-    first_season = int(df.Temporada.min())
-    last_season = int(df.Temporada.max())
-    return np.linspace(first_season, last_season, last_season - first_season + 1).astype(int)
-
-
 def calculate_model_domain(data):
     last_value = data.Temporada.max() - data.Temporada.min()
     return np.linspace(0, last_value, 100)
@@ -52,16 +46,25 @@ class Population_Trend_Model:
 
 
 class Plotter_Population_Trend_Model:
-    def __init__(self, data, population_model):
+    def __init__(self, data, population_model, tick_mode):
         self.fig, self.ax = geci_plot()
-        self.data = data
-        self.plot_seasons = self.data["Temporada"][:] - self.data["Temporada"].iloc[0] + 1
-        self.ticks_text = normalize_seasons(self.data)
-        self.ticks_positions = ticks_positions_array(self.ticks_text)
+        self.fill_missing_seasons(data)
+        self.tick_mode = tick_mode
+        self.seasons_to_plot = self.filled_data.index.values + 1
+        self.ticks_positions = ticks_positions_array(self.filled_data)
         self.plot_domain = np.linspace(self.ticks_positions.min(), self.ticks_positions.max(), 100)
         self.population_model = population_model
         self.interest_variable = population_model.interest_variable
 
+    def fill_missing_seasons(self, data):
+        self.data = data
+        self.data.Temporada = self.data.Temporada.astype(int)
+        self.data = self.data.set_index("Temporada")
+        full_seasons = range((self.data.index.min()), self.data.index.max() + 1)
+        self.filled_data = (
+            self.data.reindex(full_seasons).reset_index().rename(columns={"index": "Temporada"})
+        )
+
     def plot_smooth(self):
         self.ax.fill_between(
             self.plot_domain,
@@ -113,9 +116,9 @@ class Plotter_Population_Trend_Model:
         return self.fig
 
     def plot_data(self):
-        plt.plot(
-            self.plot_seasons,
-            self.data[self.interest_variable],
+        self.ax.plot(
+            self.seasons_to_plot,
+            self.filled_data[self.interest_variable],
             "-Dk",
             label="Active Nests",
         )
@@ -148,14 +151,20 @@ class Plotter_Population_Trend_Model:
         plt.xlabel("Seasons", size=20)
 
     def set_ticks(self):
+        self.get_tick_step()
+        self.ticks_text = self.filled_data.Temporada.values.astype(int)
         plt.xticks(
-            self.ticks_positions,
-            self.ticks_text,
+            self.ticks_positions[:: self.tick_step],
+            self.ticks_text[:: self.tick_step],
             rotation=90,
             size=20,
         )
         plt.yticks(size=20)
 
+    def get_tick_step(self):
+        tick_modes = {"sparse": 2, "full": 1}
+        self.tick_step = tick_modes[self.tick_mode]
+
     def draw(self):
         plt.gcf().subplots_adjust(bottom=0.2)
         plt.draw()

{population_trend-5.9.1.dist-info → population_trend-5.10.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: population_trend
-Version: 5.9.1
+Version: 5.10.1
 Summary: A population growth model package
 Home-page: https://github.com/IslasGECI/population_trend
 Author: Ciencia de Datos • GECI
@@ -8,6 +8,7 @@ Author-email: ciencia.datos@islas.org.mx
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+License-File: LICENSE
 Requires-Dist: bootstrapping-tools==3.*
 Requires-Dist: geci-plots
 Requires-Dist: typer[all]

population_trend-5.10.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+population_trend/__init__.py,sha256=TkjYAYGUs5qD3YS0-vKhNCOzMvcymInP2K-54zG1F2k,317
+population_trend/calculate_growth_rates.py,sha256=qD-a6O17CEhgKo0KmGzVGRpGuKpDQnno16MD3DgjVrk,6003
+population_trend/cli.py,sha256=nSj4noSN7walhWoR02qUiSUx1LNIZsgD0MkeIdb4mI8,5534
+population_trend/filter_data.py,sha256=D0Y1vztcbbo98af9q7wRhlHfH__bNFI8tnVOdJY6hu0,403
+population_trend/plotter_growth_rate.py,sha256=jWMETGAahYNedyGJmxEzvjJdSNSPDsrpGlXrGIgDLQQ,1175
+population_trend/plotter_population_trend_from_cpue.py,sha256=qXqqI-yDOMCx7LNCAQJz9Yaxbcw1IyS-dh-qyWBvMIs,1481
+population_trend/population_growth_model.py,sha256=QKwxy4yOL00WVjhASwL_vz6WKzbgyOZWITQStjcm6J0,6456
+population_trend/regional_lambdas.py,sha256=5eCRXf9RWS0c6BG5F-Exico0GNMuUNyexZ0ZJKgOmp4,5274
+population_trend-5.10.1.dist-info/entry_points.txt,sha256=qVw9tnlMx7q2AnksVC2H4oK4ufQrdrbBzSODLH-bcac,61
+population_trend-5.10.1.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+population_trend-5.10.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+population_trend-5.10.1.dist-info/METADATA,sha256=8MoyczHBwYEXw0cGVyZ4OtoFEBdubapm1mxR4bctATA,1353
+population_trend-5.10.1.dist-info/RECORD,,

{population_trend-5.9.1.dist-info → population_trend-5.10.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.9.0
+Generator: flit 3.12.0
 Root-Is-Purelib: true
 Tag: py3-none-any

population_trend-5.9.1.dist-info/RECORD

@@ -1,13 +0,0 @@
-population_trend/__init__.py,sha256=IKO9fZhfnavlCZgtkAkXVvIOV4zIie7auj4Ec9IjSNk,316
-population_trend/calculate_growth_rates.py,sha256=qD-a6O17CEhgKo0KmGzVGRpGuKpDQnno16MD3DgjVrk,6003
-population_trend/cli.py,sha256=wsAYBTBpegnvom_UCQqTyDgdE6OqraZ68EjcfXO3lJg,5435
-population_trend/filter_data.py,sha256=D0Y1vztcbbo98af9q7wRhlHfH__bNFI8tnVOdJY6hu0,403
-population_trend/plotter_growth_rate.py,sha256=jWMETGAahYNedyGJmxEzvjJdSNSPDsrpGlXrGIgDLQQ,1175
-population_trend/plotter_population_trend_from_cpue.py,sha256=US8h948Mtb9AQpDYfvt1c-35i2if9HxqcOp1q_R-rio,1351
-population_trend/population_growth_model.py,sha256=LWgMyEJqHY9M5Xuv9nVFSfX5_X61tXCBS2n-kvY8pNk,6002
-population_trend/regional_lambdas.py,sha256=5eCRXf9RWS0c6BG5F-Exico0GNMuUNyexZ0ZJKgOmp4,5274
-population_trend-5.9.1.dist-info/entry_points.txt,sha256=qVw9tnlMx7q2AnksVC2H4oK4ufQrdrbBzSODLH-bcac,61
-population_trend-5.9.1.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-population_trend-5.9.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-population_trend-5.9.1.dist-info/METADATA,sha256=vs5I3SAYU6Kvv3PS8_otOxkwFKTCMiBJtm7WhDWA6u0,1330
-population_trend-5.9.1.dist-info/RECORD,,