done

AkhilRB0204 · AkhilRB0204 · commit 11b17707993e · 2026-01-01T21:49:48.000-05:00
diff --git a/freight_project/backend/freight_trading.py b/freight_project/backend/freight_trading.py
@@ -95,9 +95,13 @@ def assign_loads(self):
                 # Check every truck to see which one is best
                 for truck_idx, truck in self.trucks.iterrows():
                     if truck['assigned_load'] is None:  # only free trucks
-                        s = self.score(truck_idx, load_idx)
-                        if s < best_score:
-                            best_score = s
+                        dist = self.haversine(truck['lat'], truck['lng'],
+                                              self.cities.at[load['origin_idx'], 'lat'],
+                                              self.cities.at[load['origin_idx'], 'lng'])
+                        capacity_penalty = 0 if truck['capacity'] >= load['weight'] else 1000
+                        score = dist + capacity_penalty
+                        if score < best_score:
+                            best_score = score
                             best_truck_idx = truck_idx
                 # Assign best truck found
                 if best_truck_idx is not None:
@@ -116,10 +120,8 @@ def update_trucks(self):
                 dest = self.cities.iloc[load['dest_idx']]
 
                 # Move halfway closer to destination each time we call this
-                truck_lat = truck['lat']
-                truck_lng = truck['lng']
-                truck_lat += (dest['lat'] - truck_lat) * 0.5
-                truck_lng += (dest['lng'] - truck_lng) * 0.5
+                truck_lat = truck['lat'] + (dest['lat'] - truck['lat']) * 0.5
+                truck_lng = truck['lng'] + (dest['lng'] - truck['lng']) * 0.5
 
                 # Update truck’s position
                 self.trucks.at[idx, 'lat'] = truck_lat
@@ -132,18 +134,4 @@ def update_trucks(self):
                     print(f"✅ Truck {truck['truck_id']} arrived at {dest['city']}, {dest['state_name']}")
                     # Remove load (delivered)
                     self.loads = self.loads[self.loads['load_id'] != load['load_id']]
-
-# --- Example simulation run ---
-if __name__ == "__main__":
-    sim = FreightSim("uscities.csv", num_trucks=10)
-
-    # Make 5 random shipments
-    for _ in range(5):
-        sim.create_random_load()
-
-    # Assign trucks to those shipments
-    sim.assign_loads()
-
-    # Move trucks step by step until some deliveries finish
-    for _ in range(10):
-        sim.update_trucks()
+                    print(f"📦 Load {load['load_id']} delivered and removed from system.")
diff --git a/freight_project/cli/main.py b/freight_project/cli/main.py
@@ -13,16 +13,18 @@ def main():
     sim = FreightSim("uscities.csv", num_trucks=num_trucks, min_pop=min_pop)
 
     # Create loads
-    for _ in range(loads):
+    for _ in range(num_loads):
         sim.create_random_load()
 
     # Assign loads to trucks
     sim.assign_loads()
 
     # Simulate step by step
     for step in range(num_steps):
-        print(f"\n--- Simulation Step {step+1} ---")
+        print(f"\n--- Step {step+1} ---")
         sim.update_trucks()
+        print(sim.trucks[['truck_id','city','status','assigned_load']])
+        print(sim.loads[['load_id','weight','assigned_truck']])
 
 if __name__ == "__main__":
     main()
diff --git a/freight_project/frontend/index.html b/freight_project/frontend/index.html
@@ -2,103 +2,25 @@
 <html>
 <head>
   <title>Freight Simulation</title>
-  <meta charset="utf-8" />
+  <meta charset="utf-8">
+  <link rel="stylesheet" href="style.css">
   <link rel="stylesheet" href="https://unpkg.com/leaflet/dist/leaflet.css" />
   <script src="https://unpkg.com/leaflet/dist/leaflet.js"></script>
 </head>
 <body>
   <h1>Freight Simulation Dashboard</h1>
