fixed some import issues

paper-sorting-subseq-new.py

@@ -12,18 +12,7 @@ from node import Node
 from pairing_heap import PairingHeap
 from pairing_heap_interface import PairingHeapInterface
 from pairing_heap_standard import PairingHeapStandard
-from variants.pairing_heap_multipass import PairingHeapMultipass
-from variants.pairing_heap_ftb import PairingHeapFTB
-from variants.pairing_heap_btf import PairingHeapBTF
-from variants.pairing_heap_lazy import PairingHeapLazy
-from variants.pairing_heap_standard_stable import PairingHeapStandardStable
-from variants.pairing_heap_ftb_stable import PairingHeapFTBStable
-from variants.pairing_heap_btf_stable import PairingHeapBTFStable
-from variants.pairing_heap_multipass_stable import PairingHeapMultipassStable
-from variants.pairing_heap_lazy_stable import PairingHeapLazyStable
-from pairing_heap_smooth import PairingHeapSmooth
-from variants.pairing_heap_smooth_unstable import PairingHeapSmoothUnstable
-from smooth_heap_corey import SmoothHeapCorey
+from smooth_heap import SmoothHeap
 
 COUNT_TYPE_BOTH = 0
 COUNT_TYPE_LINKS = -1

smooth_heap.py

@@ -3,7 +3,7 @@ from node import Node
 import math
 from pairing_heap_interface import PairingHeapInterface
 
-class SmoothHeapCorey(PairingHeapInterface):
+class SmoothHeap(PairingHeapInterface):
 	forest=[] #list storing roots of all top-level trees not in buffer
 	buffer=[] #decrease buffer
 	minNode=None
@@ -222,7 +222,7 @@ class SmoothHeapCorey(PairingHeapInterface):
 
 		treapified = self.buffer[0]
 		self.buffer=[]
-		(compCount,linkCount)=self.merge(SmoothHeapCorey(treapified))
+		(compCount,linkCount)=self.merge(SmoothHeap(treapified))
 		
 		return (compCount+comps, linkCount+n-1) #(n-1)links while consolidating