diff --git a/AllerDisplay_Std_Rg.ttf b/AllerDisplay_Std_Rg.ttf new file mode 100644 index 0000000000000000000000000000000000000000..8c2b4f2fcafac6ace405c657e83f82043b32d2bc Binary files /dev/null and b/AllerDisplay_Std_Rg.ttf differ diff --git a/app_functions.py b/app_functions.py new file mode 100644 index 0000000000000000000000000000000000000000..e3dc61519ced013ade555a846f932accc040d54d --- /dev/null +++ b/app_functions.py @@ -0,0 +1,39 @@ +from logic import* +from parsing import* +from image_maker import* + +f=new_var(freshVar()) +x=new_var(freshVar()) +y=new_var(freshVar()) +# z=new_var(freshVar()) +# w=new_var(freshVar()) +boolean={True: new_abs(x,new_abs(y,x)), False: new_abs(x,new_abs(y,y))} + +#definition des entiers de church +def dec_to_church(entier): + if entier==0: + return new_abs(f,new_abs(x,x)) + else: + term=new_app(f,x) + while entier>1: + term= new_app(f,term) + entier-=1 + return new_abs(f,new_abs(x,term)) + +def pair(A,B): + return new_abs(f,new_app(new_app(f,A),B)) + +def getFirstFromPair(p): + return beta_reduction_totale(new_app(p,boolean[True])) + +def getSecondFromPair(p): + return beta_reduction_totale(new_app(p,boolean[False])) + +def dec_to_lambda_relative_integers(number): + if number >= 0: + return pair(boolean[True],dec_to_church(number)) + return pair(boolean[False], dec_to_church(number)) + + +#print(to_string(getSecondFromPair(pair(boolean[True],dec_to_church(1))))) +print(to_string(pair(x,y))) diff --git a/image_maker.py b/image_maker.py index 16233d4073b447e644a20f2df4f637d2fef3425e..a17bf2635f4323a5d918c86f3664b25486d096f0 100644 --- a/image_maker.py +++ b/image_maker.py @@ -98,7 +98,7 @@ def createOldAlligatorFamily(terme): def addNumberToImage(image,number): draw = ImageDraw.Draw(image.image) # font = ImageFont.truetype(<font-file>, <font-size>) - font = ImageFont.truetype("AllerDisplay.ttf", 150) + font = ImageFont.truetype("AllerDisplay_Std_Rg.ttf", 150) # draw.text((x, y),"Sample Text",(r,g,b)) draw.text((5, 0),str(number),(0,0,0),font=font) return image