Merge pull request #126 from viccollado/feature/extremes

Merge Feature/extremes into develop with a stable version of NonStatGEV

Author: tausiaj

bluemath_tk/distributions/_base_distributions.py

@@ -555,13 +555,15 @@ def return_period(self, ax: plt.axes = None) -> Tuple[plt.figure, plt.axes]:
         else:
             fig = None
 
+        return_years = np.asarray([1.001, 1.1, 1.2, 1.3, 1.4, 1.5, 1.75, 2, 3, 4, 5, 7.5, 10, 15, 20, 25, 50, 100, 250, 500, 1000])
+        ecdf_fitted = 1 - 1/return_years
         sorted_data = np.sort(self.data)
         exceedance_prob = 1 - self.ecdf
         return_period = 1 / exceedance_prob
 
         ax.plot(
-            return_period,
-            self.dist.qf(self.ecdf, *self.params),
+            return_years,
+            self.dist.qf(ecdf_fitted, *self.params),
             color="tab:red",
             label="Fitted Distribution",
         )
@@ -577,7 +579,7 @@ def return_period(self, ax: plt.axes = None) -> Tuple[plt.figure, plt.axes]:
         ax.set_xscale("log")
         ax.set_xticks([1, 2, 5, 10, 25, 50, 100, 250, 1000, 10000])
         ax.set_xticklabels([1, 2, 5, 10, 25, 50, 100, 500, 1000, 10000])
-        ax.set_xlim(right=np.max(return_period) * 1.2)
+        # ax.set_xlim(right=np.max(return_period) * 1.2)
         ax.set_xlabel("Return Period")
         ax.set_ylabel("Data Values")
         ax.set_title("Return Period Plot")