Round transform rule output for integers (#54)

* Round transform rule output for integers * Do something to trigger tests
cms-nanoAOD · Mar 18, 2021 · 9c8d10f · 9c8d10f
1 parent 1012812
commit 9c8d10f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 28 deletions.
diff --git a/src/correction.cc b/src/correction.cc
@@ -3,6 +3,7 @@
 #include <optional>
 #include <algorithm>
 #include <stdexcept>
+#include <cmath>
 #include "correction.h"
 
 using namespace correction;
@@ -160,7 +161,7 @@ double Transform::evaluate(const std::vector<Variable::Type>& values) const {
     v = vnew;
   }
   else if ( std::holds_alternative<int>(v) ) {
-    v = (int) vnew;
+    v = (int) std::round(vnew);
   }
   else {
     throw std::logic_error("I should not have ever seen a string");

diff --git a/tests/test_core.py b/tests/test_core.py
@@ -874,6 +874,7 @@ def test_transform():
     )
     corr = cset["test"]
     assert corr.evaluate(0.5) == 0.1
+    assert corr.evaluate(1.5) == 0.1
 
     cset = wrap(
         schema.Correction(
@@ -893,6 +894,8 @@ def test_transform():
                         {"key": 0, "value": 0},
                         {"key": 1, "value": 4},
                         {"key": 2, "value": 0},
+                        {"key": 9, "value": 3.000001},
+                        {"key": 10, "value": 2.999999},
                     ],
                 ),
                 content=schema.Category(
@@ -913,30 +916,5 @@ def test_transform():
     assert corr.evaluate(2) == 0.0
     with pytest.raises(IndexError):
         corr.evaluate(3)
-
-
-def evaluate(expr, variables, parameters):
-    cset = {
-        "schema_version": 2,
-        "corrections": [
-            {
-                "name": "test",
-                "version": 1,
-                "inputs": [
-                    {"name": vname, "type": "real"}
-                    for vname, _ in zip("xyzt", variables)
-                ],
-                "output": {"name": "f", "type": "real"},
-                "data": {
-                    "nodetype": "formula",
-                    "expression": expr,
-                    "parser": "TFormula",
-                    "variables": [vname for vname, _ in zip("xyzt", variables)],
-                    "parameters": parameters or None,
-                },
-            }
-        ],
-    }
-    schema.CorrectionSet.parse_obj(cset)
-    corr = core.CorrectionSet.from_string(json.dumps(cset))["test"]
-    return corr.evaluate(*variables)
+    assert corr.evaluate(9) == 0.1
+    assert corr.evaluate(10) == 0.1