Iss499 (#507)

* fixes #499

decode_number now supports floating point value

Author: ebroecker

src/canmatrix/formats/arxml.py

@@ -938,8 +938,8 @@ def decode_compu_method(compu_method, ea, float_factory):
         # Modification to support sourcing the COMPU_METHOD info from the Vector NETWORK-REPRESENTATION-PROPS
         # keyword definition. 06Jun16
         #####################################################################################################
-     
-        if ll is not None and desc is not None and canmatrix.utils.decode_number(ul.text) == canmatrix.utils.decode_number(ll.text):
+
+        if ll is not None and desc is not None and canmatrix.utils.decode_number(ul.text, float_factory) == canmatrix.utils.decode_number(ll.text, float_factory):
             #####################################################################################################
             #####################################################################################################
             values[ll.text] = desc
@@ -1213,7 +1213,7 @@ def get_signals(signal_array, frame, ea, multiplex_id, float_factory, bit_offset
                 new_signal.initial_value = float_factory(initvalue.text)
 
             for key, value in list(values.items()):
-                new_signal.add_values(canmatrix.utils.decode_number(key), value)
+                new_signal.add_values(canmatrix.utils.decode_number(key, float_factory), value)
             if signal_name is not None:
                 new_signal.add_attribute("LongName", signal_name)
             frame.add_signal(new_signal)
@@ -1708,7 +1708,7 @@ def decode_can_helper(ea, float_factory, ignore_cluster_info):
             baudrate_elem = ea.find("BAUDRATE", cc)
             fd_baudrate_elem = ea.find("CAN-FD-BAUDRATE", cc)
 
-            logger.debug("Busname: " + get_element_name(cc, ns))
+            logger.debug("Busname: " + ea.get_element_name(cc))
 
             bus_name = ea.get_element_name(cc)
             if speed is not None:

src/canmatrix/tests/test_utils.py

@@ -2,7 +2,7 @@
 import pytest
 
 import canmatrix.utils
-
+import decimal
 
 def test_utils_guess_value():
     assert canmatrix.utils.guess_value("true") == "1"
@@ -14,10 +14,10 @@ def test_utils_guess_value():
 
 
 def test_decode_number():
-    assert canmatrix.utils.decode_number("0x10") == 16
-    assert canmatrix.utils.decode_number("0b10") == 2
-    assert canmatrix.utils.decode_number("10") == 10
-
+    assert canmatrix.utils.decode_number("0x10", decimal.Decimal) == 16
+    assert canmatrix.utils.decode_number("0b10", decimal.Decimal) == 2
+    assert canmatrix.utils.decode_number("10", decimal.Decimal) == 10
+    assert canmatrix.utils.decode_number("1023.0", decimal.Decimal) == 1023.0
 
 @pytest.mark.parametrize(
     'input_string, expected_list',

src/canmatrix/utils.py

@@ -87,14 +87,18 @@ def get_gcd(value1, value2):  # type (int,int) -> (int)
     else:
         return fractions.gcd(value1, value2)
 
-def decode_number(value):  # type(string) -> (int)
+def decode_number(value, float_factory):  # type(string) -> (int)
     """
     Decode string to integer and guess correct base
     :param value: string input value
     :return: integer
     """
 
     value = value.strip()
+
+    if '.' in value:
+        return float_factory(value)
+
     base = 10
     if len(value) > 1 and value[1] == 'b':  # bin coded
         base = 2