[ViewVC] Diff of: group/branches/new_design/OOPSE-2.0/src/utils/next

Comparing branches/new_design/OOPSE-2.0/src/utils/next_combination.hpp (file contents):
Revision 1683, Thu Oct 28 22:34:02 2004 UTC vs.
Revision 1720 by tim, Sat Nov 6 05:21:55 2004 UTC

#	Line 149 \| Line 149 \| bool next_combination(IteratorContainer<RandomAccessIt
149		* sv.push_back("C");
150		* sv.push_back("N");
151
152	<	* while (replaceWildCard(sic, sv, resultString)) {
152	>	* while (replaceWithWildCard(sic, sv, resultString)) {
153		* for(std::vector<std::string>::iterator i = resultString.begin(); i != resultString.end(); ++i) {
154		* std::cout << *i << "\t";
155		* }
#	Line 165 \| Line 165 \| bool replaceWildCard(std::vector<std::vector<std::stri
165		* //H C N
166		* @endcode
167		*/
168	<	bool replaceWildCard(std::vector<std::vector<std::string>::iterator>& cont,
168	>	bool replaceWithWildCard(std::vector<std::vector<std::string>::iterator>& cont,
169		std::vector<std::string>& sequence, std::vector<std::string>& result,
170		const std::string& wildCard = "X") {
171		if (cont.size() > sequence.size()) {

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines