chore: Refactor BitcoinExchange processInputFile to handle bad input values and improve error handling

Author: zelhajou

module 09/ex00/BitcoinExchange.cpp

@@ -192,21 +192,28 @@ void BitcoinExchange::processInputFile(const std::string &filename) const
             continue;
         }
 
-        try
+        std::stringstream ss(valueStr);
+        float value;
+
+        ss >> value;   
+
+        if (!ss.eof())
         {
-            if (valueStr.find_first_not_of("0123456789.-") != std::string::npos)
-                throw std::runtime_error("Invalid value format");                
-            float value = atof(valueStr.c_str());
+            std::cout << "Error: bad input => " << valueStr << std::endl;
+            continue;
+        }
 
-            if (!isValidValue(value))
-            {
-                if (value < 0)
-                    std::cout << "Error: not a positive number." << std::endl;
-                else
-                    std::cout << "Error: too large a number." << std::endl;
-                continue;
-            }
+        if (!isValidValue(value))
+        {
+            if (value < 0)
+                std::cout << "Error: not a positive number." << std::endl;
+            else
+                std::cout << "Error: too large a number." << std::endl;
+            continue;
+        }
 
+        try
+        {
             float exchangeRate = getExchangeRate(date);
             std::cout << date << " => " << value << " = " << value * exchangeRate << std::endl;
         }

module 09/ex02/PmergeMe.cpp

@@ -30,7 +30,7 @@ bool PmergeMe::isValidNumber(const char *str)
     char *ptr;
     long num = strtol(str, &ptr, 10);
 
-    if (*ptr != '\0' || num <= 0 || num > INT_MAX)
+    if (*ptr != '\0' || num < 0 || num > INT_MAX)
         return false;
 
     return true;
@@ -73,8 +73,9 @@ std::vector<int> PmergeMe::getJacob(size_t size)
 }
 
 
-std::vector<int> PmergeMe::getInsertPos(std::vector<int> &jacobSeq, size_t size)
+std::vector<int> PmergeMe::getInsertPos(size_t size)
 {
+    std::vector<int> jacobSeq = getJacob(size);
     std::vector<int> order;
     std::vector<bool> used(size, false);
     used[0] = true;
@@ -157,8 +158,7 @@ void PmergeMe::sortVector()
 
     if (pendChain.size() > 1)
     {
-        std::vector<int> jacobSeq = getJacob(pendChain.size());
-        std::vector<int> insertionOrder = getInsertPos(jacobSeq, pendChain.size());
+        std::vector<int> insertionOrder = getInsertPos(pendChain.size());
 
         for (size_t i = 0; i < insertionOrder.size(); i++)
         {
@@ -234,8 +234,7 @@ void PmergeMe::sortDeque()
 
     if (pendChain.size() > 1)
     {
-        std::vector<int> jacobSeq = getJacob(pendChain.size());
-        std::vector<int> insertionOrder = getInsertPos(jacobSeq, pendChain.size());
+        std::vector<int> insertionOrder = getInsertPos(pendChain.size());
 
         for (size_t i = 0; i < insertionOrder.size(); i++)
         {
@@ -272,6 +271,15 @@ void PmergeMe::sort()
     clock_t deqEnd = clock();
     double deqTime = static_cast<double>(deqEnd - deqStart) / CLOCKS_PER_SEC * 1000000;
 
+    // for (size_t i = 1; i < _vec.size(); i++)
+    // {
+    //     if (_vec[i] < _vec[i - 1])
+    //     {
+    //         std::cerr << "Error: std::vector is not sorted" << std::endl;
+    //         return;
+    //     }
+    // }
+
     printSeq(original, "Before");
     printSeq(_vec, "After");
 

module 09/ex02/PmergeMe.hpp

@@ -21,7 +21,7 @@ class PmergeMe
 
     bool isValidNumber(const char *str);
     std::vector<int> getJacob(size_t size);
-    std::vector<int> getInsertPos(std::vector<int> &jacobSeq, size_t size);
+    std::vector<int> getInsertPos(size_t size);
 
     void sortVector();
     void sortDeque();