Merge branch 'add-collisions' of https://github.com/autobotx343/Python into add-collisions

Author: autobotx343

physics/collisions.py

@@ -14,11 +14,10 @@
 Reference: https://en.wikipedia.org/wiki/Collision
 """
 
-def inelastic_collisions(mass1 :float, 
-                         mass2 :float, 
-                         velocity1 :float, 
-                         velocity2 :float
-                         ) -> float :
+
+def inelastic_collisions(
+    mass1: float, mass2: float, velocity1: float, velocity2: float
+) -> float:
     """Calculate final velocity after a perfectly inelastic collision.
 
     The two objects stick together and share a common final velocity.
@@ -38,18 +37,16 @@ def inelastic_collisions(mass1 :float,
         >>> inelastic_collisions(9.0, 8.1, -3.2, 3.1)
         -0.22
     """
-    initial_momentum = ((mass1 * velocity1) + (mass2 * velocity2))
-    total_mass = (mass2 + mass1)
-    final_velocity =  round((initial_momentum/total_mass), 2)
-    
+    initial_momentum = (mass1 * velocity1) + (mass2 * velocity2)
+    total_mass = mass2 + mass1
+    final_velocity = round((initial_momentum / total_mass), 2)
+
     return final_velocity
 
 
-def elastic_collisions(mass1 :float, 
-                       mass2 :float, 
-                       velocity1 :float, 
-                       velocity2 :float
-                       ) -> str :
+def elastic_collisions(
+    mass1: float, mass2: float, velocity1: float, velocity2: float
+) -> str:
     """Calculate final velocities after a perfectly elastic collision.
 
     The collision is head-on and conserves both momentum and kinetic energy.
@@ -70,24 +67,25 @@ def elastic_collisions(mass1 :float,
         '2.76 ; -3.54'
     """
     com_velocity = inelastic_collisions(mass1, mass2, velocity1, velocity2)
-    initial_velocities  = [velocity1, velocity2]
+    initial_velocities = [velocity1, velocity2]
     final_velocities = []
 
     for vel in initial_velocities:
         new_vel = -1 * (vel - com_velocity)
         final_vel = com_velocity + new_vel
         final_velocities.append(round(final_vel, 2))
-    
-    return f'{final_velocities[0]} ; {final_velocities[1]}'
 
+    return f"{final_velocities[0]} ; {final_velocities[1]}"
 
-def type_collision(mass1 :float, 
-                   mass2 :float, 
-                   velocity_initial1 :float, 
-                   velocity_initial2 :float,
-                   velocity_final1 :float, 
-                   velocity_final2 :float
-                   ) -> str :
+
+def type_collision(
+    mass1: float,
+    mass2: float,
+    velocity_initial1: float,
+    velocity_initial2: float,
+    velocity_final1: float,
+    velocity_final2: float,
+) -> str:
     """Determine the collision type from initial and final velocities.
 
     Compares initial and final momentum and kinetic energy to classify the collision.
@@ -111,19 +109,22 @@ def type_collision(mass1 :float,
         >>> type_collision(1.0, 1.0, 2.0, 3.0, 0.0, 0.0)
         'Inelastic Collision'
     """
-    momentum_initial = ((mass1 * velocity_initial1) + (mass2 * velocity_initial2))
-    momentum_final = ((mass1 * velocity_final1) + (mass2 * velocity_final2))
-    kinetic_initial = 0.5 * ((mass1 * velocity_initial1**2) + (mass2 * velocity_initial2**2))
+    momentum_initial = (mass1 * velocity_initial1) + (mass2 * velocity_initial2)
+    momentum_final = (mass1 * velocity_final1) + (mass2 * velocity_final2)
+    kinetic_initial = 0.5 * (
+        (mass1 * velocity_initial1**2) + (mass2 * velocity_initial2**2)
+    )
     kinetic_final = 0.5 * ((mass1 * velocity_final1**2) + (mass2 * velocity_final2**2))
 
     if kinetic_final == kinetic_initial and momentum_initial == momentum_final:
         return 'Perfectly Elastic Collision'
-    elif kinetic_final != kinetic_initial and momentum_initial == momentum_final:
+    elif not(kinetic_final == kinetic_initial) and momentum_initial == momentum_final:
         return 'Perfectly Inelastic Collision'
     else:
-        return 'Inelastic Collision'
+        return "Inelastic Collision"
 
 
 if __name__ == "__main__":
     import doctest
-    doctest.testmod()
+
+    doctest.testmod()