population-trend 5.10.0__tar.gz → 5.10.1__tar.gz

{population_trend-5.10.0 → population_trend-5.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: population_trend
-Version: 5.10.0
+Version: 5.10.1
 Summary: A population growth model package
 Home-page: https://github.com/IslasGECI/population_trend
 Author: Ciencia de Datos • GECI

{population_trend-5.10.0 → population_trend-5.10.1}/population_trend/__init__.py

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

{population_trend-5.10.0 → population_trend-5.10.1}/population_trend/plotter_population_trend_from_cpue.py

@@ -13,7 +13,7 @@ class Plotter_Population_Trend_Model_From_CPUE(Plotter_Population_Trend_Model):
 
     def plot_data(self):
         plt.plot(
-            self.plot_seasons,
+            self.seasons_to_plot,
             self.data[self.interest_variable],
             "-Dk",
             label="Maximum CPUE",

{population_trend-5.10.0 → population_trend-5.10.1}/population_trend/population_growth_model.py

@@ -48,15 +48,23 @@ class Population_Trend_Model:
 class Plotter_Population_Trend_Model:
     def __init__(self, data, population_model, tick_mode):
         self.fig, self.ax = geci_plot()
-        self.data = data
+        self.fill_missing_seasons(data)
         self.tick_mode = tick_mode
-        self.ticks_text = self.data.Temporada.values.astype(int)
-        self.ticks_positions = ticks_positions_array(self.data)
-        self.plot_seasons = self.data.index.values + 1
+        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,
@@ -108,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",
         )
@@ -144,6 +152,7 @@ class Plotter_Population_Trend_Model:
 
     def set_ticks(self):
         self.get_tick_step()
+        self.ticks_text = self.filled_data.Temporada.values.astype(int)
         plt.xticks(
             self.ticks_positions[:: self.tick_step],
             self.ticks_text[:: self.tick_step],