fix small near-zero value in dq_relative_li1

Author: dguittet

shared/lib_battery_lifetime_nmc.cpp

@@ -132,7 +132,7 @@ double lifetime_nmc_t::runQli(double T_battery_K) {
                       (Ea_d0_2 / Rug) * pow(1 / T_battery_K - 1 / T_ref, 2));
 
     double dQLi1dt = 0;
-    if (state->nmc_li_neg->dq_relative_li1 == 0) {
+    if (abs(state->nmc_li_neg->dq_relative_li1) < 1e-5) {
         if (state->day_age_of_battery > 0)
             dQLi1dt = b1 / sqrt(state->day_age_of_battery);
     }

shared/logger.cpp

@@ -126,8 +126,8 @@ std::ostream &operator<<(std::ostream &os, const cycle_state &p) {
             p.q_relative_cycle,
             p.rainflow_Xlt, p.rainflow_Ylt, p.rainflow_jlt);
     os << buf << p.rainflow_peaks;
-    os << ", cum_dt: " << p.cum_dt << ", DOD_max: " << p.DOD_max << ", DOD_min:" <<  p.DOD_min << ", ";
-    os << R"("cycle_DOD_max": ")" << p.cycle_DOD_max << "}";
+    os << ", \"cum_dt\": " << p.cum_dt << ", \"DOD_max\": " << p.DOD_max << ", \"DOD_min\":" <<  p.DOD_min << ", ";
+    os << R"("cycle_DOD_max": )" << p.cycle_DOD_max << "}";
     return os;
 }
 
@@ -166,7 +166,7 @@ std::ostream &operator<<(std::ostream &os, const lifetime_state &p) {
     os.precision(3);
     char buf[1024];
     sprintf(buf, R"("lifetime_state": { "q_relative": %f, "n_cycles": %d, "cycle_DOD": %.3f, "cycle_range": %.3f,
-                  "average_range": %.3f, day_age_of_battery": %.3f, )",
+                  "average_range": %.3f, "day_age_of_battery": %.3f, )",
             p.q_relative, p.n_cycles, p.cycle_DOD, p.cycle_range, p.average_range, p.day_age_of_battery);
     os << buf << *p.cycle << ", ";
     if (p.calendar) {