-<div class="control-panel">
-  <label>Number of Trucks:</label>
-  <input id="numTrucks" type="number" value="50" />
-
-  <label>Number of Loads:</label>
-  <input id="numLoads" type="number" value="20" />
-
-  <label>Minimum Population:</label>
-  <input id="minPop" type="number" value="100000" />
-
-  <button onclick="startSimulation()">Start Simulation</button>
-  <button onclick="createLoad()">Create Random Load</button>
-</div>
-
-<div id="map"></div>
-  <script>
-    // Initialize Leaflet map centered on the US
-  const map = L.map('map').setView([39.5, -98.35], 4);
-  L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-      attribution: '© OpenStreetMap'
-  }).addTo(map);
-
-  let truckMarkers = {};
-  let loadLines = {};
-
-  // Function to refresh truck positions and status from backend
-    async function refresh() {
-      const res = await fetch("http://127.0.0.1:8000/status");
-      const data = await res.json();
-
-      // Update or create markers for each truck
-      data.trucks.forEach(truck => {
-          if (truckMarkers[truck.truck_id]) {
-              // Move existing marker to new position
-              truckMarkers[truck.truck_id].setLatLng([truck.lat, truck.lon]);
-              truckMarkers[truck.truck_id].bindPopup(`Truck: ${truck.truck_id}<br>Status: ${truck.status}`);
-          } else {
-              // Create a new marker
-              truckMarkers[truck.truck_id] = L.circleMarker([truck.lat, truck.lon], {
-                  radius: 6,
-                  color: truck.status === "Idle" ? "green" : "orange" // color by status
-              }).addTo(map)
-                .bindPopup(`Truck: ${truck.truck_id}<br>Status: ${truck.status}`);
-          }
-      });
-  
-  // Draw lines between trucks and their loads
-  data.loads.forEach(load => {
-          const lineId = load.load_id;
-          const originLatLng = [parseFloat(load.origin_lat || 0), parseFloat(load.origin_lon || 0)];
-          const destLatLng = [parseFloat(load.dest_lat || 0), parseFloat(load.dest_lon || 0)];
-
-          // Create or update polyline
-          if (!loadLines[lineId]) {
-              loadLines[lineId] = L.polyline([originLatLng, destLatLng], {
-                  color: "orange",
-                  weight: 2,
-                  dashArray: '5, 5'
-              }).addTo(map);
-          }
-      });
-  
-  // Remove lines for delivered loads
-      Object.keys(loadLines).forEach(lineId => {
-          const stillExists = data.loads.some(l => l.load_id === lineId);
-          if (!stillExists) {
-              map.removeLayer(loadLines[lineId]);
-              delete loadLines[lineId];
-          }
-      });
-    
-    }
-// Function to start simulation with dynamic user inputs
-  async function startSimulation() {
-      const numTrucks = parseInt(document.getElementById("numTrucks").value);
-      const numLoads = parseInt(document.getElementById("numLoads").value);
-      const minPop = parseInt(document.getElementById("minPop").value);
-
-      // Call backend endpoint to initialize simulation
-      await fetch(`http://127.0.0.1:8000/init?num_trucks=${numTrucks}&num_loads=${numLoads}&min_pop=${minPop}`);
-      alert("Simulation started!");
-  }
-
-  // Function to create a new random load
-  async function createLoad() {
-      await fetch("http://127.0.0.1:8000/create_load");
-  }
-
-  // Initial refresh and periodic updates every 1 second
-    refresh();
-    setInterval(refresh, 1000); 
-</script>
+  <div class="input-box">
+    <label>Number of Trucks:</label>
+    <input id="numTrucks" type="number" value="50">
+    <label>Number of Loads:</label>
+    <input id="numLoads" type="number" value="20">
+    <label>Minimum Population:</label>
+    <input id="minPop" type="number" value="50000">
+    <button onclick="startSimulation()">Start Simulation</button>
+    <button onclick="createLoad()">Create Random Load</button>
+  </div>
+  <div id="map"></div>
+  <div id="output"></div>
+  <script src="script.js"></script>
 </body>
 </html>
