pair impl finished

Author: stephanlindauer

cpp4j/cpp4j.pro

@@ -13,5 +13,6 @@ SOURCES += rationalnumber.cpp \
 
 HEADERS += \
     rationalnumber.h \
-    rationalnumberarray.h
+    rationalnumberarray.h \
+    pair.h
 

cpp4j/pair.h

@@ -1,11 +1,13 @@
 #ifndef PAIR_H
 #define PAIR_H
 
-template <T1,T2> class Pair {
+#include <stdio.h>
+
+template <class T1, class T2> class Pair {
 
 public :
 
-    Pair ():
+    Pair  ():
         m_first(),
         m_second()
     { }
@@ -15,7 +17,7 @@ public :
         m_second(secondParam)
     { }
 
-    Pair (Pair otherPair):
+    Pair (Pair <T1,T2>& otherPair):
         m_first(otherPair.first()),
         m_second(otherPair.second())
     { }
@@ -25,31 +27,31 @@ public :
         return Pair(right.first(), right.second());
     }
 
-    ostream& operator << (ostream &os){
-        os << first();
-        os << second();
+    friend ostream& operator<< (ostream &os, const Pair<T1,T2>& pair){
+        os << '<' << pair.first() << ',' << pair.second() << '>';
+        return os;
     }
 
     T1& first(void){
-        return &m_first;
+        return m_first;
     }
 
     const T1& first(void) const {
-        return &m_first;
+        return m_first;
     }
 
     T2& second(void){
-        return &m_second;
+        return m_second;
     }
 
     const T2& second(void) const{
-        return &m_second;
+        return m_second;
     }
 
 private:
 
     T1 m_first ;
     T2 m_second;
 
-}
+};
 #endif // PAIR_H

cpp4j/testTemplates.cpp

@@ -20,14 +20,17 @@ using namespace std;
 
 // you should define your own namespace for
 // the templates/classes in this project
-using namespace mystl;
+
+//using namespace mystl;
 
 // explicit template instantiation for compiling / debugging
 //template class Pair<int,string>;
 //template class Tree< int,Less<int> >;
 //template class Map<int, string>;
 
 // list and count all nodes in a set using an iterator
+/*
+
 template<class Container>
 int printAndCount(Container & c) {
 
@@ -54,6 +57,7 @@ int printAndCountBackwards(Container & c) {
     return n;
 }
 
+*/
 
 int testTemplates(void)
 {
@@ -68,14 +72,14 @@ int testTemplates(void)
     Pair<string,string> s_s("Hello","World!");
     cout << i_f << " " << s_s << endl;
 
-#if 0 // move this line down while your implementation proceeds...
 
     /////////////////////////////////////////
     // TEST ORDER
     Less<int> lessInt;
     cout << "2<3 == " << lessInt(2,3) << endl;
     cout << "4<3 == " << lessInt(4,3) << endl;
 
+#if 0 // move this line down while your implementation proceeds...
     /////////////////////////////////////////
     // TEST PAIR ORDER
     MapToFirst< int, float, Less > lessPair;