Modified the repository name and removed link calculation procedures

.copier-answers.yml

@@ -7,6 +7,6 @@ full_name: Nagacharan Teja Tangirala
 license: MIT
 org: nagacharan-tangirala
 project_name: prep-pavenet
-project_short_description: The scenarios for PAVeNet are prepared by this project.
-url: https://github.com/nagacharan-tangirala/prep-pavenet
+project_short_description: The positions for disolv are prepared by this project.
+url: https://github.com/nagacharan-tangirala/disolv-positions
 vcs: true

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
-      - uses: pre-commit/action@v3.0.0
+      - uses: pre-commit/action@v3.0.1
         with:
           extra_args: --hook-stage manual --all-files
       - name: Run PyLint
@@ -66,4 +66,4 @@ jobs:
           --durations=20
 
       - name: Upload coverage report
-        uses: codecov/codecov-action@v3.1.4
+        uses: codecov/codecov-action@v4.2.0

README.md

@@ -1,27 +1,15 @@
-# prep-pavenet
+# Prep-Disolv
 
-[![Actions Status][actions-badge]][actions-link]
-[![Documentation Status][rtd-badge]][rtd-link]
+This repository does the pre-processing of the mobility traces to be readable by [Disolv](https://github.com/nagacharan-tangirala/disolv).
 
-[![PyPI version][pypi-version]][pypi-link]
-[![Conda-Forge][conda-badge]][conda-link]
-[![PyPI platforms][pypi-platforms]][pypi-link]
+### Features
 
-[![GitHub Discussion][github-discussions-badge]][github-discussions-link]
+- Reads SUMO Floating Car Data (FCD) traces and converts them to Disolv readable format.
+- Generates Activation timing files for all the devices.
+- Positions Road-side Units (RSUs) at junctions.
 
-<!-- SPHINX-START -->
+### Note
 
-<!-- prettier-ignore-start -->
-[actions-badge]:            https://github.com/nagacharan-tangirala/prep-pavenet/workflows/CI/badge.svg
-[actions-link]:             https://github.com/nagacharan-tangirala/prep-pavenet/actions
-[conda-badge]:              https://img.shields.io/conda/vn/conda-forge/prep-pavenet
-[conda-link]:               https://github.com/conda-forge/prep-pavenet-feedstock
-[github-discussions-badge]: https://img.shields.io/static/v1?label=Discussions&message=Ask&color=blue&logo=github
-[github-discussions-link]:  https://github.com/nagacharan-tangirala/prep-pavenet/discussions
-[pypi-link]:                https://pypi.org/project/prep-pavenet/
-[pypi-platforms]:           https://img.shields.io/pypi/pyversions/prep-pavenet
-[pypi-version]:             https://img.shields.io/pypi/v/prep-pavenet
-[rtd-badge]:                https://readthedocs.org/projects/prep-pavenet/badge/?version=latest
-[rtd-link]:                 https://prep-pavenet.readthedocs.io/en/latest/?badge=latest
-
-<!-- prettier-ignore-end -->
+- Requirement and tool specific extensions are possible. New source of mobility traces can be added using the SUMO case as an example.
+- The RSU placement can be extended to other types of placement strategies or even to other types of infrastructure.
+- One-time scripts are added to the directory `scripts` for later reference.

docs/conf.py

@@ -5,7 +5,7 @@
 project = "prep-pavenet"
 copyright = "2023, Nagacharan Teja Tangirala"
 author = "Nagacharan Teja Tangirala"
-version = release = importlib.metadata.version("prep_pavenet")
+version = release = importlib.metadata.version("disolv_positions")
 
 extensions = [
     "myst_parser",

noxfile.py

@@ -30,7 +30,7 @@ def pylint(session: nox.Session) -> None:
     # This needs to be installed into the package environment, and is slower
     # than a pre-commit check
     session.install(".", "pylint")
-    session.run("pylint", "prep_pavenet", *session.posargs)
+    session.run("pylint", "disolv_positions", *session.posargs)
 
 
 @nox.session
@@ -99,7 +99,7 @@ def build_api_docs(session: nox.Session) -> None:
         "--module-first",
         "--no-toc",
         "--force",
-        "../src/prep_pavenet",
+        "../src/disolv_positions",
     )
 
 

pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "hatchling.build"
 
 
 [project]
-name = "prep-pavenet"
+name = "prep-disolv"
 authors = [
   { name = "Nagacharan Teja Tangirala", email = "nagacharan.tangirala@tum.de" },
 ]
-description = "The scenarios for PAVeNet are prepared by this project."
+description = "The position files for disolv are prepared by this project."
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.12"
 classifiers = [
   "Development Status :: 1 - Planning",
   "Intended Audience :: Science/Research",
@@ -55,15 +55,16 @@ docs = [
 ]
 
 [project.urls]
-Homepage = "https://github.com/nagacharan-tangirala/prep-pavenet"
-"Bug Tracker" = "https://github.com/nagacharan-tangirala/prep-pavenet/issues"
-Discussions = "https://github.com/nagacharan-tangirala/prep-pavenet/discussions"
-Changelog = "https://github.com/nagacharan-tangirala/prep-pavenet/releases"
+Homepage = "https://github.com/nagacharan-tangirala/disolv-positions"
+"Bug Tracker" = "https://github.com/nagacharan-tangirala/disolv-positions/issues"
+Discussions = "https://github.com/nagacharan-tangirala/disolv-positions/discussions"
+Changelog = "https://github.com/nagacharan-tangirala/disolv-positions/releases"
 
 
 [tool.hatch]
 version.source = "vcs"
-build.hooks.vcs.version-file = "src/prep_pavenet/_version.py"
+build.hooks.vcs.version-file = "src/disolv_positions/_version.py"
+envs.default.python = "3.12"
 envs.default.dependencies = [
   "pytest",
   "pytest-cov",
@@ -84,7 +85,7 @@ testpaths = [
 
 
 [tool.coverage]
-run.source = ["prep_pavenet"]
+run.source = ["disolv_positions"]
 port.exclude_lines = [
   'pragma: no cover',
   '\.\.\.',
@@ -93,7 +94,7 @@ port.exclude_lines = [
 
 [tool.mypy]
 files = ["src", "tests"]
-python_version = "3.8"
+python_version = "3.12"
 warn_unused_configs = true
 strict = true
 show_error_codes = true
@@ -103,7 +104,7 @@ disallow_untyped_defs = false
 disallow_incomplete_defs = false
 
 [[tool.mypy.overrides]]
-module = "prep_pavenet.*"
+module = "disolv_positions.*"
 disallow_untyped_defs = true
 disallow_incomplete_defs = true
 
@@ -140,15 +141,15 @@ ignore = [
 ]
 isort.required-imports = ["from __future__ import annotations"]
 # Uncomment if using a _compat.typing backport
-# typing-modules = ["prep_pavenet._compat.typing"]
+# typing-modules = ["disolv_positions._compat.typing"]
 
 [tool.ruff.lint.per-file-ignores]
 "tests/**" = ["T20"]
 "noxfile.py" = ["T20"]
 
 
 [tool.pylint]
-py-version = "3.8"
+py-version = "3.12"
 ignore-paths = [".*/_version.py"]
 reports.output-format = "colorized"
 similarities.ignore-imports = "yes"

src/__main__.py

@@ -2,16 +2,21 @@
 
 import argparse
 import sys
+import time
 
-from prep_pavenet.core.core import Core
+from prep_disolv.core.core import Core
 
 
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument("-c", "--config", help="Config file path", required=True)
     args = parser.parse_args()
     core = Core(args.config)
+    # calculate execution time
+    exec_start = time.time()
     core.prepare_scenario()
+    exec_end = time.time()
+    print(f"Execution time: {exec_end - exec_start:.3f} seconds")
 
 
 if __name__ == "__main__":

src/prep_disolv/common/columns.py

@@ -0,0 +1,19 @@
+from __future__ import annotations
+
+AGENT_ID = "agent_id"
+NS3_ID = "ns3_id"
+COORD_X = "x"
+COORD_Y = "y"
+TIME_STEP = "time_step"
+ON_TIMES = "on_times"
+OFF_TIMES = "off_times"
+LAT = "lat"
+LON = "lon"
+
+ACTIVATION_COLUMNS = [AGENT_ID, NS3_ID, ON_TIMES, OFF_TIMES]
+RSU_COLUMNS = [TIME_STEP, AGENT_ID, NS3_ID, COORD_X, COORD_Y, LAT, LON]
+CONTROLLER_COLUMNS = [TIME_STEP, AGENT_ID, NS3_ID, COORD_X, COORD_Y, LAT, LON]
+
+# Folders
+POSITIONS_FOLDER = "positions"
+ACTIVATIONS_FOLDER = "activations"

src/prep_pavenet/setup/config.py → src/prep_disolv/common/config.py

@@ -2,21 +2,20 @@
 
 import toml
 
-from prep_pavenet.common.columns import (
+from prep_disolv.common.columns import (
     ACTIVATIONS_FOLDER,
-    LINKS_FOLDER,
     POSITIONS_FOLDER,
 )
 
 # Config keys.
 LOG_SETTINGS = "logging"
 TRAFFIC_SETTINGS = "traffic"
+DATA_STEP_SETTINGS = "data_steps"
 VEHICLE_SETTINGS = "vehicles"
 RSU_SETTINGS = "rsu"
 OUTPUT_SETTINGS = "output"
 CONTROLLER_SETTINGS = "controller"
 SIMULATION_SETTINGS = "simulation"
-LINK_SETTINGS = "links"
 
 # Common keys.
 ID_INIT = "id_init"
@@ -36,7 +35,6 @@
 # RSU keys.
 PLACEMENT = "placement"
 START_TIME = "start_time"
-END_TIME = "end_time"
 
 # Logging keys.
 LOG_LEVEL = "log_level"
@@ -45,7 +43,6 @@
 # Simulation keys.
 DURATION = "duration"
 STEP_SIZE = "step_size"
-STREAMING_TIME = "streaming_time"
 
 
 def read_config_toml(config_toml: str) -> dict:
@@ -83,7 +80,6 @@ def _create_output_folders(self) -> None:
 
         output_path.mkdir(parents=True, exist_ok=True)
         Path.mkdir(output_path / ACTIVATIONS_FOLDER, exist_ok=True)
-        Path.mkdir(output_path / LINKS_FOLDER, exist_ok=True)
         Path.mkdir(output_path / POSITIONS_FOLDER, exist_ok=True)
 
     def get(self, key: str) -> dict:

src/prep_pavenet/setup/logger.py → src/prep_disolv/common/logger.py

@@ -9,7 +9,7 @@
 LOG_LEVEL = "log_level"
 LOG_OVERWRITE = "log_overwrite"
 
-DEFAULT_LOG_FILE = "prep_pavenet.log"
+DEFAULT_LOG_FILE = "disolv_positions.log"
 DEFAULT_LOG_LEVEL = "INFO"
 DEFAULT_LOG_OVERWRITE = False
 

src/prep_pavenet/common/utils.py → src/prep_disolv/common/utils.py

@@ -5,32 +5,55 @@
 from pathlib import Path
 
 BOUNDARY = "convBoundary"
+OFFSETS = "netOffset"
 LOCATION = "location"
+PROJECTION = "projParameter"
 
 
 def get_offsets(sumo_net_file: Path) -> (float, float):
     """Get the offsets from the sumo net file."""
     sumo_iter = Et.iterparse(str(sumo_net_file), events=("start", "end"))
     for event, elem in sumo_iter:
         if event == "end" and elem.tag == LOCATION:
-            boundary = elem.attrib[BOUNDARY]
-            offset_x = float(boundary.split(",")[0])
-            offset_y = float(boundary.split(",")[1])
+            offsets = elem.attrib[OFFSETS]
+            offset_x = float(offsets.split(",")[0])
+            offset_y = float(offsets.split(",")[1])
             return offset_x, offset_y
     msg = "Could not find offsets in sumo net file."
     logging.error(msg)
     raise ValueError(msg)
 
 
+def get_projection(sumo_net_file: Path) -> (float, float):
+    """Get the offsets from the sumo net file."""
+    sumo_iter = Et.iterparse(str(sumo_net_file), events=("start", "end"))
+    for event, elem in sumo_iter:
+        if event == "end" and elem.tag == LOCATION:
+            return elem.attrib[PROJECTION]
+    msg = "Could not find projection parameter in sumo net file."
+    logging.error(msg)
+    raise ValueError(msg)
+
+
 def get_center(sumo_net_file: Path) -> (float, float):
     """Get the center of the sumo net file."""
+    offsets = get_offsets(sumo_net_file)
     sumo_iter = Et.iterparse(str(sumo_net_file), events=("start", "end"))
+
     for event, elem in sumo_iter:
         if event == "end" and elem.tag == LOCATION:
             boundary = elem.attrib[BOUNDARY]
+
             low_x = float(boundary.split(",")[0])
             low_y = float(boundary.split(",")[1])
             high_x = float(boundary.split(",")[2])
             high_y = float(boundary.split(",")[3])
-            return (low_x + high_x) / 2, (low_y + high_y) / 2
-    return None
+
+            center_x = (low_x + high_x) / 2
+            center_y = (low_y + high_y) / 2
+
+            return center_x - offsets[0], center_y - offsets[1]
+
+    msg = "Could not find network center in sumo net file."
+    logging.error(msg)
+    raise ValueError(msg)