@@ -126,13 +126,6 @@ int main(int argc, char * *argv) WritePrefix("HeapSort (integer DArray)"); retval |= WriteResult(TestSort_DArray(&hs)); WritePrefix("HeapSort (integer LList)"); retval |= WriteResult(TestSort_LList(&hs)); -#if !defined (DISABLE_DEPRECATED_CODE) - CrissCross::Data::InsertionSort<int> is; - WritePrefix("InsertionSort (integer array)"); retval |= WriteResult(TestSort_IntArray(&is)); - WritePrefix("InsertionSort (integer DArray)"); retval |= WriteResult(TestSort_DArray(&is)); - WritePrefix("InsertionSort (integer LList)"); retval |= WriteResult(TestSort_LList(&is)); -#endif - CrissCross::Data::ShellSort<int> ss; WritePrefix("ShellSort (integer array)"); retval |= WriteResult(TestSort_IntArray(&ss)); WritePrefix("ShellSort (integer DArray)"); retval |= WriteResult(TestSort_DArray(&ss)); TestSuite/main.cpp @@ -97,9 +97,6 @@ int main(int argc, char * *argv) #ifdef ENABLE_SORTS QuickSort<char *> qs; -#if !defined (DISABLE_DEPRECATED_CODE) - InsertionSort<char *> is; -#endif HeapSort<char *> hs; CombSort<char *> cs; ShellSort<char *> ss; @@ -127,13 +124,6 @@ int main(int argc, char * *argv) console->SetColour(); BenchmarkDArray(qs); console->WriteLine(); -#if !defined (DISABLE_DEPRECATED_CODE) - console->SetColour(console->FG_BLUE | console->FG_INTENSITY); - console->WriteLine("InsertionSort..."); - console->SetColour(); - BenchmarkDArray(is); -#endif - #else console->WriteLine("Sorting algorithms are disabled in this build of CrissCross.\nDefine ENABLE_SORTS in universal_include.h if you want them."); #endif examples/SortBenchmark/main.cpp @@ -63,13 +63,9 @@ namespace CrissCross #include <crisscross/combsort.h> #include <crisscross/heapsort.h> -#include <crisscross/insertionsort.h> #include <crisscross/quicksort.h> #include <crisscross/shellsort.h> -#define FastestSort QuickSort -#define MemoryEfficientSort HeapSort - #endif #endif source/crisscross/sort.h @@ -672,10 +672,6 @@ > </File> <File - RelativePath="..\..\source\crisscross\insertionsort.h" - > - </File> - <File RelativePath="..\..\source\crisscross\internal_mem.h" > </File> targets/vs2005/CrissCross.vcproj @@ -672,10 +672,6 @@ > </File> <File - RelativePath="..\..\source\crisscross\insertionsort.h" - > - </File> - <File RelativePath="..\..\source\crisscross\internal_mem.h" > </File> targets/vs2008/CrissCross.vcproj @@ -31,7 +31,6 @@ B01CB6920D52D2B40081CCAC /* build_number.h in Headers */ = {isa = PBXBuildFile; fileRef = B01CB67E0D52D2B40081CCAC /* build_number.h */; }; B01CB6930D52D2B40081CCAC /* datatypes.h in Headers */ = {isa = PBXBuildFile; fileRef = B01CB67F0D52D2B40081CCAC /* datatypes.h */; }; B01CB6960D52D2B40081CCAC /* hashtable.h in Headers */ = {isa = PBXBuildFile; fileRef = B01CB6820D52D2B40081CCAC /* hashtable.h */; }; - B01CB6970D52D2B40081CCAC /* insertionsort.h in Headers */ = {isa = PBXBuildFile; fileRef = B01CB6830D52D2B40081CCAC /* insertionsort.h */; }; B01CB6980D52D2B40081CCAC /* internal_mem.h in Headers */ = {isa = PBXBuildFile; fileRef = B01CB6840D52D2B40081CCAC /* internal_mem.h */; }; B01CB69A0D52D2B40081CCAC /* md4.h in Headers */ = {isa = PBXBuildFile; fileRef = B01CB6860D52D2B40081CCAC /* md4.h */; }; B01CB69B0D52D2B40081CCAC /* md5.h in Headers */ = {isa = PBXBuildFile; fileRef = B01CB6870D52D2B40081CCAC /* md5.h */; }; @@ -125,7 +124,6 @@ B01CB67F0D52D2B40081CCAC /* datatypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = datatypes.h; path = ../../source/crisscross/datatypes.h; sourceTree = SOURCE_ROOT; }; B01CB6810D52D2B40081CCAC /* hashtable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = hashtable.cpp; path = ../../source/crisscross/hashtable.cpp; sourceTree = SOURCE_ROOT; }; B01CB6820D52D2B40081CCAC /* hashtable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hashtable.h; path = ../../source/crisscross/hashtable.h; sourceTree = SOURCE_ROOT; }; - B01CB6830D52D2B40081CCAC /* insertionsort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = insertionsort.h; path = ../../source/crisscross/insertionsort.h; sourceTree = SOURCE_ROOT; }; B01CB6840D52D2B40081CCAC /* internal_mem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = internal_mem.h; path = ../../source/crisscross/internal_mem.h; sourceTree = SOURCE_ROOT; }; B01CB6860D52D2B40081CCAC /* md4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = md4.h; path = ../../source/crisscross/md4.h; sourceTree = SOURCE_ROOT; }; B01CB6870D52D2B40081CCAC /* md5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = md5.h; path = ../../source/crisscross/md5.h; sourceTree = SOURCE_ROOT; }; @@ -243,7 +241,6 @@ B01CB67F0D52D2B40081CCAC /* datatypes.h */, B01CB6810D52D2B40081CCAC /* hashtable.cpp */, B01CB6820D52D2B40081CCAC /* hashtable.h */, - B01CB6830D52D2B40081CCAC /* insertionsort.h */, B01CB6840D52D2B40081CCAC /* internal_mem.h */, B01CB6860D52D2B40081CCAC /* md4.h */, B01CB6870D52D2B40081CCAC /* md5.h */, @@ -359,7 +356,6 @@ B01CB6920D52D2B40081CCAC /* build_number.h in Headers */, B01CB6930D52D2B40081CCAC /* datatypes.h in Headers */, B01CB6960D52D2B40081CCAC /* hashtable.h in Headers */, - B01CB6970D52D2B40081CCAC /* insertionsort.h in Headers */, B01CB6980D52D2B40081CCAC /* internal_mem.h in Headers */, B01CB69A0D52D2B40081CCAC /* md4.h in Headers */, B01CB69B0D52D2B40081CCAC /* md5.h in Headers */, targets/xcode/CrissCross.xcodeproj/project.pbxproj source/crisscross/insertionsort.h bc1f479e0845a7cf90fab7ffe39b015ef945cda4 Steven Noonan steven@uplinklabs.net http://github.com/tycho/crisscross/commit/e64cefaf4ef2fe95b8a202e16649479c95e97f68 e64cefaf4ef2fe95b8a202e16649479c95e97f68 2009-08-02T13:55:01-07:00 2009-07-18T00:52:37-07:00 InsertionSort: removed, it's worthless Signed-off-by: Steven Noonan <steven@uplinklabs.net> 336615a34154251de49b1bfeda526255ee492246 Steven Noonan steven@uplinklabs.net