Changeset 4c72117 in sasmodels

Timestamp:

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

Author:

Omer Eisenberg <omereis@…>

Children:

ddfdb16

Parents:

5c2a0f2

Message:

Comparison running: fixed bug in 'visit_Return', deleted commented statements

File:

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

sasmodels/py2c.py

@@ -57 +57 @@
 12/15/2017, OE: Precedence maintained by writing opening and closing
                 parenthesesm '(',')', in procedure 'visit_BinOp'.
+12/18/2017, OE: Added call to 'add_current_line()' at the beginning
+                of visit_Return
+
 """
 import ast
@@ -99 +102 @@
 
 
-#def to_source(node, indent_with=' ' * 4, add_line_information=False):
 def to_source(node, func_name, constants=None):
     """This function can convert a node tree back into python sourcecode.
@@ -119 +121 @@
     """
     generator = SourceGenerator(' ' * 4, False, constants)
-#    generator.required_functions = func_name
     generator.visit(node)
 
-#    return ''.join(generator.result)
     return ''.join(generator.c_proc)
 
@@ -253 +253 @@
                         " = " + str(default.n) + "'"
                 self.warnings.append(w_str)
-#                self.write_python('=')
-#                self.visit(default)
 
     def decorators(self, node):
@@ -312 +310 @@
         self.visit(node.value)
         self.add_semi_colon()
-#        self.write_c(';')
         self.add_current_line()
         for n, item in enumerate(self.Tuples):
@@ -338 +335 @@
         self.visit(node.value)
         self.add_semi_colon()
-#        self.write_c(';')
         self.add_current_line()
 
@@ -399 +395 @@
             fLine = True
             start_var += 1
-#        if(len(self.C_IntVars) > 0):
-#            s = self.listToDeclare(self.C_IntVars)
-#            self.c_proc.insert(start_var, "    int " + s + ";\n")
-#            fLine = True
-#            start_var += 1
         if(len(self.C_Vectors) > 0):
             s = self.listToDeclare(self.C_Vectors)
@@ -443 +434 @@
 
     def getMethodSignature(self):
-#        args_str = ListToString(self.arguments)
         args_str = ''
         for n in range(len(self.arguments)):
@@ -450 +440 @@
                 args_str += ", "
         return(args_str)
-#        self.strMethodSignature = 'double ' + self.name + '(' + args_str + ")"
 
     def InsertSignature(self):
@@ -470 +459 @@
         self.arguments = []
         self.name = node.name
-#        if self.name not in self.required_functions[0]:
-#           return
         print("Parsing '" + self.name + "'")
         args_str = ""
 
         self.visit(node.args)
-# for C
-#        self.writeInclude()
         self.getMethodSignature()
-# for C
         self.signature_line = len(self.c_proc)
-#        self.add_c_line(self.strMethodSignature)
         self.add_c_line("\n{")
         start_vars = len(self.c_proc) + 1
@@ -598 +581 @@
 # Iterator name is in node.target.id.
         self.add_current_line()
-#        if(len(self.current_statement) > 0):
-#            self.add_c_line(self.current_statement)
-#            self.current_statement = ''
         fForDone = False
         self.current_statement = ''
@@ -700 +680 @@
 
     def visit_Return(self, node):
-        self.newline(node)
+        self.add_current_line()
         if node.value is None:
             self.write_c('return')
@@ -1048 +1028 @@
                 self.visit(if_)
 
-#    def visit_excepthandler(self, node):
-#        self.newline(node)
-#        self.write_python('except')
-#        if node.type is not None:
-#            self.write_python(' ')
-#            self.visit(node.type)
-#            if node.name is not None:
-#                self.write_python(' as ')
-#                self.visit(node.name)
-#        self.body(node.body)
-
     def visit_arguments(self, node):
         self.signature(node)
-
-def Iq1(q, porod_scale, porod_exp, lorentz_scale, lorentz_length, peak_pos, lorentz_exp=17):
-    z1 = z2 = z = abs(q - peak_pos) * lorentz_length
-    if(q > p):
-        q = p + 17
-        p = q - 5
-    z3 = -8
-    inten = (porod_scale / q ** porod_exp
-                + lorentz_scale /(1 + z ** lorentz_exp))
-    return inten
-
-def Iq(q, porod_scale, porod_exp, lorentz_scale, lorentz_length, peak_pos, lorentz_exp=17):
-    z1 = z2 = z = abs(q - peak_pos) * lorentz_length
-    if(q > p):
-        q = p + 17
-        p = q - 5
-    elif(q == p):
-        q = p * q
-        q *= z1
-        p = z1
-    elif(q == 17):
-        q = p * q - 17
-    else:
-        q += 7
-    z3 = -8
-    inten = (porod_scale / q ** porod_exp
-                + lorentz_scale /(1 + z ** lorentz_exp))
-    return inten
 
 def print_function(f=None):
@@ -1127 +1068 @@
 def translate(functions, constants=0):
     sniplets = []
-#    sniplets.append("#include <math.h>")
-#    sniplets.append("static double pi = 3.14159265359;")
     add_constants (sniplets, constants)
     for source,fname,line_no in functions: