update docstrings. update pdf for line plot

erdogant · Mar 24, 2023 · 87afe71 · 87afe71
1 parent 7ed1ffa
commit 87afe71
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 13 deletions.
diff --git a/distfit/distfit.py b/distfit/distfit.py
@@ -940,7 +940,7 @@ def lineplot(self,
                  ylim=None,
                  fig=None,
                  ax=None,
-                 grid=False,
+                 grid=True,
                  cii_properties={'alpha': 0.7, 'linewidth': 1},
                  line_properties={'linestyle': '-', 'color': '#004481', 'marker': '.', 'linewidth': 1, 'markersize': 10},
                  verbose=None):
@@ -964,10 +964,11 @@ def lineplot(self,
             Fontsize for the axis and ticks.
         figsize : tuple, optional (default: (10,8))
             The figure size.
-        xlim : Float, optional (default: None)
-            Limit figure in x-axis.
-        ylim : Float, optional (default: None)
+        xlim : tuple, optional (default: None)
+            Limit figure in x-axis: [0, 100]
+        ylim : tuple, optional (default: None)
             Limit figure in y-axis.
+            Limit figure in x-axis: [0, 10]
         fig : Figure, optional (default: None)
             Matplotlib figure (Note - ignored when method is `discrete`)
         ax : AxesSubplot, optional (default: None)
@@ -1062,6 +1063,12 @@ def lineplot(self,
             # Make title
             title = self._make_title(title)
 
+        # Limit axis
+        if xlim is not None:
+            ax.set_xlim(xlim[0], xlim[1])
+        if ylim is not None:
+            ax.set_ylim(ylim[0], ylim[1])
+
         # Set figure properties
         ax.set_title(title, fontsize=fontsize)
         ax.tick_params(axis='both', which='major', labelsize=fontsize)
@@ -1113,10 +1120,11 @@ def plot_cdf(self,
             Label of the y-axis.
         figsize : tuple, optional (default: (10,8))
             The figure size.
-        xlim : Float, optional (default: None)
-            Limit figure in x-axis.
-        ylim : Float, optional (default: None)
+        xlim : tuple, optional (default: None)
+            Limit figure in x-axis: [0, 100]
+        ylim : tuple, optional (default: None)
             Limit figure in y-axis.
+            Limit figure in x-axis: [0, 10]
         fig : Figure, optional (default: None)
             Matplotlib figure (Note - ignored when method is `discrete`)
         ax : Axes, optional (default: None)
@@ -1660,12 +1668,19 @@ def _plot_projection(self, X, labels, line_properties, ax):
     minvalue = labels[-1] + int(labels[-1]*0.1)
     maxvalue = labels[-1] + int(labels[-1]*0.2)
 
+    # Get histogram of original X
+    X_bins, y_obs = self.density(X, self.bins, mhist=self.mhist)
+    # Smoothing by interpolation
+    X_bins, y_obs = smoothline(X_bins, y_obs, interpol=1, window=self.smooth)
+    histdata = (y_obs, X_bins)
+
+
     # Rescale data
-    pdf_y=scale_data_minmax(self.histdata[0], minvalue=minvalue, maxvalue=maxvalue)
+    pdf_y=scale_data_minmax(histdata[0], minvalue=minvalue, maxvalue=maxvalue)
     pdf_x=scale_data_minmax(np.arange(0, len(pdf_y)), minvalue=min(X), maxvalue=max(X))
 
     # Create emperical PDF
-    ax.plot(pdf_y, pdf_x, color='black', linestyle='-', linewidth=1.5, label='Emperical PDF')
+    ax.plot(pdf_y, pdf_x, color='black', linestyle='-', linewidth=1.5, label='Emperical PDF.')
 
     # Create vertical lines
     ax.vlines(x=minvalue, ymin=min(pdf_x), ymax=max(pdf_x), color='#000000', linewidth=1.2)

diff --git a/distfit/examples.py b/distfit/examples.py
@@ -3,13 +3,18 @@
 
 dfit = distfit(smooth=3, bound='up')
 df = dfit.import_example(data='tips')
-dfit.lineplot(df['tip'], xlabel='Number', ylabel='Tip value', grid=True, line_properties={'marker':'.'}, projection=False)
+dfit.lineplot(df['tip'], xlabel='Number', ylabel='Tip value', grid=True, line_properties={'marker':'.'}, projection=True)
 
 dfit.fit_transform(df['tip'], n_boots=1)
 # dfit.fit_transform(df['tip'], n_boots=0)
-dfit.lineplot(df['tip'], xlabel='Number', ylabel='Tip value', grid=True, line_properties={'marker':'.'}, projection=True)
-dfit.lineplot(df['tip'], xlabel='Number', ylabel='Tip value', grid=True, line_properties={'marker':'.'}, projection=False)
-dfit.plot()
+dfit.lineplot(df['tip'], xlabel='Number', ylabel='Tip value', grid=True, line_properties={'marker':'.'}, projection=True, ylim=[0, 11])
+# dfit.lineplot(df['tip'], xlabel='Number', ylabel='Tip value', grid=True, line_properties={'marker':'.'}, projection=False)
+# dfit.plot()
+
+X = dfit.generate(100)
+# Ploy the data
+dfit.lineplot(X, xlabel='Number', ylabel='Tip value', grid=True, ylim=[0, 11])
+
 
 # %%
 from distfit import distfit