Merge pull request #39 from twardokus/dev

Move trace files into a directory for cleanliness and adjust filepath…
twardokus · Feb 4, 2022 · 298ebf9 · 298ebf9
2 parents 7f444f2 + 95b5ed9
commit 298ebf9
Show file tree

Hide file tree

Showing 19 changed files with 2 additions and 2 deletions.
diff --git a/test_gps_coords.csv → trace_files/test_gps_coords.csv b/test_gps_coords.csv → trace_files/test_gps_coords.csv
diff --git a/tk_trace.csv → trace_files/tk_trace.csv b/tk_trace.csv → trace_files/tk_trace.csv
diff --git a/tk_trace_2.csv → trace_files/tk_trace_2.csv b/tk_trace_2.csv → trace_files/tk_trace_2.csv
diff --git a/tk_trace_3.csv → trace_files/tk_trace_3.csv b/tk_trace_3.csv → trace_files/tk_trace_3.csv
diff --git a/tk_trace_4.csv → trace_files/tk_trace_4.csv b/tk_trace_4.csv → trace_files/tk_trace_4.csv
diff --git a/tk_trace_5.csv → trace_files/tk_trace_5.csv b/tk_trace_5.csv → trace_files/tk_trace_5.csv
diff --git a/tk_trace_6.csv → trace_files/tk_trace_6.csv b/tk_trace_6.csv → trace_files/tk_trace_6.csv
diff --git a/tk_trace_7.csv → trace_files/tk_trace_7.csv b/tk_trace_7.csv → trace_files/tk_trace_7.csv
diff --git a/tk_trace_8.csv → trace_files/tk_trace_8.csv b/tk_trace_8.csv → trace_files/tk_trace_8.csv
diff --git a/tk_trace_btl.csv → trace_files/tk_trace_btl.csv b/tk_trace_btl.csv → trace_files/tk_trace_btl.csv
diff --git a/tk_trace_btl2.csv → trace_files/tk_trace_btl2.csv b/tk_trace_btl2.csv → trace_files/tk_trace_btl2.csv
diff --git a/tk_trace_btl3.csv → trace_files/tk_trace_btl3.csv b/tk_trace_btl3.csv → trace_files/tk_trace_btl3.csv
diff --git a/tk_trace_lrt.csv → trace_files/tk_trace_lrt.csv b/tk_trace_lrt.csv → trace_files/tk_trace_lrt.csv
diff --git a/tk_trace_lrt2.csv → trace_files/tk_trace_lrt2.csv b/tk_trace_lrt2.csv → trace_files/tk_trace_lrt2.csv
diff --git a/tk_trace_rlt.csv → trace_files/tk_trace_rlt.csv b/tk_trace_rlt.csv → trace_files/tk_trace_rlt.csv
diff --git a/tk_trace_tbl.csv → trace_files/tk_trace_tbl.csv b/tk_trace_tbl.csv → trace_files/tk_trace_tbl.csv
diff --git a/tk_trace_tbl2.csv → trace_files/tk_trace_tbl2.csv b/tk_trace_tbl2.csv → trace_files/tk_trace_tbl2.csv
diff --git a/v2verifier.py b/v2verifier.py
@@ -58,7 +58,7 @@ def transmit(vehicle_index: int, hostname: str) -> None:
     vehicle = v2verifier.Vehicle.Vehicle(public, private, args.hostname)
     vehicle.run(mode="transmitter",
                 tech="dsrc",
-                pvm_list=v2verifier.Utility.read_data_from_file(config["scenario"]["traceFiles"][vehicle_index]),
+                pvm_list=v2verifier.Utility.read_data_from_file("trace_files/" + config["scenario"]["traceFiles"][vehicle_index]),
                 hostname=hostname,
                 test_mode=args.test)
 

diff --git a/v2verifier/Vehicle.py b/v2verifier/Vehicle.py
@@ -165,7 +165,7 @@ def run_self(self, test_mode=False):
         with open("init.yml") as config_file:
             config = yaml.load(config_file, Loader=yaml.FullLoader)
 
-        pvm_list = v2verifier.Utility.read_data_from_file(config["local"]["tracefile"])
+        pvm_list = v2verifier.Utility.read_data_from_file("trace_files/" + config["local"]["tracefile"])
         for pvm_element in pvm_list:
             latitude, longitude, elevation, speed, heading = pvm_element.split(",")
             bsm = v2verifier.V2VTransmit.generate_v2v_bsm(float(latitude),