Merge branch 'master' into add-rotating-calipers

Author: cclauss

data_structures/binary_tree/treap.py

@@ -65,7 +65,7 @@ def merge(left: Node | None, right: Node | None) -> Node | None:
     """
     if (not left) or (not right):  # If one node is None, return the other
         return left or right
-    elif left.prior < right.prior:
+    elif left.prior > right.prior:
         """
         Left will be root because it has more priority
         Now we need to merge left's right son and right tree

data_structures/stacks/balanced_parentheses.py

@@ -11,6 +11,12 @@ def balanced_parentheses(parentheses: str) -> bool:
     False
     >>> balanced_parentheses("1+2*3-4")
     True
+    >>> balanced_parentheses("{}")
+    True
+    >>> balanced_parentheses("))((")
+    False
+    >>> balanced_parentheses("((")
+    False
     >>> balanced_parentheses("")
     True
     """

fuzzy_logic/fuzzy_operations.py

@@ -57,7 +57,7 @@ class FuzzySet:
 
     # Union Operations
     >>> siya.union(sheru)
-    FuzzySet(name='Siya U Sheru', left_boundary=0.4, peak=0.7, right_boundary=1.0)
+    FuzzySet(name='Siya U Sheru', left_boundary=0.4, peak=1.0, right_boundary=0.7)
     """
 
     name: str
@@ -147,13 +147,13 @@ def union(self, other) -> FuzzySet:
             FuzzySet: A new fuzzy set representing the union.
 
         >>> FuzzySet("a", 0.1, 0.2, 0.3).union(FuzzySet("b", 0.4, 0.5, 0.6))
-        FuzzySet(name='a U b', left_boundary=0.1, peak=0.6, right_boundary=0.35)
+        FuzzySet(name='a U b', left_boundary=0.1, peak=0.35, right_boundary=0.6)
         """
         return FuzzySet(
             f"{self.name} U {other.name}",
             min(self.left_boundary, other.left_boundary),
-            max(self.right_boundary, other.right_boundary),
             (self.peak + other.peak) / 2,
+            max(self.right_boundary, other.right_boundary),
         )
 
     def plot(self):