Changeset ddfdb16 in sasmodels

Timestamp:

Dec 18, 2017 12:46:31 PM (7 years ago)

Author:

Omer Eisenberg <omereis@…>

Children:

2694cb8, 8224d24

Parents:

4c72117

Message:

writing 16 charachters constants

File:

• sasmodels/py2c.py (modified) (3 diffs)

sasmodels/py2c.py

@@ -539 +539 @@
         if(hasattr(node,'value')):
             line_number = node.value.lineno
-        elif hasattr(node,'iter'):
-            if hasattr(node.iter,'lineno'):
+        elif hasattr(node, 'iter'):
+            if hasattr(node.iter, 'lineno'):
                 line_number = node.iter.lineno
         return(line_number)
@@ -1043 +1043 @@
         print(tree_source)
 
-def add_constants (sniplets, c_constants):
+def add_constants(sniplets, c_constants):
     sniplets.append("#include <math.h>")
     sniplets.append("")
@@ -1049 +1049 @@
     for c_var in vars:
         c_values = c_constants[c_var]
-        declare_values = str(c_values)
-        str_dcl = "double " + c_var
-        if (hasattr(c_values,'__len__')):
-            str_dcl += "[]"
-            len_prev = len(declare_values)
-            len_after = len_prev - 1
-            declare_values = declare_values.replace ('[','')
-            declare_values = declare_values.replace (']','').strip()
-            while (len_after < len_prev):
-                len_prev = len_after
-                declare_values = declare_values.replace ('  ',' ')
-                len_after = len(declare_values)
-            declare_values = "{" + declare_values.replace (' ',',') + "}"
-        str_dcl += " = " + declare_values + ";"
-        sniplets.append (str_dcl)
-        sniplets.append("")
+        if isinstance(c_values, (int, float)):
+            parts = ["double ", c_var, " = ", "%.15g"%c_values, ";"]
+        else:
+            elements = ["%.15g"%v for v in c_values]
+            parts = ["double ", c_var, "[]", " = ", "{\n   ", ", ".join(elements), "\n};"]
+        sniplets.append("".join(parts))
 
 def translate(functions, constants=0):