raphael/piscine_cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(09): parsing of the float finish

Browse source
This commit is contained in:
Raphael 2025-04-11 16:06:27 +02:00
parent 8a5acc7746
commit d97af9e3b6
2 changed files with 38 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cpp09/ex00/Makefile
View file

@ -6,7 +6,7 @@
# By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ # # By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2023/11/12 11:05:05 by rparodi #+# #+# # # Created: 2023/11/12 11:05:05 by rparodi #+# #+# #
# Updated: 2025/04/11 12:35:05 by rparodi ### ########.fr # # Updated: 2025/04/11 15:55:49 by rparodi ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #

45
cpp09/ex00/main.cpp
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/08 12:15:32 by rparodi #+# #+# */ /* Created: 2025/04/08 12:15:32 by rparodi #+# #+# */
/* Updated: 2025/04/11 15:07:21 by rparodi ### ########.fr */ /* Updated: 2025/04/11 16:06:02 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -19,6 +19,7 @@ enum error_code {
NEGATIVE, NEGATIVE,
NO_FORMAT, NO_FORMAT,
NO_DATE, NO_DATE,
NO_FLOAT,
NO_LIMIT, NO_LIMIT,
TOO_LARGE TOO_LARGE
}; };
@ -28,6 +29,13 @@ typedef struct s_value {
float value; float value;
} value; } value;
value convertValue (enum error_code error, float value) {
s_value to_return;
to_return.reason = error;
to_return.value = value;
return to_return;
}
bool is_valid_format_date(std::string str) { bool is_valid_format_date(std::string str) {
regex_t regex; regex_t regex;
@ -41,6 +49,7 @@ bool is_valid_format_date(std::string str) {
regfree(&regex); regfree(&regex);
return true; return true;
} }
std::string check_date(std::string name, enum error_code *error_code) { std::string check_date(std::string name, enum error_code *error_code) {
if (!is_valid_format_date(name)) { if (!is_valid_format_date(name)) {
*error_code = NO_FORMAT; *error_code = NO_FORMAT;
@ -70,11 +79,31 @@ std::string check_date(std::string name, enum error_code *error_code) {
return (name); return (name);
} }
value convertValue (enum error_code error, float value) { float check_value(std::string value, enum error_code *error_code) {
s_value to_return; bool has_dot = false;
to_return.reason = error; if (value.at(0) == '-') {
to_return.value = value; *error_code = NEGATIVE;
return to_return; return 0;
}
for (size_t i = 0; i < value.length(); i++) {
if (value[i] == '.') {
if (has_dot == true) {
*error_code = NO_FLOAT;
return 0;
}
has_dot = true;
continue;
}
if (isdigit(value[i]) == false) {
*error_code = NO_FLOAT;
return 0;
}
}
if (value.size() >= 4 || atof(value.c_str()) > 1000) {
*error_code = TOO_LARGE;
return 0;
}
return (atof(value.c_str()));
} }
std::map<std::string, value>parse_input(std::string name) { std::map<std::string, value>parse_input(std::string name) {
@ -96,7 +125,7 @@ std::map<std::string, value>parse_input(std::string name) {
} else { } else {
tmpDate = check_date(tmpLine.substr(0, limit), &tmpError); tmpDate = check_date(tmpLine.substr(0, limit), &tmpError);
if (tmpError == NO_ERROR) { if (tmpError == NO_ERROR) {
tmpValue = std::atof(tmpLine.substr(limit + 3).c_str()); tmpValue = check_value(tmpLine.substr(limit + 3).c_str(), &tmpError);
} }
} }
to_ret.insert(std::pair<std::string, value>(tmpDate, convertValue(tmpError, tmpValue))); to_ret.insert(std::pair<std::string, value>(tmpDate, convertValue(tmpError, tmpValue)));
@ -118,7 +147,7 @@ int main(int argc, char *argv[]) {
exit( 1); exit( 1);
} }
if (access("data.csv", F_OK)) { if (access("data.csv", F_OK)) {
std::cerr << CLR_RED << "The file `data.csv` have to exist (to take it from the intra make get_db)" << CLR_RESET << std::endl; std::cerr << CLR_RED << "The file `data.csv` have to exist (to take it from the intra `make get_db`)" << CLR_RESET << std::endl;
exit(1); exit(1);
} }
if (access("data.csv", R_OK)) { if (access("data.csv", R_OK)) {