diff --git a/freight_project/frontend/script.js b/freight_project/frontend/script.js
@@ -1,120 +1,63 @@
-let cities = [];
-
-// Load CSV file dynamically
-Papa.parse("uscities.csv", {
-  download: true,
-  header: true,
-  complete: (results) => {
-    cities = results.data;
-    console.log("Loaded cities:", cities.length);
-  }
-});
-
-// Pick a random city filtered by min population
-function randomCity(minPop) {
-  const filtered = cities.filter(c => parseInt(c.population) > minPop);
-  return filtered[Math.floor(Math.random() * filtered.length)];
-}
-
-// Haversine distance calculator (miles)
-function haversine(lat1, lon1, lat2, lon2) {
-  const R = 3956;
-  const toRad = x => (x * Math.PI) / 180;
-
-  const dLat = toRad(lat2 - lat1);
-  const dLon = toRad(lon2 - lon1);
-  const a =
-    Math.sin(dLat / 2)**2 +
-    Math.cos(toRad(lat1)) *
-    Math.cos(toRad(lat2)) *
-    Math.sin(dLon / 2)**2;
-
-  return 2 * R * Math.asin(Math.sqrt(a));
-}
-
-function startSimulation() {
-  const numTrucks = parseInt(document.getElementById("trucks").value);
-  const numLoads = parseInt(document.getElementById("loads").value);
-  const minPop = parseInt(document.getElementById("min_pop").value);
-
-  let output = "";
-
-  //----------------------------------
-  // 1. Create trucks
-  //----------------------------------
-  let trucks = [];
-  for (let i = 0; i < numTrucks; i++) {
-    let c = randomCity(minPop);
-    trucks.push({
-      id: "T" + (i+1),
-      city: c.city,
-      lat: parseFloat(c.lat),
-      lon: parseFloat(c.lng),
-      status: "Idle",
-      capacity: Math.floor(Math.random() * 20) + 10
+const map = L.map('map').setView([39.5, -98.35], 4);
+L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png').addTo(map);
+
+let truckMarkers = {};
+let loadLines = {};
+
+async function refresh() {
+    const res = await fetch("http://127.0.0.1:8000/status");
+    const data = await res.json();
+
+    // Trucks
+    data.trucks.forEach(truck => {
+        if (truckMarkers[truck.truck_id]) {
+            truckMarkers[truck.truck_id].setLatLng([truck.lat, truck.lon]);
+            truckMarkers[truck.truck_id].bindPopup(`${truck.truck_id} - ${truck.status}`);
+        } else {
+            truckMarkers[truck.truck_id] = L.circleMarker([truck.lat, truck.lon], {
+                radius: 6,
+                color: truck.status === "Idle" ? "green" : "orange"
+            }).addTo(map).bindPopup(`${truck.truck_id} - ${truck.status}`);
+        }
     });
-  }
-
-  //----------------------------------
-  // 2. Create loads
-  //----------------------------------
-  let loads = [];
-  for (let i = 0; i < numLoads; i++) {
-    let origin = randomCity(minPop);
-    let dest = randomCity(minPop);
 
-    loads.push({
-      id: "L" + (i+1),
-      origin: origin.city,
-      dest: dest.city,
-      latO: parseFloat(origin.lat),
-      lonO: parseFloat(origin.lng),
-      latD: parseFloat(dest.lat),
-      lonD: parseFloat(dest.lng),
-      weight: Math.floor(Math.random() * 20) + 5
+    // Loads (polylines)
+    data.loads.forEach(load => {
+        const lineId = load.load_id;
+        const origin = [load.latO || load.dest_lat, load.lonO || load.dest_lon];
+        const dest = [load.dest_lat, load.dest_lon];
+
+        if (!loadLines[lineId]) {
+            loadLines[lineId] = L.polyline([origin, dest], {
+                color: "orange",
+                weight: 2,
+                dashArray: '5,5'
+            }).addTo(map);
+        }
     });
-  }
-
-  //----------------------------------
-  // 3. Assign loads to trucks
-  //----------------------------------
-  loads.forEach(load => {
-    let bestTruck = null;
-    let bestScore = Infinity;
-
-    trucks.forEach(truck => {
-      if (truck.status === "Idle") {
-        if (truck.capacity < load.weight) return;
 
-        let dist = haversine(truck.lat, truck.lon, load.latO, load.lonO);
-
-        if (dist < bestScore) {
-          bestScore = dist;
-          bestTruck = truck;
+    // Remove delivered loads
+    Object.keys(loadLines).forEach(lineId => {
+        if (!data.loads.some(l => l.load_id === lineId)) {
+            map.removeLayer(loadLines[lineId]);
+            delete loadLines[lineId];
         }
-      }
     });
+}
 
-    if (bestTruck) {
-      bestTruck.status = "Assigned → " + load.id;
-      load.assigned = bestTruck.id;
-    } else {
-      load.assigned = "NO AVAILABLE TRUCK";
-    }
-  });
-
-  //----------------------------------
-  // Output
-  //----------------------------------
-  output += "🚛 TRUCKS:\n";
-  trucks.forEach(t => {
-    output += `${t.id} — ${t.city} — ${t.status} — cap ${t.capacity}\n`;
-  });
+// Initialize simulation
+async function startSimulation() {
+    const numTrucks = document.getElementById("numTrucks").value;
+    const numLoads = document.getElementById("numLoads").value;
+    const minPop = document.getElementById("minPop").value;
 
-  output += "\n📦 LOADS:\n";
-  loads.forEach(l => {
-    output += `${l.id} — ${l.origin} → ${l.dest} — weight ${l.weight} — assigned: ${l.assigned}\n`;
-  });
+    await fetch(`http://127.0.0.1:8000/init?num_trucks=${numTrucks}&num_loads=${numLoads}&min_pop=${minPop}`);
+    alert("Simulation started!");
+}
 
-  document.getElementById("output").innerText = output;
+async function createLoad() {
+    await fetch("http://127.0.0.1:8000/create_load");
 }
+
+// Auto-refresh every 1 second
+setInterval(refresh, 1000);
diff --git a/freight_project/frontend/style.css b/freight_project/frontend/style.css
