Merge pull request #6566 from gadfort/handle-tcl-nan

utl: provide ability to convert NaN from tcl

Author: maliberty

src/utl/src/LoggerCommon.cpp

@@ -106,6 +106,12 @@ void metric_float(const char* metric, const double value)
   logger->metric(metric, value);
 }
 
+void metric_float(const char* metric, const char* value)
+{
+  Logger* logger = getLogger();
+  logger->metric(metric, std::stod(value));
+}
+
 void set_metrics_stage(const char* fmt)
 {
   Logger* logger = getLogger();

src/utl/src/LoggerCommon.h

@@ -47,6 +47,7 @@ void close_metrics(const char* metrics_filename);
 void metric(const char* metric, const char* value);
 void metric_integer(const char* metric, const int value);
 void metric_float(const char* metric, const double value);
+void metric_float(const char* metric, const char* value);
 void set_metrics_stage(const char* fmt);
 void clear_metrics_stage();
 void push_metrics_stage(const char* fmt);

src/utl/test/metrics-py.jsonok

@@ -5,6 +5,7 @@
 	"float0": 0,
 	"float1": 1000,
 	"float2": 1e+39,
+	"float3": "NaN",
 	"float4": "Infinity",
 	"float5": "-Infinity",
 	"string0": "",

src/utl/test/metrics-tcl.jsonok src/utl/test/metrics.jsonoksrc/utl/test/metrics-tcl.jsonok renamed to src/utl/test/metrics.jsonok

@@ -17,10 +17,10 @@
 utl.metric_float("float5", float("-inf"))
 
 utl.metric("string0", "")
-utl.metric("string1", "(one")
+utl.metric("string1", "one")
 
 utl.close_metrics(metrics_file)
-helpers.diff_files("metrics-py.jsonok", metrics_file)
+helpers.diff_files("metrics.jsonok", metrics_file)
 
 
 utl.metric_float("float6", float("-inf"))

src/utl/test/test_metrics.py

@@ -11,13 +11,12 @@ utl::metric_integer "integer2" 1
 utl::metric_float "float0" 0
 utl::metric_float "float1" 1e3
 utl::metric_float "float2" 1e39
-# TCL cannot convert NaN
-#utl::metric_float "float3" nan
+utl::metric_float "float3" nan
 utl::metric_float "float4" INF
 utl::metric_float "float5" -INF
 
 utl::metric "string0" ""
 utl::metric "string1" "one"
 
 utl::close_metrics $metrics_file
-diff_files "metrics-tcl.jsonok" $metrics_file
+diff_files "metrics.jsonok" $metrics_file