Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
bdb87a1
update metalloproteome
timzjing Nov 15, 2024
0466b26
Small changes to plots.
cyrus-bio Dec 11, 2024
f5ce09f
Merge branch 'cofactors' of https://github.com/CovertLab/vivarium-eco…
cyrus-bio Dec 11, 2024
4f6e770
Merge branch 'master' of https://github.com/CovertLab/vivarium-ecoli …
cyrus-bio Dec 16, 2024
356de0f
Small changes to plots...
cyrus-bio Dec 19, 2024
594c29f
Small changes.
cyrus-bio Dec 20, 2024
2d65dfe
Adding new ck test.
cyrus-bio Jan 6, 2025
9011cd3
Fixed scatterplot for comparison of metalloproteome. Added fixed counts.
cyrus-bio Jan 7, 2025
9640d87
Made ck more modular, now runs estimation with a single function.
cyrus-bio Jan 10, 2025
54fee4f
Getting closer to using two data sets for kinetic model creation.
cyrus-bio Jan 11, 2025
5fc9da3
Working version of revamp.
cyrus-bio Jan 15, 2025
c407740
Merge branch 'master' of https://github.com/CovertLab/vivarium-ecoli …
cyrus-bio Jan 17, 2025
839b3da
Added simdate to make tests function.
cyrus-bio Jan 17, 2025
3b14c9c
Adding second simdata.
cyrus-bio Jan 21, 2025
f5ad120
Adding parca json
cyrus-bio Jan 21, 2025
690a5e6
Added growth data files
cyrus-bio Jan 21, 2025
84e6035
Small changes.
cyrus-bio Jan 21, 2025
622d65e
Final preparation for example simulation plot.
cyrus-bio Jan 22, 2025
fe0ad00
recent update
timzjing Jan 27, 2025
b2c6e04
Merge branch 'master' of https://github.com/CovertLab/vivarium-ecoli …
cyrus-bio Jan 27, 2025
3c40d16
Added some more bad rxns.
cyrus-bio Jan 29, 2025
2106d78
Merge branch 'cofactors' of https://github.com/CovertLab/vivarium-eco…
cyrus-bio Jan 29, 2025
4789862
More plots
cyrus-bio Feb 6, 2025
04b34eb
Beginning model testing.
cyrus-bio Feb 27, 2025
06bb854
A few new plots
cyrus-bio Mar 4, 2025
235f8a0
Almost done setting up aa synthesis.
cyrus-bio Mar 7, 2025
bb4d35c
Fixed wrong gene names in Li data.
cyrus-bio Apr 3, 2025
79301d9
Almost there ...
cyrus-bio Apr 9, 2025
f4c804e
Need to figure out why simple new model isnt being generated.
cyrus-bio Apr 11, 2025
7761b8c
Okay, fit to both conditions. That's pretty good I guess?
cyrus-bio Apr 16, 2025
4151ecb
New notebook for supplement figures.
cyrus-bio Apr 18, 2025
8800bed
Added supplemental files
cyrus-bio Apr 18, 2025
48279cb
Added new filtered table
radler3 Apr 18, 2025
7fff404
Made some changes to plots.
cyrus-bio Apr 21, 2025
f14e6ec
Merge remote-tracking branch 'origin/cofactors' into cofactors
cyrus-bio Apr 21, 2025
1f31af2
New histograms showing the Cd/Zn and Ni/Zn ratios
radler3 Apr 21, 2025
c727a32
Merge remote-tracking branch 'origin/cofactors' into cofactors
radler3 Apr 21, 2025
7a40fbb
New histograms showing the Cd/Zn and Ni/Zn ratios and MetE ratio
radler3 Apr 21, 2025
32386c2
New histograms showing the Cd/Zn and Ni/Zn ratios and MetE ratio part2
radler3 Apr 23, 2025
83d3fdf
Fixed a lot of issues with metalloproteome estimation.
cyrus-bio Apr 24, 2025
4a0d19c
Merge branch 'cofactors' of https://github.com/CovertLab/vivarium-eco…
cyrus-bio Apr 24, 2025
abbf8c2
Updated metalloproteome plots
cyrus-bio Apr 30, 2025
d214d17
Plots yummmm
cyrus-bio May 5, 2025
e5c9781
Added fig 4 plots.
cyrus-bio May 7, 2025
d7d5a4a
New histograms showing the Cd/Zn and Ni/Zn ratios and MetE ratio part2
radler3 May 9, 2025
e54a2c6
Merge remote-tracking branch 'origin/cofactors' into cofactors
radler3 May 9, 2025
3e0c4b1
Added new exchanges that are not yet synthesizable, progressing towar…
cyrus-bio May 10, 2025
a11c320
Merge branch 'cofactors' of https://github.com/CovertLab/vivarium-eco…
cyrus-bio May 10, 2025
21f448f
Small plot adjustments.
cyrus-bio May 13, 2025
c623e3f
New histograms showing the Cd/Zn and Ni/Zn ratios and MetE ratio part2
radler3 May 14, 2025
b19d548
Small plot adjustments.
cyrus-bio May 15, 2025
3757b78
Small plot fixes.
cyrus-bio May 19, 2025
a230bd7
Merge remote-tracking branch 'origin/cofactors' into cofactors
radler3 May 19, 2025
c676905
new plots
radler3 May 19, 2025
236869b
Weird update
cyrus-bio May 20, 2025
bf7c8de
Merge branch 'cofactors' of https://github.com/CovertLab/vivarium-eco…
cyrus-bio May 20, 2025
7e74f22
new plots!
radler3 May 22, 2025
e43a853
more plots
cyrus-bio May 22, 2025
3db52bd
new plots!!!
radler3 May 27, 2025
ba1d4ef
Small changes.
cyrus-bio May 30, 2025
72257b6
Initial version of multigen plot.
cyrus-bio Jun 3, 2025
b5b5f5d
First iteration of multigen plot for paper.
cyrus-bio Jun 4, 2025
036902b
new plots for mismetallation
radler3 Jun 5, 2025
cf7998e
Merge remote-tracking branch 'origin/cofactors' into cofactors
radler3 Jun 5, 2025
f7f5ad5
Plot updates.
cyrus-bio Jun 13, 2025
0e8c42e
Trying to reimplement solving
cyrus-bio Jun 18, 2025
1fc9655
Merge remote-tracking branch 'origin/cofactors' into cofactors
radler3 Jun 19, 2025
79d2a48
Small changes.
cyrus-bio Jun 18, 2025
8ee6ff7
Merge branch 'cofactors' of https://github.com/CovertLab/vivarium-eco…
cyrus-bio Jun 20, 2025
8672ed3
Small changes.
cyrus-bio Jun 25, 2025
734d5c8
Small plot updates.
cyrus-bio Jul 8, 2025
b428e49
Small plot updates.
cyrus-bio Jul 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion data/vivecoli_t2527.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"sim_data_path": null
}
69 changes: 59 additions & 10 deletions ecoli/experiments/metabolism_redux_sim.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,19 @@ def run_ecoli_with_metabolism_redux(
# disables growth rate control
def run_ecoli_with_metabolism_redux_classic(
filename="metabolism_redux_classic",
total_time=10,
total_time=5000,
divide=True,
# initial_state_file='wcecoli_t0', # 'met_division_test_state',
progress_bar=True,
log_updates=False,
emitter="timeseries", # 'timeseries',
name="convex_kinetics_minimal",
name="cofactors",
raw_output=False,
emit_unique=True,
save=True,
save_times=[1, 10],
condition="basal", # basal, with_aa
fixed_media="minimal", # minimal, minimal_plus_amino_acids
condition="with_aa", # basal, with_aa
fixed_media="minimal_plus_amino_acids", # minimal, minimal_plus_amino_acids
):
# filename = 'default'
sim = EcoliSim.from_file(CONFIG_DIR_PATH + filename + ".json")
Expand All @@ -77,6 +78,7 @@ def run_ecoli_with_metabolism_redux_classic(
sim.emitter = emitter
# sim.initial_state = get_state_from_file(path=f'data/{initial_state_file}.json')
sim.raw_output = raw_output
sim.emit_unique = emit_unique
sim.save = save
sim.save_times = save_times

Expand Down Expand Up @@ -104,13 +106,13 @@ def run_ecoli_with_metabolism_redux_classic(
sim.run()

query = []
folder = f"out/cofactors/{name}_{total_time}_{datetime.date.today()}/"
folder = f"out/cofactors/colony/"
save_sim_output(folder, query, sim, save_model=True)


def run_colony(
filename="metabolism_redux_classic",
total_time=1400,
total_time=2700,
divide=True,
# initial_state_file='wcecoli_t0', # 'met_division_test_state',
progress_bar=True,
Expand All @@ -120,8 +122,8 @@ def run_colony(
raw_output=False,
save=True,
save_times=[1, 200, 400, 1300],
condition="with_aa", # basal, with_aa
fixed_media="minimal_plus_amino_acids", # minimal, minimal_plus_amino_acids
condition="basal", # basal, with_aa
fixed_media="minimal", # minimal, minimal_plus_amino_acids
):
# filename = 'default'
sim = EcoliSim.from_file(CONFIG_DIR_PATH + filename + ".json")
Expand All @@ -138,17 +140,61 @@ def run_colony(
sim.condition = condition
sim.fixed_media = fixed_media

for seed in [i for i in range(4, 9, 1)]:
for seed in [i for i in range(11, 20, 1)]:
sim.seed = seed

sim.build_ecoli()

sim.run()

query = []
folder = f"out/cofactors/rich-{seed}/"
folder = f"out/cofactors/minimal-{seed}/"
save_sim_output(folder, query, sim, save_model=False)

def run_lineage(
filename="metabolism_redux_classic",
total_time=2900,
divide=True,
initial_state_file='lineage_min_2', # 'wcecoli_t0', # 'met_division_test_state',
progress_bar=True,
log_updates=False,
emitter="timeseries", # 'timeseries',
name="metabolism-redux-classic-rich",
raw_output=False,
save=True,
save_times=[1, 2500, 2600, 2700, 2800, 2900],
condition="basal", # basal, with_aa
fixed_media="minimal", # minimal, minimal_plus_amino_acids
):
# filename = 'default'
sim = EcoliSim.from_file(CONFIG_DIR_PATH + filename + ".json")
sim.total_time = total_time
sim.divide = divide
sim.progress_bar = progress_bar
sim.log_updates = log_updates
sim.emitter = emitter
sim.initial_state = get_state_from_file(path=f'data/{initial_state_file}.json')
sim.raw_output = raw_output
sim.save = save
sim.save_times = save_times

sim.condition = condition
sim.fixed_media = fixed_media

sim.seed = 1

# this means that sims will not create conflicting random indices when loading from saved state
if initial_state_file != 'wcecoli_t0':
sim.seed += int(sim.initial_state['global_time'])

sim.build_ecoli()

sim.run()

query = []
folder = f"out/cofactors/lineage-min-{initial_state_file}/"
save_sim_output(folder, query, sim, save_model=False)


@pytest.mark.slow
def test_ecoli_with_metabolism_redux(
Expand Down Expand Up @@ -293,6 +339,7 @@ def run_ecoli_with_default_metabolism(
"2": run_ecoli_with_metabolism_redux,
"2a": run_ecoli_with_metabolism_redux_classic,
"2b": run_colony,
"2c": run_lineage,
"3": test_ecoli_with_metabolism_redux,
"3a": test_ecoli_with_metabolism_classic,
"4": test_ecoli_with_metabolism_redux_div,
Expand All @@ -309,6 +356,8 @@ def save_sim_output(folder, query, sim, save_model=False):
("agents", agent, "listeners", "fba_results"),
("agents", agent, "listeners", "mass"),
("agents", agent, "listeners", "unique_molecule_counts"),
("agents", agent, "listeners", "rna_synth_prob"),
("agents", agent, "listeners", "rna_counts"),
("agents", agent, "bulk"),
]
)
Expand Down
6 changes: 6 additions & 0 deletions ecoli/processes/metabolism_redux_classic.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@
"RXN-22461",
"RXN-22462",
"RXN-22463",
"PYRROLINECARBDEHYDROG-RXN",
"RXN0-7008-PRO/UBIQUINONE-8//L-DELTA1-PYRROLINE_5-CARBOXYLATE/CPD-9956/PROTON.67.",
"GLUCOKIN-RXN-GLC/ATP//ALPHA-GLC-6-P/ADP/PROTON.34.", # gets confused with PTS
"PRPPSYN-RXN-CPD-15318/ATP//PRPP/AMP/PROTON.31.", # duplicate
"TRANS-RXN0-574-GLC//GLC.9.", # duplicate
"GLUCOKIN-RXN-GLC/ATP//D-glucopyranose-6-phosphate/ADP/PROTON.48.", # duplicate
]

# not key central carbon met
Expand Down
Loading