wip approx

lepy · Sep 25, 2018 · 1cfd47b · 1cfd47b
2 parents 40d57fd + aa69c35
commit 1cfd47b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/phuzzy/data/plots.py b/phuzzy/data/plots.py
@@ -54,23 +54,31 @@ def bootstrapping(data, df_boot, show=False):
 
     return fig, axs
 
+<<<<<<< HEAD
 def plot_hist(x, ax=None, bins=None, normed=False, color=None, **kwargs):
     x = x[~np.isnan(x)]
+=======
+def plot_hist(x, ax=None, bins=None, normed=True, **kwargs):
+
+>>>>>>> aa69c3564895524ef928f88a5162c36cd9cf871f
     if bins is None:
         bins = 'auto'
-    bins, edges = np.histogram(x, bins=bins, normed=normed)
+    bins, edges = np.histogram(x, bins=bins)
     left,right = edges[:-1],edges[1:]
     X = np.array([left,right]).T.flatten()
     Y = np.array([bins,bins]).T.flatten()
+    if normed is True:
+        Y = Y/float(Y.max())
 
     if ax is None:
         fig, ax = plt.subplots(1, 1, figsize=(10,5))
     else:
         fig = plt.gcf()
 
     if kwargs.get("filled") is True:
-        ax.fill_between(X, 0, Y, label=kwargs.get("label"), color="r", alpha=kwargs.get("alpha"))
+        ax.fill_between(X, 0, Y, label=kwargs.get("label"), color=kwargs.get("color", "b"), alpha=kwargs.get("alpha", .3))
     else:
-        ax.plot(X,Y, label=kwargs.get("label"), color="r", alpha=kwargs.get("alpha"))
+        ax.plot(X,Y, label=kwargs.get("label"), color=kwargs.get("color", "r"), alpha=kwargs.get("alpha", .8))
+
+    return fig, ax
 
-    return ax
diff --git a/phuzzy/mpl/plots.py b/phuzzy/mpl/plots.py
@@ -173,7 +173,7 @@ def plot_hist(x, ax=None, bins=None, normed=1, **kwargs):
         fig = plt.gcf()
 
     if kwargs.get("filled") is True:
-        ax.fill_between(X, 0, Y, label=kwargs.get("label"), color=kwargs.get("color", "r"), alpha=kwargs.get("alpha", .3))
+        ax.fill_between(X, 0, Y, label=kwargs.get("label"), color=kwargs.get("color", "b"), alpha=kwargs.get("alpha", .3))
     else:
         ax.plot(X,Y, label=kwargs.get("label"), color=kwargs.get("color", "r"), alpha=kwargs.get("alpha", .8))
 

diff --git a/phuzzy/shapes/superellipse.py b/phuzzy/shapes/superellipse.py
@@ -14,11 +14,12 @@
 
 """
 
-
-from phuzzy.shapes import FuzzyNumber
 import numpy as np
 import pandas as pd
 
+from phuzzy.shapes import FuzzyNumber
+
+
 class Superellipse(FuzzyNumber):
     """superelliptic fuzzy number
 
@@ -55,7 +56,7 @@ def shape(self, x):
         r = (b - a) / 2.
         m = (a + b) / 2.
         choicelist = [0.,
-                      (1. - (abs(x-m)/r)**self.m) ** (1./self.n),
+                      (1. - (abs(x - m) / r) ** self.m) ** (1. / self.n),
                       0.]
         return np.select(condlist, choicelist)