pythoner
diff --git a/‎digraph.py‎ ‎graphs/digraph.py‎digraph.py renamed to graphs/digraph.py b/‎digraph.py‎ ‎graphs/digraph.py‎digraph.py renamed to graphs/digraph.py
diff --git a/‎digraph_test.py‎ ‎graphs/digraph_test.py‎digraph_test.py renamed to graphs/digraph_test.py b/‎digraph_test.py‎ ‎graphs/digraph_test.py‎digraph_test.py renamed to graphs/digraph_test.py
diff --git a/‎graph.py‎ ‎graphs/graph.py‎graph.py renamed to graphs/graph.py b/‎graph.py‎ ‎graphs/graph.py‎graph.py renamed to graphs/graph.py
diff --git a/‎graph_algorithms.py‎ ‎graphs/graph_algorithms.py‎graph_algorithms.py renamed to graphs/graph_algorithms.py b/‎graph_algorithms.py‎ ‎graphs/graph_algorithms.py‎graph_algorithms.py renamed to graphs/graph_algorithms.py
diff --git a/‎graph_algorithms_test.py‎ ‎graphs/graph_algorithms_test.py‎graph_algorithms_test.py renamed to graphs/graph_algorithms_test.py b/‎graph_algorithms_test.py‎ ‎graphs/graph_algorithms_test.py‎graph_algorithms_test.py renamed to graphs/graph_algorithms_test.py
diff --git a/‎graph_test.py‎ ‎graphs/graph_test.py‎graph_test.py renamed to graphs/graph_test.py b/‎graph_test.py‎ ‎graphs/graph_test.py‎graph_test.py renamed to graphs/graph_test.py
diff --git a/‎heap_test.py‎
Lines changed: 36 additions & 0 deletions b/‎heap_test.py‎
Lines changed: 36 additions & 0 deletions
diff --git a/‎heaps/heap_test.py‎
Lines changed: 36 additions & 0 deletions b/‎heaps/heap_test.py‎
Lines changed: 36 additions & 0 deletions
diff --git a/‎heaps/heapsort.py‎
Lines changed: 10 additions & 0 deletions b/‎heaps/heapsort.py‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎heaps/maxheap.py‎
Lines changed: 33 additions & 0 deletions b/‎heaps/maxheap.py‎
Lines changed: 33 additions & 0 deletions
@@ -0,0 +1,36 @@
+import unittest
+from minheap import minheap
+from maxheap import maxheap
+import random
+
+class test_heap(unittest.TestCase):
+
+    def setUp(self):
+        self.h = minheap()
+        self.m = maxheap()
+        self.a = [random.choice(range(50)) for i in range(10)]
+        self.h.build_heap(self.a)
+        self.m.build_heap(self.a)
+
+    def test_heap_pop(self):
+        self.assertEqual(min(self.a), self.h.heappop())
+        self.assertEqual(max(self.a), self.m.heappop())
+    
+    def test_max_elements(self):
+        self.assertEqual(len(self.a), self.h.max_elements())
+        self.assertEqual(len(self.a), self.m.max_elements())
+
+    def test_heap_sort(self):
+        sorted_h = [self.h.heappop() for i in range(self.h.max_elements())]
+        sorted_m = [self.m.heappop() for i in range(self.m.max_elements())]
+        self.assertEqual(sorted_h, sorted(self.a))
+        self.assertEqual(sorted_m, sorted(self.a, reverse=True))
+
+    def test_heap_push_method(self):
+        self.h.heappush(-1)
+        self.assertEqual(-1, self.h.heappop())
+        self.m.heappush(100)
+        self.assertEqual(100, self.m.heappop())
+
+if __name__ == "__main__":
+    unittest.main()
@@ -0,0 +1,36 @@
+import unittest
+from minheap import minheap
+from maxheap import maxheap
+import random
+
+class test_heap(unittest.TestCase):
+
+    def setUp(self):
+        self.h = minheap()
+        self.m = maxheap()
+        self.a = [random.choice(range(50)) for i in range(10)]
+        self.h.build_heap(self.a)
+        self.m.build_heap(self.a)
+
+    def test_heap_pop(self):
+        self.assertEqual(min(self.a), self.h.heappop())
+        self.assertEqual(max(self.a), self.m.heappop())
+    
+    def test_max_elements(self):
+        self.assertEqual(len(self.a), self.h.max_elements())
+        self.assertEqual(len(self.a), self.m.max_elements())
+
+    def test_heap_sort(self):
+        sorted_h = [self.h.heappop() for i in range(self.h.max_elements())]
+        sorted_m = [self.m.heappop() for i in range(self.m.max_elements())]
+        self.assertEqual(sorted_h, sorted(self.a))
+        self.assertEqual(sorted_m, sorted(self.a, reverse=True))
+
+    def test_heap_push_method(self):
+        self.h.heappush(-1)
+        self.assertEqual(-1, self.h.heappop())
+        self.m.heappush(100)
+        self.assertEqual(100, self.m.heappop())
+
+if __name__ == "__main__":
+    unittest.main()
@@ -0,0 +1,10 @@
+from minheap import minheap
+import random
+
+def heapsort(nums):
+    h = minheap(nums)
+    return [h.heappop() for i in range(h.max_elements())]
+
+if __name__ == "__main__":
+    a = [random.choice(range(100)) for i in range(40)]
+    print heapsort(a) == sorted(a)
@@ -0,0 +1,33 @@
+from minheap import minheap
+class maxheap(minheap):
+    """
+    Heap class - made of keys and items
+    methods: build_heap, heappush, heappop
+    """
+
+    MAX_HEAP = True
+
+    def __str__(self):
+        return "Max-heap with %s items" % (len(self.heap))
+
+    def heapify(self, i):
+        l = self.leftchild(i)
+        r = self.rightchild(i)
+        largest = i
+        if l < self.max_elements() and self.heap[l] > self.heap[largest]:
+            largest = l
+        if r < self.max_elements() and self.heap[r] > self.heap[largest]:
+            largest = r
+        if largest != i:
+            self.heap[i], self.heap[largest] = self.heap[largest], self.heap[i]
+            self.heapify(largest)
+
+    def heappush(self, x):
+        """ Adds a new item x in the heap"""
+        i = len(self.heap)
+        self.heap.append(x)
+        parent = self.parent(i)
+        while parent != [] and self.heap[i] > self.heap[parent]:
+            self.heap[i], self.heap[parent] = self.heap[parent], self.heap[i]
+            i = parent
+            parent = self.parent(i)