Hopefully fix constants

Author: chrisburr

formulate/expression.py

@@ -240,12 +240,7 @@ def args(self):
 
     @add_logging(ignore_args=[1, 2])
     def to_string(self, config, constants):
-        if isinstance(self.args[0], SingleComponent):
-            assert len(self.args) == 1, self.args
-            # return str(constants[self.args[0]])
-            return self.args[0].to_string(config, constants)
-        else:
-            return config[self.id].to_string(self, config, constants)
+        return config[self.id].to_string(self, config, constants)
 
 
 class Variable(SingleComponent):
@@ -273,7 +268,7 @@ def __init__(self, id):
         self._id = id
 
     def __repr__(self):
-        return '{class_name}({name})'.format(
+        return '{class_name}({id})'.format(
             class_name=self.__class__.__name__, id=self.id)
 
     def __str__(self):

formulate/logging.py

@@ -16,6 +16,7 @@
 
 
 def get_identifier():
+    """Generate an identifier for keeping track of return values when logging"""
     return''.join(random.choice(string.ascii_uppercase + string.digits)
                   for i in range(5))
 

formulate/parser.py

@@ -44,7 +44,8 @@ def __init__(self, id, value):
         self._id = id
         self._value = value
 
-    def __call__(self):
+    @add_logging
+    def __call__(self, string, location, result):
         return Constant(self.id)
 
     @property
@@ -280,7 +281,7 @@ def create_parser(config, constants):
 
     VARIABLE = Word(pyparsing.alphas+'_', pyparsing.alphanums+'_-')
     VARIABLE.setName('Variable')
-    VARIABLE.setParseAction(lambda x: Variable(x[0]))
+    VARIABLE.setParseAction(add_logging(lambda string, location, result: Variable(result[0])))
 
     NUMBER = pyparsing.Or([
         pyparsing_common.number,

tests/backends/test_backends.py

@@ -19,8 +19,8 @@ def test():
     return test
 
 
-test_001 = do_checks('true', 'True')
-test_002 = do_checks('false', 'False')
+test_001 = do_checks('True', 'true')
+test_002 = do_checks('False', 'false')
 test_003 = do_checks('sqrt(2)', 'sqrt(2)')
 test_004 = do_checks('sqrt(2)', 'TMath::Sqrt(2)')
 test_005 = do_checks('sqrt(abs(-4))', 'TMath::Sqrt(TMath::Abs(-4))')

tests/backends/test_constants.py

@@ -5,7 +5,7 @@
 
 import pytest
 
-from formulate import to_numexpr
+from formulate import from_numexpr, to_numexpr
 from formulate import from_root, to_root
 
 numexpr = pytest.importorskip("numexpr")
@@ -34,16 +34,27 @@ def numexpr_eval(string, **kwargs):
     return numexpr.evaluate(string, local_dict=kwargs)
 
 
-def create_constant_test(root_string):
+def create_constant_test(input_string, input_backend='root'):
+    assert input_backend in ('root', 'numexpr'), 'Unrecognised backend specified'
+    input_from_method = {
+        'root': from_root,
+        'numexpr': from_numexpr,
+    }[input_backend]
+
     def test_constant():
-        expression = from_root(root_string)
+        expression = input_from_method(input_string)
         root_result = to_root(expression)
         numexpr_result = to_numexpr(expression)
-        assert pytest.approx(root_eval(root_string), root_eval(root_result))
+        assert pytest.approx(root_eval(input_string), root_eval(root_result))
         assert pytest.approx(root_eval(root_result), numexpr_eval(numexpr_result))
     return test_constant
 
 
+# Test basic numexpr constants
+test_numexpr_true = create_constant_test('True', input_backend='numexpr')
+test_numexpr_false = create_constant_test('False', input_backend='numexpr')
+
+# Test basic ROOT constants
 test_true = create_constant_test('true')
 test_false = create_constant_test('false')
 test_sqrt2_1 = create_constant_test('sqrt2')

tests/utils.py

@@ -3,7 +3,7 @@
 from __future__ import division
 from __future__ import print_function
 
-from formulate import Component, Expression, Variable
+from formulate import ExpressionComponent, Expression, Variable, Constant
 
 
 def make_check_result(from_func, to_func):
@@ -23,9 +23,12 @@ def check_result(input_string, expected_expression, expected_string=None, **kwar
 
 
 def assert_equal_expressions(lhs, rhs):
-    assert isinstance(lhs, Component)
-    assert isinstance(rhs, Component)
-    if isinstance(lhs, Variable):
+    assert isinstance(lhs, ExpressionComponent)
+    assert isinstance(rhs, ExpressionComponent)
+    if isinstance(lhs, Constant):
+        assert isinstance(rhs, Constant)
+        assert lhs.id == rhs.id
+    elif isinstance(lhs, Variable):
         assert isinstance(rhs, Variable)
         assert lhs.name == rhs.name
     else: