Skip to content

Commit 2c25650

Browse files
committed
Refactor to src/
1 parent b9673c1 commit 2c25650

File tree

13 files changed

+26
-29
lines changed

13 files changed

+26
-29
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
preprocessor/__pycache__/
2-
exceptions/__pycache__/
1+
src/preprocessor/__pycache__/
2+
src/exceptions/__pycache__/

src/algorithms/anonymity_a2c_ray.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import ray.rllib.agents.a3c as a3c
77
from ray.tune.logger import pretty_print
88
from ray.rllib.env.env_context import EnvContext
9-
from spaces.environment import TimeStep, StepType
10-
from spaces.observation_space import ObsSpace
9+
from src.spaces.environment import TimeStep, StepType
10+
from src.spaces.observation_space import ObsSpace
1111

1212

1313
class DataSetEnv(gym.Env):

src/algorithms/trainer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Trainer
33
"""
44

5-
from utils import INFO
5+
from src.utils import INFO
66
from typing import TypeVar
77

88
Env = TypeVar("Env")

src/datasets/dataset_wrapper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import pandas as pd
55
import numpy as np
66

7-
from preprocessor.cleanup_utils import read_csv, replace, change_column_types
7+
from src.preprocessor.cleanup_utils import read_csv, replace, change_column_types
88

99
DS = TypeVar("DS")
1010
HierarchyBase = TypeVar('HierarchyBase')

src/datasets/datasets_loaders.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from pathlib import Path
2-
from datasets.dataset_wrapper import PandasDSWrapper
2+
from src.datasets.dataset_wrapper import PandasDSWrapper
33

44

55
class MockSubjectsLoader(PandasDSWrapper):
@@ -8,7 +8,7 @@ class MockSubjectsLoader(PandasDSWrapper):
88
"salary": int, "diagnosis": int, "preventative_treatment": str,
99
"mutation_status": int, }
1010

11-
FILENAME = Path("../data/mocksubjects.csv")
11+
FILENAME = Path("../../data/mocksubjects.csv")
1212

1313
FEATURES_DROP_NAMES = ["NHSno", "given_name", "surname", "dob"]
1414

src/spaces/action_space.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
from typing import List
21
from gym.spaces.discrete import Discrete
3-
from spaces.actions import ActionBase
2+
from src.spaces.actions import ActionBase
43

54

65
class ActionSpace(Discrete):

src/spaces/actions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import enum
33
from typing import List
44

5-
from utils.hierarchy_base import HierarchyBase
5+
from src.utils.hierarchy_base import HierarchyBase
66

77

88
class ActionType(enum.IntEnum):

src/spaces/environment.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@
33
https://github.com/deepmind/dm_env/blob/master/dm_env/_environment.py
44
"""
55

6-
import abc
76
import copy
87
import enum
98
import numpy as np
109
import pandas as pd
1110
import torch
12-
from typing import Any, NamedTuple, Generic, Optional, TypeVar
11+
from typing import NamedTuple, Generic, Optional, TypeVar
1312
import multiprocessing as mp
1413

15-
from exceptions.exceptions import Error
16-
from spaces.actions import ActionBase
17-
from utils.string_distance_calculator import DistanceType, TextDistanceCalculator
14+
from src.exceptions.exceptions import Error
15+
from src.spaces.actions import ActionBase
16+
from src.utils.string_distance_calculator import DistanceType, TextDistanceCalculator
1817

1918
DataSet = TypeVar("DataSet")
2019

src/tests/test_actions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import unittest
22

3-
from utils.default_hierarchy import DefaultHierarchy
4-
from spaces.actions import ActionGeneralize, ActionSuppress
3+
from src.utils.default_hierarchy import DefaultHierarchy
4+
from src.spaces import ActionSuppress
55

66

77
class TestActions(unittest.TestCase):

src/tests/test_default_hierarchy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import unittest
2-
from utils.default_hierarchy import DefaultHierarchy
2+
from src.utils.default_hierarchy import DefaultHierarchy
33

44

55
class TestDefaultHierarchy(unittest.TestCase):

0 commit comments

Comments
 (0)