Skip to content

Commit

Permalink
renaming to bff
Browse files Browse the repository at this point in the history
  • Loading branch information
fverdoja committed Apr 4, 2024
1 parent a2c5e37 commit d38fa5d
Show file tree
Hide file tree
Showing 18 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[![python](https://img.shields.io/badge/python-3.9.1-3776AB.svg?style=for-the-badge&logo=python&logoColor=white)](https://www.python.org/downloads/)
[![pytorch](https://img.shields.io/badge/pytorch-1.9.1-EE4C2C.svg?style=for-the-badge&logo=pytorch&logoColor=white)](https://pytorch.org/get-started/previous-versions/)
[![cuda](https://img.shields.io/badge/cuda-11.8-76B900.svg?style=for-the-badge&logo=nvidia&logoColor=white)](https://developer.nvidia.com/cuda-11-8-0-download-archive)
[![License](https://img.shields.io/github/license/aalto-intelligent-robotics/directionalflow?style=for-the-badge&logo=googledocs&logoColor=white)](./LICENSE)
[![License](https://img.shields.io/github/license/aalto-intelligent-robotics/bayesianfloorfield?style=for-the-badge&logo=googledocs&logoColor=white)](./LICENSE)

**Authors:** [Francesco
Verdoja](https://research.aalto.fi/en/persons/francesco-verdoja) (<francesco.verdoja@aalto.fi>), [Tomasz Piotr
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion directionalflow/data.py → bff/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from PIL import Image
from torch.utils.data import Dataset

from directionalflow.utils import Direction, RowColumnPair, Window
from bff.utils import Direction, RowColumnPair, Window
from mod.grid import Grid
from mod.models import DiscreteDirectional
from mod.occupancy import OccupancyMap
Expand Down
4 changes: 2 additions & 2 deletions directionalflow/evaluation.py → bff/evaluation.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
from tqdm import tqdm

import mod.models as mod
from directionalflow.nets import DiscreteDirectional
from directionalflow.utils import Direction, OccupancyMap, Window
from bff.nets import DiscreteDirectional
from bff.utils import Direction, OccupancyMap, Window
from mod.grid import (
Grid,
PositiveFloat,
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion directionalflow/utils.py → bff/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from torchvision.transforms.functional import resize
from tqdm import tqdm, trange

from directionalflow.nets import PeopleFlow
from bff.nets import PeopleFlow
from mod.occupancy import OccupancyMap
from mod.utils import Direction

Expand Down
2 changes: 1 addition & 1 deletion compute_curves_atc.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import matplotlib.pyplot as plt
import numpy as np

from directionalflow.evaluation import (
from bff.evaluation import (
append_cell_indeces_to_track,
evaluate_likelihood_iterations,
extract_tracks_from_grid,
Expand Down
2 changes: 1 addition & 1 deletion compute_curves_kth.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import matplotlib.pyplot as plt
import numpy as np

from directionalflow.evaluation import (
from bff.evaluation import (
append_cell_indeces_to_track,
evaluate_likelihood_iterations,
extract_tracks_from_grid,
Expand Down
4 changes: 2 additions & 2 deletions map_occupancy_prior_atc.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import numpy as np
import torch

from directionalflow.nets import DiscreteDirectional
from directionalflow.utils import estimate_dynamics, plot_dir
from bff.nets import DiscreteDirectional
from bff.utils import estimate_dynamics, plot_dir
from mod.occupancy import OccupancyMap
from mod.utils import Direction

Expand Down
4 changes: 2 additions & 2 deletions map_occupancy_prior_kth.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import numpy as np
import torch

from directionalflow.nets import DiscreteDirectional
from directionalflow.utils import estimate_dynamics, plot_dir
from bff.nets import DiscreteDirectional
from bff.utils import estimate_dynamics, plot_dir
from mod.occupancy import OccupancyMap
from mod.utils import Direction

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ ignore_missing_imports = true
#### PyTest ####
[tool.pytest.ini_options]
testpaths = "tests"
addopts = "--cov=directionalflow --cov=mod --cov-report term-missing:skip-covered"
addopts = "--cov=bff --cov=mod --cov-report term-missing:skip-covered"
File renamed without changes.
6 changes: 3 additions & 3 deletions tests/directionalflow/conftest.py → tests/bff/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
from torch.utils.data import DataLoader

import mod.models as mod
from directionalflow.data import DiscreteDirectionalDataset
from directionalflow.nets import DiscreteDirectional
from directionalflow.utils import Trainer
from bff.data import DiscreteDirectionalDataset
from bff.nets import DiscreteDirectional
from bff.utils import Trainer
from mod.grid import Grid
from mod.occupancy import OccupancyMap
from mod.utils import RCCoords, XYCoords
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import pytest
import torchvision.transforms as transforms

from directionalflow.data import (
from bff.data import (
DiscreteDirectionalDataset,
RandomHorizontalFlipPeopleFlow,
RandomRotationPeopleFlow,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import numpy as np
import pytest

from directionalflow.evaluation import (
from bff.evaluation import (
append_cell_indeces_to_track,
evaluate_likelihood,
evaluate_likelihood_iterations,
Expand All @@ -12,7 +12,7 @@
track_likelihood_net,
track_likelihood_net_2,
)
from directionalflow.nets import DiscreteDirectional
from bff.nets import DiscreteDirectional
from mod.grid import Grid
from mod.occupancy import OccupancyMap
from mod.utils import RCCoords
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import torch

import mod.models as mod
from directionalflow.nets import DiscreteDirectional
from bff.nets import DiscreteDirectional


def test_discretedirectional_model() -> None:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import pytest
from torch import device, float32

from directionalflow.nets import DiscreteDirectional
from directionalflow.utils import (
from bff.nets import DiscreteDirectional
from bff.utils import (
Trainer,
Window,
estimate_dynamics,
Expand Down
6 changes: 3 additions & 3 deletions training_atc.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
from torch.utils.data import DataLoader
from torch.utils.tensorboard.writer import SummaryWriter

from directionalflow.data import (
from bff.data import (
DiscreteDirectionalDataset,
RandomHorizontalFlipPeopleFlow,
RandomRotationPeopleFlow,
RandomVerticalFlipPeopleFlow,
)
from directionalflow.nets import DiscreteDirectional
from directionalflow.utils import Trainer
from bff.nets import DiscreteDirectional
from bff.utils import Trainer
from mod import grid, models
from mod.occupancy import OccupancyMap
from mod.visualisation import show_all
Expand Down

0 comments on commit d38fa5d

Please sign in to comment.