Skip to content

Commit

Permalink
Cleanup some more code
Browse files Browse the repository at this point in the history
  • Loading branch information
@aarmey
aarmey committed Mar 9, 2024
1 parent cbc5ba1 commit 2aa19a3
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 176 deletions.
156 changes: 22 additions & 134 deletions lineage/Lineage_collections.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,92 +71,20 @@ def load_condition(filename):
]
# -- LAPATINIB 50 uMolars

lapC501 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00601_C5_1_V4.xlsx"
)
]
lapC502 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00601_C5_2_1_V4.xlsx"
)
]
lapC503 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00601_C5_2_2_V4.xlsx"
)
]
lapC504 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00601_C5_3_1.xlsx"
)
]
lapC505 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00601_C5_3_2.xlsx"
)
]
lapC506 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00601_C5_3_3.xlsx"
)
]

lapC507 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00701_C5_1_V4.xlsx"
)
]
lapC508 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00701_C5_2_V4.xlsx"
)
]
lapC509 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00701_C5_3_V4.xlsx"
)
]
lapC510 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00701_C5_4_V4.xlsx"
)
]

lapC511 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00801_C5_1_V4.xlsx"
)
]
lapC512 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00801_C5_2_V4.xlsx"
)
]
lapC513 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00801_C5_3_1.xlsx"
)
]
lapC514 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00801_C5_3_2.xlsx"
)
]
lapC501 = load_condition("AU00601_C5_1_V4")
lapC502 = load_condition("AU00601_C5_2_1_V4")
lapC503 = load_condition("AU00601_C5_2_2_V4")
lapC504 = load_condition("AU00601_C5_3_1")
lapC505 = load_condition("AU00601_C5_3_2")
lapC506 = load_condition("AU00601_C5_3_3")
lapC507 = load_condition("AU00701_C5_1_V4")
lapC508 = load_condition("AU00701_C5_2_V4")
lapC509 = load_condition("AU00701_C5_3_V4")
lapC510 = load_condition("AU00701_C5_4_V4")
lapC511 = load_condition("AU00801_C5_1_V4")
lapC512 = load_condition("AU00801_C5_2_V4")
lapC513 = load_condition("AU00801_C5_3_1")
lapC514 = load_condition("AU00801_C5_3_2")

Lapt50uM = (
lapC501
Expand Down Expand Up @@ -197,54 +125,14 @@ def load_condition(filename):
]

# -- LAPATINIB 250 uMolars
lapD51 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00601_D5_1_V4.xlsx"
)
]
lapD54 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00601_D5_2_V4.xlsx"
)
]
lapD57 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00601_D5_3_V4.xlsx"
)
]
lapD52 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00701_D5_1_V4.xlsx"
)
]
lapD55 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00701_D5_2_V4.xlsx"
)
]
lapD53 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00801_D5_1_V4.xlsx"
)
]
lapD56 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00801_D5_2_V4.xlsx"
)
]
lapD58 = [
LineageTree(list_of_cells, E)
for list_of_cells in import_exp_data(
path=r"lineage/data/LineageData/AU00801_D5_3_V4.xlsx"
)
]
lapD51 = load_condition("AU00601_D5_1_V4")
lapD54 = load_condition("AU00601_D5_2_V4")
lapD57 = load_condition("AU00601_D5_3_V4")
lapD52 = load_condition("AU00701_D5_1_V4")
lapD55 = load_condition("AU00701_D5_2_V4")
lapD53 = load_condition("AU00801_D5_1_V4")
lapD56 = load_condition("AU00801_D5_2_V4")
lapD58 = load_condition("AU00801_D5_3_V4")

Lap250uM = lapD51 + lapD54 + lapD57 + lapD52 + lapD55 + lapD53 + lapD56 + lapD58
len_lp_250 = [
Expand Down
95 changes: 54 additions & 41 deletions poetry.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ numba = "^0.59.0"
[tool.poetry.dev-dependencies]
pytest = "^8.0"
pytest-cov = "^4.1"
mypy = "^1.8"
mypy = "^1.9"
pytest-xdist = "^2.5.0"
pytest-random = "^0.2"

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down

0 comments on commit 2aa19a3

Please sign in to comment.