Code

Feature#247

Code

Merged

mghosh00 merged 65 commits intomainSABS-R3-Epidemiology/epiabm:mainfrom feature-idSABS-R3-Epidemiology/epiabm:feature-idCopy head branch name to clipboardNov 30, 2023

+367-113

Commits

Commits on Nov 15, 2023

• Initial commit

  mghosh00

  committed
  7d8657a

  Copy full SHA for 7d8657a

• Added household id

  mghosh00

  committed
  3eea911

  Copy full SHA for 3eea911

• Added set_id

  abbie-evans

  committed
  34db412

  Copy full SHA for 34db412

• Added ID for person and households

  abbie-evans

  committed
  3f25185

  Copy full SHA for 3f25185

Commits on Nov 16, 2023

• Added some tests and a regex check

  mghosh00

  committed
  12e0e9b

  Copy full SHA for 12e0e9b

• Merge conflict

  abbie-evans

  committed
  ffdb83f

  Copy full SHA for ffdb83f

• Merge branch 'feature-id' of github.com:SABS-R3-Epidemiology/epiabm into feature-id

  abbie-evans

  committed
  a6039b0

  Copy full SHA for a6039b0

• Resolved circular import errors

  KCGallagher

  committed
  830988c

  Copy full SHA for 830988c

• Merge branch 'feature-id' of github.com:SABS-R3-Epidemiology/epiabm into feature-id

  abbie-evans

  committed
  55e5337

  Copy full SHA for 55e5337

• Ensure unique cell ids for toy pop

  KCGallagher

  committed
  7322f07

  Copy full SHA for 7322f07

• Merge branch 'feature-id' of github.com:SABS-R3-Epidemiology/epiabm into feature-id

  abbie-evans

  committed
  71d6d68

  Copy full SHA for 71d6d68

• Removed print statement

  abbie-evans

  committed
  da3669e

  Copy full SHA for da3669e

• Updated ID definition

  abbie-evans

  committed
  bed0a99

  Copy full SHA for bed0a99

• Updated test for ID

  abbie-evans

  committed
  4be6a4e

  Copy full SHA for 4be6a4e

Commits on Nov 17, 2023

• Updated household id

  abbie-evans

  committed
  38b302c

  Copy full SHA for 38b302c

• Updated set_id test

  abbie-evans

  committed
  8226f46

  Copy full SHA for 8226f46

• Updated regex

  mghosh00

  committed
  2f4f2db

  Copy full SHA for 2f4f2db

• Merge branch 'feature-id' of github.com:SABS-R3-Epidemiology/epiabm into feature-id

  mghosh00

  committed
  c9ce368

  Copy full SHA for c9ce368

• self.id added

  abbie-evans

  committed
  5f9782f

  Copy full SHA for 5f9782f

• Updated set_id test

  abbie-evans

  committed
  f4406b2

  Copy full SHA for f4406b2

• Update add_household

  abbie-evans

  committed
  0a98755

  Copy full SHA for 0a98755

• Updated add_household test

  abbie-evans

  committed
  a572114

  Copy full SHA for a572114

Commits on Nov 18, 2023

• Merge branch 'feature-id' of github.com:SABS-R3-Epidemiology/epiabm into feature-id

  mghosh00

  committed
  537bf21

  Copy full SHA for 537bf21

Commits on Nov 19, 2023

• Changed cell id to a string to match the other types, and fixed errors involving ids

  mghosh00

  committed
  6d90677

  Copy full SHA for 6d90677

Commits on Nov 22, 2023

• Fixed line lengths

  mghosh00

  committed
  839a713

  Copy full SHA for 839a713

• Import arrangement

  Show description for 666afea
  

  abbie-evans

  and

  KCGallagher

  authored
  666afea

  Copy full SHA for 666afea

• Updated set_id tests

  abbie-evans

  committed
  c718a9f

  Copy full SHA for c718a9f

• Merge branch 'feature-id' of github.com:SABS-R3-Epidemiology/epiabm into feature-id

  abbie-evans

  committed
  8c0d697

  Copy full SHA for 8c0d697

• Added checks for duplicates

  mghosh00

  committed
  3df1187

  Copy full SHA for 3df1187

• Merge remote-tracking branch 'origin/feature-id' into feature-id

  mghosh00

  committed
  3807cc6

  Copy full SHA for 3807cc6

• Style changes

  mghosh00

  committed
  9e2bef6

  Copy full SHA for 9e2bef6

• Fixed error and changed make_pop

  mghosh00

  committed
  e46a784

  Copy full SHA for e46a784

• Added tests for uniqueness of id

  abbie-evans

  committed
  a983def

  Copy full SHA for a983def

• Fixes of duplicate ids

  mghosh00

  committed
  182cdb6

  Copy full SHA for 182cdb6

• Merge remote-tracking branch 'origin/feature-id' into feature-id

  mghosh00

  committed
  2b2263d

  Copy full SHA for 2b2263d

• Fixes of duplicate ids

  mghosh00

  committed
  18a666d

  Copy full SHA for 18a666d

• Checked that the actual dataframe in test_file_population_config matches the expected

  mghosh00

  committed
  6a8ddd6

  Copy full SHA for 6a8ddd6

• Pandas version check

  mghosh00

  committed
  ecea0bd

  Copy full SHA for ecea0bd

• Fixed error

  mghosh00

  committed
  e21a57d

  Copy full SHA for e21a57d

• Added duplicates test for cells

  mghosh00

  committed
  b8bde2c

  Copy full SHA for b8bde2c

• Added duplicates test for cells

  mghosh00

  committed
  8027168

  Copy full SHA for 8027168

• Update set_id test for duplicates

  abbie-evans

  committed
  705d114

  Copy full SHA for 705d114

• Added argument cells for use of cells set_id

  abbie-evans

  committed
  1cbc7bb

  Copy full SHA for 1cbc7bb

• Attempt fix of indent error

  abbie-evans

  committed
  c7532d5

  Copy full SHA for c7532d5

Commits on Nov 23, 2023

• Style fixes

  abbie-evans

  committed
  ec76924

  Copy full SHA for ec76924

• Merge branch 'main' into feature-id

  abbie-evans

  authored
  98eda4f

  Copy full SHA for 98eda4f

• Changed csv read so that cell and microcell ids are read as integers, not floats

  mghosh00

  committed
  48a98d2

  Copy full SHA for 48a98d2

• Fixed some errors

  mghosh00

  committed
  7d8b8b0

  Copy full SHA for 7d8b8b0

Commits on Nov 24, 2023

• Updated error message

  abbie-evans

  committed
  e3eb42c

  Copy full SHA for e3eb42c

Commits on Nov 27, 2023

• Removed parameter chaining in the mock_read

  mghosh00

  committed
  da8895a

  Copy full SHA for da8895a

Commits on Nov 29, 2023

• Modified add_household so that person id is only set if person does not already have household

  mghosh00

  committed
  89806cb

  Copy full SHA for 89806cb

• Added change_id parameter to the add_household function so that we can control when the id of a person is changed

  mghosh00

  committed
  8345e24

  Copy full SHA for 8345e24

• Error fix

  mghosh00

  committed
  f2074a7

  Copy full SHA for f2074a7

• Style fixes

  abbie-evans

  committed
  d326166

  Copy full SHA for d326166

Commits on Nov 30, 2023

• Updated add_household to have a default value

  mghosh00

  committed
  14cc1d2

  Copy full SHA for 14cc1d2

• Merge remote-tracking branch 'origin/feature-id' into feature-id

  Show description for a4f85ed
  mghosh00

  committed
  a4f85ed

  Copy full SHA for a4f85ed

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

  mghosh00

  committed
  63aad23

  Copy full SHA for 63aad23

• Update for loop in add_household

  Show description for 15978f3
  

  abbie-evans

  and

  KCGallagher

  authored
  15978f3

  Copy full SHA for 15978f3

• Changed add_household to have an override_person_id boolean attribute to determine whether we want the id overridden or not

  mghosh00

  committed
  ea0a512

  Copy full SHA for ea0a512

• Merge remote-tracking branch 'origin/feature-id' into feature-id

  mghosh00

  committed
  18c76fb

  Copy full SHA for 18c76fb

• Added further logging

  mghosh00

  committed
  3c2f5ce

  Copy full SHA for 3c2f5ce

• Update pyEpiabm/pyEpiabm/intervention/travel_isolation.py

  Show description for 4d13e6c
  

  mghosh00

  and

  KCGallagher

  authored
  4d13e6c

  Copy full SHA for 4d13e6c

• Made changes

  mghosh00

  committed
  84d5a46

  Copy full SHA for 84d5a46

• Merge remote-tracking branch 'origin/feature-id' into feature-id

  mghosh00

  committed
  da35973

  Copy full SHA for da35973

• Flake8 fix

  mghosh00

  committed
  3edfb19

  Copy full SHA for 3edfb19