Upgrade to version v1.5.008

Author: [FacuFalcone]

Combination/Combinations.py

@@ -30,13 +30,13 @@ def SimpleCombinatory():
     """
     try:
         print("\n###### Simple Combinatory #######")
-        print("C(n, k)")
+        print("###### C(n, k) ######")
         numberN = int(input("Value for n: "))
         numberK = int(input("Value for k: "))
         n = F(numberN)
         k = F(numberK) * F((numberN - numberK))
         print(f"Simple Combination of C({numberN},{numberK}): ")
-        print(f"Formula: {n}! / ( {k}! * ({n-k})! )")
+        print(f"Formula: {numberN}! / ( {numberK}! * ({numberN-numberK})! )")
         print(f"Result: {n/k}")
     except Exception as e:
         print(f"Error: {e}")
@@ -49,7 +49,7 @@ def CompoundCombinatory():
     """
     print("\n###### Compound Combinatory #######")
     try:
-        print("C'(n, k)")
+        print("###### C'(n, k) ######")
         numberN = int(input("Value for n: "))
         numberK = int(input("Value for k: "))
         n = numberN + numberK - 1

Combinatorial_Calculus_v1.5.007.zip

@@ -26,7 +26,26 @@
 from Variation import Variations as V
 
 
+def PrintMenu() -> int:
+    """
+    Prints in console the menu of the app.
+    """
+    option = 0
+    print("Select an option from the ones below")
+    print("1 - Simple Permutation.\n2 - Simple Variation.\n3 - Simple Combination.")
+    print("4 - Compound Permutation.\n5 - Compound Variation.\n6 - Compound Combination.")
+    try:
+        option = int(input("Your option: "))
+    except Exception as e:
+        print(f"Error: {e}")
+    finally:
+        return option
+
+
 def SelectOperation(option: int):
+    """
+    Receives an integer to do any of the 6 functions of the combinatorial calculus.
+    """
     try:
         if option == 1:
             P.SimplePermutation()
@@ -45,45 +64,31 @@ def SelectOperation(option: int):
     except Exception as e:
         print(f"Error: {e}")
 
-def PrintMenu()->int:
-    """
-    Prints in console the menu of the app.
-    """
-    option = 0
-    print("Select an option from the ones below")
-    print("1 - Simple Permutation.\n2 - Simple Variation.\n3 - Simple Combination.")
-    print("4 - Compound Permutation.\n5 - Compound Variation.\n6 - Compound Combination.")
-    try:
-        option = int(input("Your option: "))
-    except Exception as e:
-        print(f"Error: {e}")
-    finally:
-        return option
 
 def CleanScreen():
     """
     Cleans the screen.
     """
     return lambda: os.system('cls')
 
+
 def CombinatorialCalculus():
     appName = "Combinatorial Calculus"
-    version = "v1.5.007"
+    version = "v1.5.008"
     author = "Facu Falcone"
     continueExec = "y"
-    
-    while continueExec=='y':
+
+    while continueExec == 'y':
         print(f"\n## {appName} {version} by {author}. ##\n")
         print("#################################")
-        
-        option = PrintMenu()
-        SelectOperation(option)
+
+        SelectOperation(PrintMenu())
 
         print("#################################")
-        continueExec = input("\nWrite Y to do another calculus or N to close the app: ")
+        print("Write Y to do another calculus or N to close the app.")
+        continueExec = input("\nYour option (Y/N): ")
         continueExec = continueExec.lower()
         CleanScreen()()
-        
 
 
 if __name__ == '__main__':

Main.py

@@ -29,7 +29,7 @@ def SimplePermutation():
     """
     print("\n###### Simple Permutation #######")
     try:
-        print("Pn = n!")
+        print("###### Pn = n! ######")
         numberN = int(input("Value for n: "))
         try:
             fact = F(numberN)
@@ -50,25 +50,33 @@ def ComposedPermutation():
     dividend = 1
     listCases = []
     formulaTop = "("
-    formulaBot = ""
+    formulaBot = " "
+    
     print("\n###### Compound Permutation #######")
     try:
-        print("P n1, n2 ..nn = (n1 + n2 + ..nn) / (n1)! (n2)! ..(nn)!")
+        print("###### P n1, n2 ..nn = (n1 + n2 + ..nn) / (n1)! (n2)! ..(nn)! ######")
         number = int(input("Amount of Variables: "))
         for case in range(1, number+1):
             listCases.append(int(input(f"Value for {case}° n: ")))
             sumCases += listCases[case-1]
 
         for case in listCases:
             dividend *= F(case)
-            formulaBot += str(case) + "!"
+            formulaBot += str(case) + "!  "
+            
             if listCases.index(case) == (len(listCases)-1):
-                formulaTop += str(case) + ")!"
+                formulaTop += str(case) + ")!\n"
             else:
                 formulaTop += str(case) + " + "
 
-        print(f"Compound Permutation of {number} variables: ")
-        print(f"Formula: {formulaTop} / {formulaBot}")
-        print(f"Result: {F(sumCases) / dividend}")
+        middle = "-"*(4*number) + "\n"
+        fullFormula = formulaTop + middle + formulaBot
+        print(f"\n#### Compound Permutation of {number} variables: ")
+        print(f"#### Formula: ")
+        print(fullFormula)
+        print(f"#### Result: {F(sumCases) / dividend}")
     except Exception as e:
         print(f"Error: {e}")
+#(1 + 2 + 5 + 6 + 7)!
+#--------------------
+# 1! 2! 3! 5! 6! 7!