1
1
#include " PmergeMe.hpp"
2
2
#include < typeinfo>
3
3
4
- // void FordJohnson<Container, Pair>::printContainer()
5
- // {
6
- // size_t i = 0;
7
- // typename Container::iterator it;
8
- // for (it = numbers.begin(); it != numbers.end(); ++it , i++)
9
- // {
10
- // std::cout << "numbers[" << i << "]: " << *it << " ";
11
- // }
12
- // std::cout << std::endl;
13
- // }
14
-
15
- // template <class Container, class Pair>
16
- // void FordJohnson<Container, Pair>::printPairs(Pair &pairs)
17
- // {
18
- // size_t i = 0;
19
- // typename Pair::iterator it;
20
- // for (it = pairs.begin(); it != pairs.end(); ++it , i++)
21
- // {
22
- // std::cout << "pairs[" << i << "] " << it->first << " " << it->second << std::endl;
23
- // }
24
- // std::cout << std::endl;
25
- // }
26
-
27
4
template <class Container , class Pair >
28
5
FordJohnson<Container, Pair>::FordJohnson()
29
6
{
@@ -121,15 +98,12 @@ void FordJohnson<Container, Pair>::groupPairs(Pair &pairs)
121
98
pairs.push_back (std::make_pair (first, second));
122
99
}
123
100
}
124
- // printPairs(pairs);
125
101
}
126
102
127
103
template <class Container , class Pair >
128
104
void FordJohnson<Container, Pair>::sortPairs(Pair &pairs)
129
105
{
130
106
mergeSort (pairs.begin (), pairs.end ());
131
- // std::cout << "after merge sort pairs: " << std::endl;
132
- // printPairs(pairs);
133
107
134
108
typename Pair::const_iterator it = pairs.begin ();
135
109
@@ -139,18 +113,6 @@ void FordJohnson<Container, Pair>::sortPairs(Pair &pairs)
139
113
sortedSequence.push_back (it->first );
140
114
toInsert.push_back (it->second );
141
115
}
142
- // std::cout << "sortedSequence: ";
143
- // for (typename Container::const_iterator it = sortedSequence.begin(); it != sortedSequence.end(); ++it)
144
- // {
145
- // std::cout << *it << " ";
146
- // }
147
- // std::cout << std::endl;
148
- // std::cout << "toInsert: ";
149
- // for (typename Container::const_iterator it = toInsert.begin(); it != toInsert.end(); ++it)
150
- // {
151
- // std::cout << *it << " ";
152
- // }
153
- // std::cout << std::endl;
154
116
}
155
117
156
118
template <class Container , class Pair >
@@ -267,7 +229,6 @@ Container FordJohnson<Container, Pair>::generateJacobsthalPositions(unsigned int
267
229
j++;
268
230
}
269
231
return (positions);
270
-
271
232
}
272
233
273
234
template <class Container , class Pair >
0 commit comments