algorithms Commit Details

Date:

2013-02-16 18:44:00 (11 years 10 months ago)

Author:

Natalie Adams

Branch:

default

Commit:

17a967c7a5e4

Parents:

e1a05c29b2c4

Message:

Adding mediasort header

Updating inheirentance

Changes:

A	cpp/algorithms/src/MedianSort.h (full)
M	cpp/algorithms/algorithms.vcxproj (1 diff)
M	cpp/algorithms/algorithms.vcxproj.filters (1 diff)
M	cpp/algorithms/src/InsertSort.h (1 diff)
M	cpp/algorithms/src/SortAlgorithm.h (1 diff)
M	cpp/algorithms/src/main.cpp (1 diff)

File differences

-16
17 17
18 18
19
19 20
20 21
21 22
+  <ItemGroup>␍␊
    <ClInclude Include="src\Algorithm.h" />␍␊
    <ClInclude Include="src\InsertSort.h" />␍␊
    <ClInclude Include="src\MedianSort.h" />␍␊
    <ClInclude Include="src\SearchAlgorithm.h" />␍␊
    <ClInclude Include="src\SortAlgorithm.h" />␍␊
    <ClInclude Include="src\vector_helper.h" />␍␊
   <ItemGroup>␍␊
     <ClInclude Include="src\Algorithm.h" />␍␊
     <ClInclude Include="src\InsertSort.h" />␍␊
+    <ClInclude Include="src\MedianSort.h" />␍␊
     <ClInclude Include="src\SearchAlgorithm.h" />␍␊
     <ClInclude Include="src\SortAlgorithm.h" />␍␊
     <ClInclude Include="src\vector_helper.h" />␍␊

-35
36 36
37 37
38
39
40
38 41
39 42
+    <ClInclude Include="src\vector_helper.h">␍␊
      <Filter>Header Files</Filter>␍␊
    </ClInclude>␍␊
    <ClInclude Include="src\MedianSort.h">␍␊
      <Filter>Header Files</Filter>␍␊
    </ClInclude>␍␊
  </ItemGroup>␍␊
</Project>
     <ClInclude Include="src\vector_helper.h">␍␊
       <Filter>Header Files</Filter>␍␊
     </ClInclude>␍␊
+    <ClInclude Include="src\MedianSort.h">␍␊
+      <Filter>Header Files</Filter>␍␊
+    </ClInclude>␍␊
   </ItemGroup>␍␊
 </Project>

-2
3 3
4 4
5
5 6
6 7
7 
8
8 9
9 10
10 11
+#define INSERTSORT_H␍␊
␍␊
#include "SortAlgorithm.h"␍␊
#include "Algorithm.h"␍␊
␍␊
template <class T>␍␊
class InsertSort : public SortAlgorithm, public Algorithm<T>␍␊
class InsertSort : public SortAlgorithm<T>␍␊
{␍␊
public:␍␊
␉virtual void Sort()␍␊
 #define INSERTSORT_H␍␊
 ␍␊
 #include "SortAlgorithm.h"␍␊
+#include "Algorithm.h"␍␊
 ␍␊
 template <class T>␍␊
-class InsertSort : public SortAlgorithm, public Algorithm<T>␍␊
+class InsertSort : public SortAlgorithm<T>␍␊
 {␍␊
 public:␍␊
 ␉virtual void Sort()␍␊

-
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
+#ifndef MEDIAN_SORT_H␍␊
#define MEDIAN_SORT_H␍␊
␍␊
#include "SortAlgorithm.h"␍␊
#include <vector>␍␊
␍␊
template <class T>␍␊
class InsertSort : public SortAlgorithm<T>␍␊
{␍␊
public:␍␊
␉virtual void Sort()␍␊
␉{␍␊
␉␉this->mediansort(this->_container);␍␊
␉}␍␊
␍␊
␉void mediansort(std::vector<T> arr)␍␊
␉{␍␊
␉␉if (arr.size() == 0)␍␊
␉␉␉return;␍␊
␍␊
␉}␍␊
}␍␊
␍␊
#endif
+#ifndef MEDIAN_SORT_H␍␊
+#define MEDIAN_SORT_H␍␊
+␍␊
+#include "SortAlgorithm.h"␍␊
+#include <vector>␍␊
+␍␊
+template <class T>␍␊
+class InsertSort : public SortAlgorithm<T>␍␊
+{␍␊
+public:␍␊
+␉virtual void Sort()␍␊
+␉{␍␊
+␉␉this->mediansort(this->_container);␍␊
+␉}␍␊
+␍␊
+␉void mediansort(std::vector<T> arr)␍␊
+␉{␍␊
+␉␉if (arr.size() == 0)␍␊
+␉␉␉return;␍␊
+␍␊
+␉}␍␊
+}␍␊
+␍␊
+#endif

-3
4 4
5 5
6 
7 
6
7
8 8
9 9
10 10
+␍␊
#include "Algorithm.h"␍␊
␍␊
␍␊
class SortAlgorithm␍␊
template <class T>␍␊
class SortAlgorithm : public Algorithm<T>␍␊
{␍␊
public:␍␊
␉virtual void Sort() = 0;␍␊
 ␍␊
 #include "Algorithm.h"␍␊
 ␍␊
-␍␊
-class SortAlgorithm␍␊
+template <class T>␍␊
+class SortAlgorithm : public Algorithm<T>␍␊
 {␍␊
 public:␍␊
 ␉virtual void Sort() = 0;␍␊

-13
14 14
15 15
16 
16
17 17
18 18
19 19
+␉//sort1.initContainer(create_vector<string>("test")("test2"));␍␊
␉//cout << sort1.ToString();␍␊
␉//vector<int> arr1 = create_vector<int>(␍␊
␉sort1.initContainer(create_vector<int>(3)(2)(3));␍␊
␉sort1.initContainer(create_vector<int>(3)(2)(3)(1));␍␊
␉sort1.Sort();␍␊
␉cout << sort1.ToString() << endl;␍␊
}␉
 ␉//sort1.initContainer(create_vector<string>("test")("test2"));␍␊
 ␉//cout << sort1.ToString();␍␊
 ␉//vector<int> arr1 = create_vector<int>(␍␊
-␉sort1.initContainer(create_vector<int>(3)(2)(3));␍␊
+␉sort1.initContainer(create_vector<int>(3)(2)(3)(1));␍␊
 ␉sort1.Sort();␍␊
 ␉cout << sort1.ToString() << endl;␍␊
 }␉