Skip to content

Commit f6f8f4e

Browse files
committed
Fix execution, file path
1 parent 4abf34b commit f6f8f4e

File tree

4 files changed

+26
-19
lines changed

4 files changed

+26
-19
lines changed

src/arguments_generator.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ ArgumentsGenerator::ArgumentsGenerator(const size_t numbersCount) : m_numbersCou
1313
m_buffer = new char[m_numbersCount * lengthPerNumber];
1414
}
1515

16+
ArgumentsGenerator::~ArgumentsGenerator()
17+
{
18+
delete[] m_buffer;
19+
}
20+
1621
auto ArgumentsGenerator::generate(const int min, const int max) -> ArgumentsIterator
1722
{
1823
m_numbers.clear();

src/arguments_generator.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ class ArgumentsGenerator
5757

5858
explicit ArgumentsGenerator(size_t numbersCount);
5959

60+
~ArgumentsGenerator();
61+
6062
auto generate(int min, int max) -> ArgumentsIterator;
6163
};
6264

src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ auto worker(const program_opts& opts, const program_params& params) -> void
3737
if (current == 0)
3838
break;
3939

40-
auto& buffer = executor.execute("/Users/simoncros/Projects/push_swap/push_swap",
40+
auto& buffer = executor.execute(params.program,
4141
generator.generate(std::numeric_limits<int>::min(),
4242
std::numeric_limits<int>::max()));
4343
// const auto lines = std::ranges::count(buffer, '\n');

src/print.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -106,45 +106,45 @@ auto printStatus(const program_params& params, const results_t& results) -> void
106106
if (prettyPrint())
107107
{
108108
#ifdef USE_FORMAT
109-
std::cout << std::format("Worst = \033[31m{}\033[0m instructions\n", results.worst);
110-
std::cout << std::format("Mean = \033[33m{:.1f}\033[0m instructions\n", mean);
111-
std::cout << std::format("Best = \033[36m{}\033[0m instructions\n", results.best);
112-
std::cout << std::format("Std. deviation = \033[93m{:.1f}\033[0m instructions\n", stddev);
109+
std::cout << std::format("Worst = \033[31m{}\033[0m instructions \n", results.worst);
110+
std::cout << std::format("Mean = \033[33m{:.1f}\033[0m instructions \n", mean);
111+
std::cout << std::format("Best = \033[36m{}\033[0m instructions \n", results.best);
112+
std::cout << std::format("Std. deviation = \033[93m{:.1f}\033[0m instructions \n", stddev);
113113

114114
if (params.objective.has_value())
115115
std::cout << std::format(
116-
"Objective = \033[94m{}\033[0m % under \033[94m{}\033[0m (\033[91m{}\033[0m above)\n",
116+
"Objective = \033[94m{}\033[0m % under \033[94m{}\033[0m (\033[91m{}\033[0m above) \n",
117117
underObjective, params.objective.value(), results.aboveObjective);
118118
else
119-
std::cout << "Objective = enter a number as the third argument\n";
119+
std::cout << "Objective = enter a number as the third argument \n";
120120

121121
// if (params.checker.has_value())
122122
// std::cout << "Precision = \033[97m" << (ok * 100 / done) << "\033[0m % OK (\033[91m" << (done - ok) << "\033[0m KO) " << std::endl;
123123
// else
124-
// std::cout << "Precision = enter a tester as the fourth argument\n";
125-
std::cout << "Failed = currently not available\n";
126-
std::cout << std::format("\033[32m{}\033[0m % effective\n", percentDone);
124+
// std::cout << "Precision = enter a tester as the fourth argument \n";
125+
std::cout << "Failed = currently not available \n";
126+
std::cout << std::format("\033[32m{}\033[0m % effective \n", percentDone);
127127
#else
128-
std::cout << "Worst = \033[31m" << results.worst << "\033[0m instructions\n";
129-
std::cout << "Mean = \033[33m" << std::fixed << std::setprecision(1) << mean << "\033[0m instructions\n";
130-
std::cout << "Best = \033[36m" << results.best << "\033[0m instructions\n";
131-
std::cout << "Std. deviation = \033[93m" << std::fixed << std::setprecision(1) << stddev << "\033[0m instructions\n";
128+
std::cout << "Worst = \033[31m" << results.worst << "\033[0m instructions \n";
129+
std::cout << "Mean = \033[33m" << std::fixed << std::setprecision(1) << mean << "\033[0m instructions \n";
130+
std::cout << "Best = \033[36m" << results.best << "\033[0m instructions \n";
131+
std::cout << "Std. deviation = \033[93m" << std::fixed << std::setprecision(1) << stddev << "\033[0m instructions \n";
132132

133133
if (params.objective.has_value()) {
134134
std::cout << "Objective = \033[94m" << underObjective
135135
<< "\033[0m % under \033[94m" << params.objective.value()
136-
<< "\033[0m (\033[91m" << results.aboveObjective << "\033[0m above)\n";
136+
<< "\033[0m (\033[91m" << results.aboveObjective << "\033[0m above) \n";
137137
} else {
138-
std::cout << "Objective = enter a number as the third argument\n";
138+
std::cout << "Objective = enter a number as the third argument \n";
139139
}
140140

141141
// if (params.checker.has_value())
142142
// std::cout << "Precision = \033[97m" << (ok * 100 / done) << "\033[0m % OK (\033[91m" << (done - ok) << "\033[0m KO) " << std::endl;
143143
// else
144-
// std::cout << "Precision = enter a tester as the fourth argument\n";
144+
// std::cout << "Precision = enter a tester as the fourth argument \n";
145145

146-
std::cout << "Failed = currently not available\n";
147-
std::cout << "\033[32m" << percentDone << "\033[0m % effective\n";
146+
std::cout << "Failed = currently not available \n";
147+
std::cout << "\033[32m" << percentDone << "\033[0m % effective \n";
148148
#endif
149149
}
150150
else

0 commit comments

Comments
 (0)