fuel calculation corrections

aircraft.csv

@@ -1,13 +1,13 @@
 Aircraft,Range_NauticalMiles,Range_km,Fuel_Consumption_kg/hr,Cruising Speed (kts),Speed_kmh,MaxFlightTime_hr,Max_Fuel_Capacity_kg
-Airbus A320,3300,6111.6,2430,468,866.74,7.05,17131.5
+Airbus A320,3300,6111.6,2430,468,829,7.05,21760
 Airbus A321-100,3000,5556,2885,493,913.04,6.09,17569.65
-Airbus A321-231,3200,5926.4,2740,493,913.04,6.49,17782.6
+Airbus A321-200,3200,5926.4,2740,493,913.04,6.49,17782.6
 Airbus A330-200,7250,13427,5590,490,907.48,14.8,82732
 Airbus A330-300,6350,11760.2,5700,490,907.48,12.96,73872
 Airbus A340-300,7300,13519.6,6500,488,903.78,14.96,97240
 Airbus A340-500,9000,16668,8000,488,903.78,18.44,147520
-Airbus A350-900,8100,15732,5800,470,870.44,17.23,165000
-Airbus A380,8000,14816,12280,470,870.44,17.35,256000
+Airbus A350-900,8100,15732,5800,470,903,17.23,165000
+Airbus A380,8000,14816,12280,470,903,17.35,256000
 Boeing 737-800,2935,5435.62,2530,455,842.66,6.45,16318.5
 Boeing 747-400,7260,13445.52,10230,488,903.78,14.88,152222.4
 Boeing 747-8,7730,14315.96,9600,470,870.44,16.45,157920
@@ -15,9 +15,9 @@ Boeing 757-200,3915,7250.58,3320,470,870.44,8.33,27655.6
 Boeing 767-200,3900,7222.8,4500,470,870.44,8.3,37350
 Boeing 767-300,4020,7445.04,4800,470,870.44,8.55,41040
 Boeing 767-300ER,5980,11074.96,4940,490,907.48,12.2,60268
-Boeing 777-200,5240,9704.48,6080,490,907.48,10.69,64995.2
-Boeing 777-200ER,7725,14306.7,6630,470,870.44,16.44,108997.2
-Boeing 777-200LR,8555,15843.86,6800,488,903.78,17.53,119204
-Boeing 777-300ER,7370,13649.24,7700,447,827.84,16.49,127154.39
-Boeing 787-8,7355,13621.46,4900,447,827.84,16.45,80605
-Boeing 787-9,7530,13945.56,5600,447,827.84,17.45,12116
+Boeing 777-200,5240,9704.48,6080,490,907.48,10.69,93872
+Boeing 777-200ER,7725,14306.7,6630,470,870.44,16.44,136936
+Boeing 777-200LR,8555,15843.86,6800,488,903.78,17.53,145024
+Boeing 777-300ER,7370,13649.24,7700,447,827.84,16.49,145024
+Boeing 787-8,7355,13621.46,4900,447,827.84,16.45,101343
+Boeing 787-9,7530,13945.56,5600,447,827.84,17.45,101522

flight_distance.py

@@ -133,10 +133,10 @@ def calculate_fuel_and_time(distance, cruising_speed, fuel_burn_rate, reserve_fu
     :return: Total fuel required including reserve, and estimated flight time
     """
     # Phase speeds and times
-    climb_speed = cruising_speed*0.7
-    descent_speed = cruising_speed*0.6  # km/h
-    climb_descent_distance = distance * climb_descent_fraction
-    cruise_distance = distance - (2 * climb_descent_distance)  # Remaining distance for cruise
+    climb_speed = cruising_speed*0.3 # km/h
+    descent_speed = cruising_speed*0.2  # km/h
+    climb_descent_distance = round(distance * climb_descent_fraction,2)
+    cruise_distance = round(distance - (2 * climb_descent_distance),2)  # Remaining distance for cruise
 
     # Adjust if cruise distance is negative (short flights)
     if cruise_distance < 0:
@@ -144,10 +144,11 @@ def calculate_fuel_and_time(distance, cruising_speed, fuel_burn_rate, reserve_fu
         descent_time = climb_descent_distance / descent_speed
         cruise_distance = 0
 
-    cruise_time = cruise_distance / cruising_speed
-    climb_time = climb_descent_distance / climb_speed
-    descent_time = climb_descent_distance / descent_speed
+    cruise_time = round(cruise_distance / cruising_speed,2)
+    climb_time = round(climb_descent_distance / climb_speed,2)
+    descent_time = round(climb_descent_distance / descent_speed,2)
     # Total flight time
+    print(climb_descent_distance,climb_time,cruise_distance, cruise_time,descent_time)
     total_flight_time = climb_time + cruise_time + descent_time
 
     # Fuel calculations

main.py

@@ -3,20 +3,20 @@ from flight_distance import *
 from optimizer import *
 from weather import *
 
-airport_identifiers = ['BLR', 'CCU', 'DEL']  # Replace with actual identifiers
+airport_identifiers = ['BLR', 'SFO']  # Replace with actual identifiers
 
 #Get Airport Coordinates
 lat_long_dict = get_airport_lat_long(airport_identifiers)
-print("Coordinates: \n",lat_long_dict)
+# print("Coordinates: \n",lat_long_dict)
 
 #Get Distance between each node (airports)
 trip_distance = calculate_distances(airport_identifiers)
-print("Distance b/w Airports: \n",trip_distance)
+# print("Distance b/w Airports: \n",trip_distance)
 
 #Get onroute weather
 raw_weather = fetch_weather_for_all_routes(airport_identifiers, lat_long_dict)
 route_factors = extract_route_factors(raw_weather)
-print("On Route weather: \n", raw_weather)
+# print("On Route weather: \n", raw_weather)
 
 # # Ensure the graph is bidirectional (undirected)
 for (a, b), dist in list(trip_distance.items()):
@@ -27,9 +27,9 @@ optimal_route, optimal_distance = find_optimal_route(airport_identifiers, trip_d
 
 # Display the optimal route and the total adjusted distance/cost
 print("Optimal Route:", " -> ".join(optimal_route) + f" -> {optimal_route[0]}")
-print("Total Adjusted Distance:", optimal_distance)
+print("Total Round Trip Distance:", optimal_distance)
 
-aircraft_type = input("Enter the aircraft type: ")
+aircraft_type = "Boeing 777-200LR"
 
 # Check if the aircraft can fly the route without refuel
 result = can_fly_route(aircraft_type, airport_identifiers)