algorithms Commit Details

Date:

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

Author:

Natalie Adams

Branch:

default

Commit:

e1a05c29b2c4

Parents:

019f5c4964fc

Message:

Insertion sort is working

Changes:

M	cpp/algorithms/src/Algorithm.h (1 diff)
M	cpp/algorithms/src/InsertSort.h (1 diff)
M	cpp/algorithms/src/SearchAlgorithm.h (1 diff)
M	cpp/algorithms/src/SortAlgorithm.h (1 diff)
M	cpp/algorithms/src/main.cpp (1 diff)

File differences

-10
11 11
12 12
13
13 14
14 15
15 16
+{␍␊
protected:␍␊
␉std::vector<T> _container;␍␊
␉//friend class SortAlgorithm;␍␊
public:␍␊
␉void initContainer(std::vector<T> arr)␍␊
␉{␍␊
 {␍␊
 protected:␍␊
 ␉std::vector<T> _container;␍␊
+␉//friend class SortAlgorithm;␍␊
 public:␍␊
 ␉void initContainer(std::vector<T> arr)␍␊
 ␉{␍␊

-3
4 4
5 5
6 
7 
6
8 7
9 8
9
10 10
11 11
12 12
+␍␊
#include "Algorithm.h"␍␊
␍␊
template <class T>␍␊
class SearchAlgorithm : public Algorithm␍␊
class SearchAlgorithm␍␊
{␍␊
public:␍␊
␉//void f() { this->␍␊
␉virtual void Search() = 0;␍␊
};␍␊
␍␊
 ␍␊
 #include "Algorithm.h"␍␊
 ␍␊
-template <class T>␍␊
-class SearchAlgorithm : public Algorithm␍␊
+class SearchAlgorithm␍␊
 {␍␊
 public:␍␊
+␉//void f() { this->␍␊
 ␉virtual void Search() = 0;␍␊
 };␍␊
 ␍␊

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

-3
4 4
5 5
6
7
6 8
7 9
8 10
9 11
10 12
13
11 14
12 15
13 
16
17
14 18
15 19
+#include "vector_helper.h"␍␊
#include <vector>␍␊
␍␊
#include <string>␍␊
␍␊
using namespace std;␍␊
␍␊
int main()␍␊
{␍␊
␉InsertSort<int> sort1;␍␊
␉//sort1.initContainer(create_vector<string>("test")("test2"));␍␊
␉//cout << sort1.ToString();␍␊
␉//vector<int> arr1 = create_vector<int>(␍␊
␉sort1.initContainer(create_vector<int>(1)(2)(3));␍␊
␉sort1.initContainer(create_vector<int>(3)(2)(3));␍␊
␉sort1.Sort();␍␊
␉cout << sort1.ToString() << endl;␍␊
}␉
 #include "vector_helper.h"␍␊
 #include <vector>␍␊
 ␍␊
+#include <string>␍␊
+␍␊
 using namespace std;␍␊
 ␍␊
 int main()␍␊
 {␍␊
 ␉InsertSort<int> sort1;␍␊
+␉//sort1.initContainer(create_vector<string>("test")("test2"));␍␊
 ␉//cout << sort1.ToString();␍␊
 ␉//vector<int> arr1 = create_vector<int>(␍␊
-␉sort1.initContainer(create_vector<int>(1)(2)(3));␍␊
+␉sort1.initContainer(create_vector<int>(3)(2)(3));␍␊
+␉sort1.Sort();␍␊
 ␉cout << sort1.ToString() << endl;␍␊
 }␉