Skip to content

Commit 2aa19a3

Browse files
aarmeyaarmey
committed
Cleanup some more code
1 parent cbc5ba1 commit 2aa19a3

3 files changed

Lines changed: 78 additions & 176 deletions

File tree

‎lineage/Lineage_collections.py‎

Lines changed: 22 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -71,92 +71,20 @@ def load_condition(filename):
7171
]
7272
# -- LAPATINIB 50 uMolars
7373

74-
lapC501 = [
75-
LineageTree(list_of_cells, E)
76-
for list_of_cells in import_exp_data(
77-
path=r"lineage/data/LineageData/AU00601_C5_1_V4.xlsx"
78-
)
79-
]
80-
lapC502 = [
81-
LineageTree(list_of_cells, E)
82-
for list_of_cells in import_exp_data(
83-
path=r"lineage/data/LineageData/AU00601_C5_2_1_V4.xlsx"
84-
)
85-
]
86-
lapC503 = [
87-
LineageTree(list_of_cells, E)
88-
for list_of_cells in import_exp_data(
89-
path=r"lineage/data/LineageData/AU00601_C5_2_2_V4.xlsx"
90-
)
91-
]
92-
lapC504 = [
93-
LineageTree(list_of_cells, E)
94-
for list_of_cells in import_exp_data(
95-
path=r"lineage/data/LineageData/AU00601_C5_3_1.xlsx"
96-
)
97-
]
98-
lapC505 = [
99-
LineageTree(list_of_cells, E)
100-
for list_of_cells in import_exp_data(
101-
path=r"lineage/data/LineageData/AU00601_C5_3_2.xlsx"
102-
)
103-
]
104-
lapC506 = [
105-
LineageTree(list_of_cells, E)
106-
for list_of_cells in import_exp_data(
107-
path=r"lineage/data/LineageData/AU00601_C5_3_3.xlsx"
108-
)
109-
]
110-
111-
lapC507 = [
112-
LineageTree(list_of_cells, E)
113-
for list_of_cells in import_exp_data(
114-
path=r"lineage/data/LineageData/AU00701_C5_1_V4.xlsx"
115-
)
116-
]
117-
lapC508 = [
118-
LineageTree(list_of_cells, E)
119-
for list_of_cells in import_exp_data(
120-
path=r"lineage/data/LineageData/AU00701_C5_2_V4.xlsx"
121-
)
122-
]
123-
lapC509 = [
124-
LineageTree(list_of_cells, E)
125-
for list_of_cells in import_exp_data(
126-
path=r"lineage/data/LineageData/AU00701_C5_3_V4.xlsx"
127-
)
128-
]
129-
lapC510 = [
130-
LineageTree(list_of_cells, E)
131-
for list_of_cells in import_exp_data(
132-
path=r"lineage/data/LineageData/AU00701_C5_4_V4.xlsx"
133-
)
134-
]
135-
136-
lapC511 = [
137-
LineageTree(list_of_cells, E)
138-
for list_of_cells in import_exp_data(
139-
path=r"lineage/data/LineageData/AU00801_C5_1_V4.xlsx"
140-
)
141-
]
142-
lapC512 = [
143-
LineageTree(list_of_cells, E)
144-
for list_of_cells in import_exp_data(
145-
path=r"lineage/data/LineageData/AU00801_C5_2_V4.xlsx"
146-
)
147-
]
148-
lapC513 = [
149-
LineageTree(list_of_cells, E)
150-
for list_of_cells in import_exp_data(
151-
path=r"lineage/data/LineageData/AU00801_C5_3_1.xlsx"
152-
)
153-
]
154-
lapC514 = [
155-
LineageTree(list_of_cells, E)
156-
for list_of_cells in import_exp_data(
157-
path=r"lineage/data/LineageData/AU00801_C5_3_2.xlsx"
158-
)
159-
]
74+
lapC501 = load_condition("AU00601_C5_1_V4")
75+
lapC502 = load_condition("AU00601_C5_2_1_V4")
76+
lapC503 = load_condition("AU00601_C5_2_2_V4")
77+
lapC504 = load_condition("AU00601_C5_3_1")
78+
lapC505 = load_condition("AU00601_C5_3_2")
79+
lapC506 = load_condition("AU00601_C5_3_3")
80+
lapC507 = load_condition("AU00701_C5_1_V4")
81+
lapC508 = load_condition("AU00701_C5_2_V4")
82+
lapC509 = load_condition("AU00701_C5_3_V4")
83+
lapC510 = load_condition("AU00701_C5_4_V4")
84+
lapC511 = load_condition("AU00801_C5_1_V4")
85+
lapC512 = load_condition("AU00801_C5_2_V4")
86+
lapC513 = load_condition("AU00801_C5_3_1")
87+
lapC514 = load_condition("AU00801_C5_3_2")
16088

