Fixing issues with getting vcg call to vcg case in run_scenario

Author: victoria-tuck

ic/main.py

@@ -504,8 +504,8 @@ def C(vertiport, q):
                 vertiport (str): The vertiport id.
                 q (int): The number of aircraft in the hold.
             """
-            assert float(q).is_integer() and q >= 0 and q < len(congestion_params["C"]), "q must be a non-negative integer."
-            return congestion_params["C"][q]
+            assert float(q).is_integer() and q >= 0 and q < len(congestion_params["C"][vertiport]), "q must be a non-negative integer."
+            return congestion_params["C"][vertiport][q]
 
         #add delays for vcg
         max_delay = 10
@@ -545,7 +545,7 @@ def C(vertiport, q):
 
     start_time = timing_info["start_time"]
     end_time = timing_info["end_time"]
-    auction_intervals = list(range(start_time, end_time, auction_freq))
+    # auction_intervals = list(range(start_time, end_time, auction_freq))
 
     max_travel_time = 6
     last_auction =  end_time - max_travel_time - auction_freq
@@ -568,7 +568,7 @@ def C(vertiport, q):
 
     max_travel_time = 6
     last_auction =  end_time - max(max_travel_time,auction_freq)
-    auction_times = list(np.arange(0, last_auction+1, auction_freq))
+    auction_times = list(np.arange(start_time, last_auction+1, auction_freq))
     print(f"Last auction: {last_auction}")
     logger.info(f"Last auction: {last_auction}")
 

ic/vcg_experiments.ipynb

@@ -24,7 +24,7 @@
     "                \"--file\", file,\n",
     "                \"--method\", \"vcg\",\n",
     "                \"--output_bsky\", str(False),\n",
-    "                \"--run_up_to_auction\", str(1000),\n",
+    "                \"--run_up_to_auction\", str(0),\n",
     "                \"--force_overwrite\",\n",
     "                \"--save_pkl_files\", \"True\",\n",
     "            ]    \n",

test_cases/case0.json

@@ -1,7 +1,7 @@
 {
   "timing_info": {
-    "start_time": 0, 
-    "end_time": 30,
+    "start_time": -20, 
+    "end_time": 40,
     "time_step": 10,
     "auction_frequency": 30
   },
@@ -32,7 +32,9 @@
           "request_departure_time": 10,
           "request_arrival_time": 20,
           "valuation": 100,
-          "bid": 100
+          "bid": 100,
+          "sector_path": [],
+          "sector_times": []
         }
       }
     },
@@ -52,7 +54,9 @@
           "request_departure_time": 10,
           "request_arrival_time": 20,
           "valuation": 100,
-          "bid": 100
+          "bid": 100,
+          "sector_path": [],
+          "sector_times": []
         }
       }
     }