-Added createImage function in image_maker.py

image_maker.py

 from ast import Raise
+from email.mime import application
 from logging import exception
 from PIL import Image
 import processor
@@ -18,14 +19,63 @@ def associateVariableWithColor(variable):
         variables_colors_couple[str(variable)] = colors[-1]
         colors.pop()
 
-def associateVariablesWithColors(variables):
-    for variable in variables:
-        associateVariableWithColor(variables[variable])
-
 def createVarImage(variable):
     assert (processor.isVariable(variable))
-    return (Image.open("figures/egg_"+variables_colors_couple[str(variable)]+".png")).save(str(variable[1])+".png")
+    associateVariableWithColor(variable)
+    egg_img = Image.open("figures/egg_"+variables_colors_couple[str(variable)]+".png")
+    egg_img.save('egg_'+str(variable[1])+".png")
+    return egg_img
+
+def createAlligator(terme):
+    assert (processor.isVariable(terme))
+    associateVariableWithColor(terme)
+    alligator_img = Image.open("figures/alligator_"+variables_colors_couple[str(terme)]+".png")
+    alligator_img.save('alligator_'+str(terme[1])+".png")
+    return alligator_img
+
+def createAbsImage(terme):
+    assert (processor.isAbstraction(terme))
+    input = processor.getInputFromAbs(terme)
+    output = processor.getOutputFromAbs(terme)
+    im1 =createAlligator(input)
+    im2 = createImage(output)
+    abstraction = Image.new('RGB', (max(im1.width, im2.width), im1.height + im2.height), (255, 255, 255))
+    abstraction.paste(im1, (0, 0))
+    abstraction.paste(im2, ((im1.width - im2.width) // 2, im1.height))
+    abstraction.save('abs.png')
+    return abstraction
+
+def get_concat_h_multi_resize(im_list, resample=Image.BICUBIC):
+    min_height = min(im.height for im in im_list)
+    im_list_resize = [im.resize((int(im.width * min_height / im.height), min_height),resample=resample)
+                      for im in im_list]
+    total_width = sum(im.width for im in im_list_resize)
+    dst = Image.new('RGB', (total_width, min_height))
+    pos_x = 0
+    for im in im_list_resize:
+        dst.paste(im, (pos_x, 0))
+        pos_x += im.width
+    return dst
+
+def createAppImage(terme):
+    assert (processor.isApplication(terme))
+    left = processor.getFirstTerm(terme)
+    right = processor.getSecondTerm(terme)
+    im1 = createImage(left)
+    im2 = createImage(right)
+    space = Image.open("figures/space.png")
+    application = get_concat_h_multi_resize([im1,space,im2])
+    application.save('application.png')
+    return application
+
+def createImage(terme):
+    if processor.isVariable(terme):
+        return createVarImage(terme)
+    if processor.isAbstraction(terme):
+        return createAbsImage(terme)
+    if processor.isApplication(terme):
+        return createAppImage(terme)
+    else:
+        raise Exception("Unsupported term type")
 
-def createVarsImages(variables):
-    for variable in variables:
-        createVarImage(variables[variable])
\ No newline at end of file
+(createImage(parser.parseTerm(input("Enter a term: "))))
\ No newline at end of file

main.py

@@ -3,10 +3,13 @@ import parser
 import image_maker
 
 def run():
-    parser.parseTerm(input("Enter a term: "))
-    image_maker.associateVariablesWithColors(parser.variables)
-    print(parser.variables)
-    print(image_maker.variables_colors_couple)
-    image_maker.createVarsImages(parser.variables)
+    print(processor.to_string(parser.parseTerm(input("Enter a term: "))))
+    # image_maker.associateVariablesWithColors(parser.variables)
+    # print(parser.variables)
+    # print(image_maker.variables_colors_couple)
+    # image_maker.createVarsImages(parser.variables)
+    # image_maker.createAlligator(parser.parseTerm(input("Enter a term: ")))
+
+
                                                                                                                                                                                 
 run()
\ No newline at end of file

processor.py

@@ -41,7 +41,7 @@ def isLambdaTerm(terme): return isVariable(terme) or isAbstraction(terme) or isA
 # Prends en parametre une variable P et retourne une liste contenant le nom de la variable
 def getVariablesFromVar(terme):
     assert isVariable(terme), "argument is not a variable!"
-    return [terme[1]]
+    return [terme]
 
 # Prends en parametre une abstraction 'P' et renvoie une liste des nom des variables que cette abstraction contient
 def getVariablesFromAbs(terme):
@@ -203,7 +203,7 @@ def to_string_var(terme):
 
 def to_string_abs(terme):
     assert (isAbstraction(terme)), 'The argument is not an Abstraction'
-    return "#"+to_string(getInputFromAbs(terme))+"."+to_string(getOutputFromAbs(terme))
+    return "λ"+to_string(getInputFromAbs(terme))+"."+to_string(getOutputFromAbs(terme))
 
 def to_string_app(terme):
     assert (isApplication(terme)), 'The argument is not an application'