Skip to content

1242 update simple surrogate model #1252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 29 commits into from
Jun 4, 2025
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
5c5f532
Added more parameters to the network architectures
mhheger Apr 9, 2025
f128c82
revised grid search
mhheger Apr 14, 2025
e0b698f
small changes to make the functions reusable for hyperparameter tuning
mhheger Apr 14, 2025
5218163
Usage of the grid_search.py functions
mhheger Apr 14, 2025
7380738
Small rearrangement of the functions
mhheger Apr 14, 2025
a533dab
fixed typos
mhheger Apr 14, 2025
3c09788
format hyperparameter tuning
mhheger Apr 16, 2025
d9de1e0
Apply formatting rules
mhheger Apr 16, 2025
f3f3fd1
Added possibility to pass a path
mhheger Apr 23, 2025
54bd131
fixed some typo
mhheger Apr 23, 2025
4c6e3e7
Added error handling for initialization
mhheger Apr 23, 2025
f6b0bc1
Added error handling
mhheger Apr 23, 2025
9fdc384
Adaption of tests to changes of functions
mhheger Apr 23, 2025
fc81155
[ci skip] patching train_and_evaluate_model
mhheger Apr 23, 2025
a408456
[ci skip] Change of name convention
mhheger Apr 30, 2025
58becae
[ci skip] Updated documentation
mhheger May 5, 2025
54abe68
[ci skip] Adapt to secir_simple
mhheger May 5, 2025
b130b45
[ci skip] correction of tensor shape
mhheger May 14, 2025
cfbda51
[ci skip] Update tests for SECIR Groups
mhheger May 14, 2025
6ba7daa
Apply suggestions from code review
mhheger May 26, 2025
8bb83ba
[ci skip] Updating docs, deleting imports, renaming variables
mhheger May 26, 2025
bab2c6a
[ci skip] Adjustments in the comments
mhheger May 28, 2025
7ae848b
[ci skip] Adding comments and doc strings
mhheger Jun 2, 2025
b8f3745
[ci skip] Deleting code fragments
mhheger Jun 2, 2025
35ccabd
flatten output
mhheger Jun 2, 2025
65a47d7
Small changes in groups tests
mhheger Jun 2, 2025
c065b56
replace "AdamW" by "Adam"
mhheger Jun 2, 2025
55d7ff8
delete fragment
mhheger Jun 2, 2025
a3ef9e2
Comments added
mhheger Jun 4, 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
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ def generate_data(
data['inputs'].append(data_run[:input_width])
data['labels'].append(data_run[input_width:])
data['contact_matrix'].append(np.array(damped_contact_matrix))
data['damping_day'].append(damping_day)
data['damping_day'].append([damping_day])
bar.next()
bar.finish()

Expand Down Expand Up @@ -271,13 +271,13 @@ def getBaselineMatrix():
""" loads the baselinematrix"""

baseline_contact_matrix0 = os.path.join(
"./data/contacts/baseline_home.txt")
"./data/Germany/contacts/baseline_home.txt")
baseline_contact_matrix1 = os.path.join(
"./data/contacts/baseline_school_pf_eig.txt")
"./data/Germany/contacts/baseline_school_pf_eig.txt")
baseline_contact_matrix2 = os.path.join(
"./data/contacts/baseline_work.txt")
"./data/Germany/contacts/baseline_work.txt")
baseline_contact_matrix3 = os.path.join(
"./data/contacts/baseline_other.txt")
"./data/Germany/contacts/baseline_other.txt")

baseline = np.loadtxt(baseline_contact_matrix0) \
+ np.loadtxt(baseline_contact_matrix1) + \
Expand Down Expand Up @@ -329,7 +329,7 @@ def get_population(path):
os.path.dirname(os.path.realpath(path)))), 'data')

path_population = os.path.abspath(
r"data//pydata//Germany//county_population.json")
r"data//Germany//pydata//county_current_population.json")

input_width = 5
label_width = 30
Expand Down
Loading