X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/d47d44b2ed067c834ef210ad544512e7581a1c8e..5851cba291d6ac7b89baf771e4a3821cc1aaa81c:/cost_func.cpp?ds=sidebyside

diff --git a/cost_func.cpp b/cost_func.cpp
index bdea62e..d102fd9 100644
--- a/cost_func.cpp
+++ b/cost_func.cpp
@@ -1,25 +1,26 @@
+#include "cost_func.h"
+
 #include <algorithm>
 #include <cstdlib>
 #include <cstring>
 #include <iterator>
 #include <sstream>
-#include "cost_func.h"
 
-cost_func::cost_func(const char *param)
+cost_func::cost_func(const char* param)
 {
     int len = strlen(param);
     char tmpbuf[len + 1];
-    char *tmp = tmpbuf;
+    char* tmp = tmpbuf;
     memcpy(tmp, param, len + 1);
     degree = std::count(tmp, tmp + len, ',');
     factor = new double[degree + 1];
     for (int i = degree ; i > 0 ; i--) {
-        char *next = strchr(tmp, ',');
+        char* next = strchr(tmp, ',');
         *next++ = '\0';
-        factor[i] = atof(tmp);
+        std::istringstream(tmp) >> factor[i];
         tmp = next;
     }
-    factor[0] = atof(tmp);
+    std::istringstream(tmp) >> factor[0];
 }
 
 cost_func::~cost_func()
@@ -40,10 +41,10 @@ cost_func& cost_func::operator=(const cost_func& ref)
 
 double cost_func::operator()(double amount) const
 {
-    double ret = factor[degree];
+    double result = factor[degree];
     for (int i = degree - 1; i >= 0 ; i--)
-        ret = amount * ret + factor[i];
-    return ret;
+        result = amount * result + factor[i];
+    return result;
 }
 
 std::string cost_func::to_string()