save
This commit is contained in:
parent
3afe24c9a8
commit
96e6514337
5 changed files with 23 additions and 33 deletions
|
@ -39,16 +39,9 @@ void SortingTester::load_internal()
|
|||
|
||||
void SortingTester::populate(const populate_function& f)
|
||||
{
|
||||
std::cout << "[List(" << list.size() << ")] [ ";
|
||||
for (size_t i = 0; i < list.size(); i++)
|
||||
{
|
||||
f(i, list[i]);
|
||||
if(i == list.size()-1)
|
||||
{
|
||||
std::cout << list[i] << " ]\n";
|
||||
break;
|
||||
}
|
||||
std::cout << list[i] << ", ";
|
||||
}
|
||||
std::flush(std::cout);
|
||||
std::cout << list << std::endl;
|
||||
}
|
||||
|
|
|
@ -126,32 +126,11 @@ public:
|
|||
if (!is_sorted())
|
||||
{
|
||||
std::cerr << "[ERROR] The algorithm \"" << function_name << "\" did not sort the list" << std::endl;
|
||||
std::cerr << "[List] [ ";
|
||||
for (size_t i = 0; i < list.size(); i++)
|
||||
{
|
||||
if(i == list.size()-1)
|
||||
{
|
||||
std::cerr << list[i] << " ]";
|
||||
continue;
|
||||
}
|
||||
std::cerr << list[i] << ", ";
|
||||
}
|
||||
std::cerr << list << std::endl;
|
||||
std::flush(std::cerr);
|
||||
std::terminate();
|
||||
}
|
||||
|
||||
std::cout << "[sorted: List(" << list.size() << ")] [ ";
|
||||
for (size_t i = 0; i < list.size(); i++)
|
||||
{
|
||||
if(i == list.size()-1)
|
||||
{
|
||||
std::cout << list[i] << " ]\n";
|
||||
break;
|
||||
}
|
||||
std::cout << list[i] << ", ";
|
||||
}
|
||||
std::flush(std::cout);
|
||||
|
||||
result.count_comparisons = result.count_equal + result.count_greater + result.count_less;
|
||||
|
||||
active_result = nullptr;
|
||||
|
|
|
@ -82,8 +82,7 @@ int main(int argc, char** argv)
|
|||
|
||||
|
||||
std::cout << "\nPress any key to exit..." << std::endl;
|
||||
getchar();
|
||||
return 0;
|
||||
// getchar();
|
||||
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue