Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Feature #247

Merged
merged 65 commits into from
Nov 30, 2023
Merged

Feature #247

merged 65 commits into from
Nov 30, 2023

Commits on Nov 15, 2023

  1. Initial commit

    @mghosh00
    mghosh00 committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    7d8657a View commit details
    Browse the repository at this point in the history

  2. Added household id

    @mghosh00
    mghosh00 committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    3eea911 View commit details
    Browse the repository at this point in the history

  3. Added set_id

    @abbie-evans
    abbie-evans committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    34db412 View commit details
    Browse the repository at this point in the history

  4. Added ID for person and households

    @abbie-evans
    abbie-evans committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    3f25185 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Added some tests and a regex check

    @mghosh00
    mghosh00 committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    12e0e9b View commit details
    Browse the repository at this point in the history

  2. Merge conflict

    @abbie-evans
    abbie-evans committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    ffdb83f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature-id' of github.com:SABS-R3-Epidemiology/epiabm i… 

    …nto feature-id
    @abbie-evans
    abbie-evans committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    a6039b0 View commit details
    Browse the repository at this point in the history

  4. Resolved circular import errors

    @KCGallagher
    KCGallagher committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    830988c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature-id' of github.com:SABS-R3-Epidemiology/epiabm i… 

    …nto feature-id
    @abbie-evans
    abbie-evans committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    55e5337 View commit details
    Browse the repository at this point in the history

  6. Ensure unique cell ids for toy pop

    @KCGallagher
    KCGallagher committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    7322f07 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature-id' of github.com:SABS-R3-Epidemiology/epiabm i… 

    …nto feature-id
    @abbie-evans
    abbie-evans committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    71d6d68 View commit details
    Browse the repository at this point in the history

  8. Removed print statement

    @abbie-evans
    abbie-evans committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    da3669e View commit details
    Browse the repository at this point in the history

  9. Updated ID definition

    @abbie-evans
    abbie-evans committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    bed0a99 View commit details
    Browse the repository at this point in the history

  10. Updated test for ID

    @abbie-evans
    abbie-evans committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    4be6a4e View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. Updated household id

    @abbie-evans
    abbie-evans committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    38b302c View commit details
    Browse the repository at this point in the history

  2. Updated set_id test

    @abbie-evans
    abbie-evans committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    8226f46 View commit details
    Browse the repository at this point in the history

  3. Updated regex

    @mghosh00
    mghosh00 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    2f4f2db View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature-id' of github.com:SABS-R3-Epidemiology/epiabm i… 

    …nto feature-id
    @mghosh00
    mghosh00 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    c9ce368 View commit details
    Browse the repository at this point in the history

  5. self.id added

    @abbie-evans
    abbie-evans committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    5f9782f View commit details
    Browse the repository at this point in the history

  6. Updated set_id test

    @abbie-evans
    abbie-evans committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    f4406b2 View commit details
    Browse the repository at this point in the history

  7. Update add_household

    @abbie-evans
    abbie-evans committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    0a98755 View commit details
    Browse the repository at this point in the history

  8. Updated add_household test

    @abbie-evans
    abbie-evans committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    a572114 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2023

  1. Merge branch 'feature-id' of github.com:SABS-R3-Epidemiology/epiabm i… 

    …nto feature-id
    @mghosh00
    mghosh00 committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    537bf21 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2023

  1. Changed cell id to a string to match the other types, and fixed error… 

    …s involving ids
    @mghosh00
    mghosh00 committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    6d90677 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Fixed line lengths

    @mghosh00
    mghosh00 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    839a713 View commit details
    Browse the repository at this point in the history

  2. Import arrangement 

    Co-authored-by: Kit Gallagher <[email protected]>
    @abbie-evans @KCGallagher
    abbie-evans and KCGallagher authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    666afea View commit details
    Browse the repository at this point in the history

  3. Updated set_id tests

    @abbie-evans
    abbie-evans committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    c718a9f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature-id' of github.com:SABS-R3-Epidemiology/epiabm i… 

    …nto feature-id
    @abbie-evans
    abbie-evans committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    8c0d697 View commit details
    Browse the repository at this point in the history

  5. Added checks for duplicates

    @mghosh00
    mghosh00 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    3df1187 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/feature-id' into feature-id

    @mghosh00
    mghosh00 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    3807cc6 View commit details
    Browse the repository at this point in the history

  7. Style changes

    @mghosh00
    mghosh00 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    9e2bef6 View commit details
    Browse the repository at this point in the history

  8. Fixed error and changed make_pop

    @mghosh00
    mghosh00 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    e46a784 View commit details
    Browse the repository at this point in the history

  9. Added tests for uniqueness of id

    @abbie-evans
    abbie-evans committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    a983def View commit details
    Browse the repository at this point in the history

  10. Fixes of duplicate ids

    @mghosh00
    mghosh00 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    182cdb6 View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'origin/feature-id' into feature-id

    @mghosh00
    mghosh00 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    2b2263d View commit details
    Browse the repository at this point in the history

  12. Fixes of duplicate ids

    @mghosh00
    mghosh00 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    18a666d View commit details
    Browse the repository at this point in the history

  13. Checked that the actual dataframe in test_file_population_config matc… 

    …hes the expected
    @mghosh00
    mghosh00 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    6a8ddd6 View commit details
    Browse the repository at this point in the history

  14. Pandas version check

    @mghosh00
    mghosh00 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    ecea0bd View commit details
    Browse the repository at this point in the history

  15. Fixed error

    @mghosh00
    mghosh00 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    e21a57d View commit details
    Browse the repository at this point in the history

  16. Added duplicates test for cells

    @mghosh00
    mghosh00 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    b8bde2c View commit details
    Browse the repository at this point in the history

  17. Added duplicates test for cells

    @mghosh00
    mghosh00 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    8027168 View commit details
    Browse the repository at this point in the history

  18. Update set_id test for duplicates

    @abbie-evans
    abbie-evans committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    705d114 View commit details
    Browse the repository at this point in the history

  19. Added argument cells for use of cells set_id

    @abbie-evans
    abbie-evans committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    1cbc7bb View commit details
    Browse the repository at this point in the history

  20. Attempt fix of indent error

    @abbie-evans
    abbie-evans committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    c7532d5 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

  1. Style fixes

    @abbie-evans
    abbie-evans committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    ec76924 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feature-id

    @abbie-evans
    abbie-evans authored Nov 23, 2023
    Configuration menu
    Copy the full SHA
    98eda4f View commit details
    Browse the repository at this point in the history

  3. Changed csv read so that cell and microcell ids are read as integers,… 

    … not floats
    @mghosh00
    mghosh00 committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    48a98d2 View commit details
    Browse the repository at this point in the history

  4. Fixed some errors

    @mghosh00
    mghosh00 committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    7d8b8b0 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. Updated error message

    @abbie-evans
    abbie-evans committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    e3eb42c View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Removed parameter chaining in the mock_read

    @mghosh00
    mghosh00 committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    da8895a View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. Modified add_household so that person id is only set if person does n… 

    …ot already have household
    @mghosh00
    mghosh00 committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    89806cb View commit details
    Browse the repository at this point in the history

  2. Added change_id parameter to the add_household function so that we ca… 

    …n control when the id of a person is changed
    @mghosh00
    mghosh00 committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    8345e24 View commit details
    Browse the repository at this point in the history

  3. Error fix

    @mghosh00
    mghosh00 committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    f2074a7 View commit details
    Browse the repository at this point in the history

  4. Style fixes

    @abbie-evans
    abbie-evans committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    d326166 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. Updated add_household to have a default value

    @mghosh00
    mghosh00 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    14cc1d2 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/feature-id' into feature-id 

    # Conflicts:
#	pyEpiabm/pyEpiabm/core/microcell.py
    @mghosh00
    mghosh00 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    a4f85ed View commit details
    Browse the repository at this point in the history

  3. Made changes travel_sweep to ensure that the ids of travellers are set

    @mghosh00
    mghosh00 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    63aad23 View commit details
    Browse the repository at this point in the history

  4. Update for loop in add_household 

    Co-authored-by: Kit Gallagher <[email protected]>
    @abbie-evans @KCGallagher
    abbie-evans and KCGallagher authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    15978f3 View commit details
    Browse the repository at this point in the history

  5. Changed add_household to have an override_person_id boolean attribute… 

    … to determine whether we want the id overridden or not
    @mghosh00
    mghosh00 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    ea0a512 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/feature-id' into feature-id

    @mghosh00
    mghosh00 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    18c76fb View commit details
    Browse the repository at this point in the history

  7. Added further logging

    @mghosh00
    mghosh00 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    3c2f5ce View commit details
    Browse the repository at this point in the history

  8. Update pyEpiabm/pyEpiabm/intervention/travel_isolation.py 

    Co-authored-by: Kit Gallagher <[email protected]>
    @mghosh00 @KCGallagher
    mghosh00 and KCGallagher authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    4d13e6c View commit details
    Browse the repository at this point in the history

  9. Made changes

    @mghosh00
    mghosh00 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    84d5a46 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin/feature-id' into feature-id

    @mghosh00
    mghosh00 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    da35973 View commit details
    Browse the repository at this point in the history

  11. Flake8 fix

    @mghosh00
    mghosh00 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    3edfb19 View commit details
    Browse the repository at this point in the history