16189
Lapt50uM = (
16290
lapC501
@@ -197,54 +125,14 @@ def load_condition(filename):
197125
]
198126

199127
# -- LAPATINIB 250 uMolars
200-
lapD51 = [
201-
LineageTree(list_of_cells, E)
202-
for list_of_cells in import_exp_data(
203-
path=r"lineage/data/LineageData/AU00601_D5_1_V4.xlsx"
204-
)
205-
]
206-
lapD54 = [
207-
LineageTree(list_of_cells, E)
208-
for list_of_cells in import_exp_data(
209-
path=r"lineage/data/LineageData/AU00601_D5_2_V4.xlsx"
210-
)
211-
]
212-
lapD57 = [
213-
LineageTree(list_of_cells, E)
214-
for list_of_cells in import_exp_data(
215-
path=r"lineage/data/LineageData/AU00601_D5_3_V4.xlsx"
216-
)
217-
]
218-
lapD52 = [
219-
LineageTree(list_of_cells, E)
220-
for list_of_cells in import_exp_data(
221-
path=r"lineage/data/LineageData/AU00701_D5_1_V4.xlsx"
222-
)
223-
]
224-
lapD55 = [
225-
LineageTree(list_of_cells, E)
226-
for list_of_cells in import_exp_data(
227-
path=r"lineage/data/LineageData/AU00701_D5_2_V4.xlsx"
228-
)
229-
]
230-
lapD53 = [
231-
LineageTree(list_of_cells, E)
232-
for list_of_cells in import_exp_data(
233-
path=r"lineage/data/LineageData/AU00801_D5_1_V4.xlsx"
234-
)
235-
]
236-
lapD56 = [
237-
LineageTree(list_of_cells, E)
238-
for list_of_cells in import_exp_data(
239-
path=r"lineage/data/LineageData/AU00801_D5_2_V4.xlsx"
240-
)
241-
]
242-
lapD58 = [
243-
LineageTree(list_of_cells, E)
244-
for list_of_cells in import_exp_data(
245-
path=r"lineage/data/LineageData/AU00801_D5_3_V4.xlsx"
246-
)
247-
]
128+
lapD51 = load_condition("AU00601_D5_1_V4")
129+
lapD54 = load_condition("AU00601_D5_2_V4")
130+
lapD57 = load_condition("AU00601_D5_3_V4")
131+
lapD52 = load_condition("AU00701_D5_1_V4")
132+
lapD55 = load_condition("AU00701_D5_2_V4")
133+
lapD53 = load_condition("AU00801_D5_1_V4")
134+
lapD56 = load_condition("AU00801_D5_2_V4")
135+
lapD58 = load_condition("AU00801_D5_3_V4")
248136

249137
Lap250uM = lapD51 + lapD54 + lapD57 + lapD52 + lapD55 + lapD53 + lapD56 + lapD58
250138
len_lp_250 = [

‎poetry.lock‎

Lines changed: 54 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ numba = "^0.59.0"
2424
[tool.poetry.dev-dependencies]
2525
pytest = "^8.0"
2626
pytest-cov = "^4.1"
27-
mypy = "^1.8"
27+
mypy = "^1.9"
2828
pytest-xdist = "^2.5.0"
29+
pytest-random = "^0.2"
2930

3031
[build-system]
3132
requires = ["poetry-core>=1.0.0"]

0 commit comments

Comments
 (0)