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.

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

Feedback #1

Open
wants to merge 154 commits into
base: feedback
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
154 commits
Select commit Hold shift + click to select a range
3a838b7
Setting up GitHub Classroom Feedback
bnels Oct 26, 2020
306e88b
Update GitHub Classroom Feedback
yianc-uc Oct 26, 2020
559c316
Setting up GitHub Classroom Feedback
yianc-uc Oct 26, 2020
37bce74
Create README.md
jackpotrykus Oct 29, 2020
30fca1e
Update README.md
jackpotrykus Nov 2, 2020
398a09c
SIR Agent Class
jackpotrykus Nov 9, 2020
8473f07
docstrings
jackpotrykus Nov 9, 2020
307ba23
linted with black
jackpotrykus Nov 9, 2020
c5efd91
b_infected was redundant
jackpotrykus Nov 9, 2020
840e3f8
ODE class
annaoschouten Nov 10, 2020
8004494
temp
jarroddominguez Nov 11, 2020
f4dccb6
added step_days() method
jackpotrykus Nov 11, 2020
b8ffad6
Merge branch 'main' of https://github.com/caam37830/project-group-8 i…
jackpotrykus Nov 11, 2020
6ad453f
Changed intialization
annaoschouten Nov 11, 2020
ca050e2
Merge branch 'main' of github.com:caam37830/project-group-8 into main
annaoschouten Nov 11, 2020
d1303a7
added some plots
jarroddominguez Nov 11, 2020
060c383
Merge branch 'main' of https://github.com/caam37830/project-group-8 i…
jarroddominguez Nov 11, 2020
4c801aa
temp
jarroddominguez Nov 12, 2020
5c9d4df
fixed imports
jackpotrykus Nov 12, 2020
7d5caed
gitignore
jackpotrykus Nov 12, 2020
717e2cf
gitignore2
jackpotrykus Nov 12, 2020
5c7ea37
reorg
jackpotrykus Nov 12, 2020
4b34f56
reorg
jackpotrykus Nov 12, 2020
cbf08b7
reorg done
jackpotrykus Nov 12, 2020
3a35c00
__init__.py
jackpotrykus Nov 12, 2020
dca6849
temp
jarroddominguez Nov 12, 2020
d5ea13a
Time function
annaoschouten Nov 12, 2020
83fc747
Merge branch 'main' of github.com:caam37830/project-group-8 into main
annaoschouten Nov 12, 2020
091b1bd
test_ode
annaoschouten Nov 12, 2020
f45131e
temp
jarroddominguez Nov 12, 2020
740d674
Merge branch 'main' of https://github.com/caam37830/project-group-8 i…
jarroddominguez Nov 12, 2020
dad2741
Tests implemented
jackpotrykus Nov 12, 2020
f39b122
temp
jarroddominguez Nov 12, 2020
0aa4b38
Merge branch 'main' of https://github.com/caam37830/project-group-8 i…
jarroddominguez Nov 12, 2020
bfbc21e
temp
jarroddominguez Nov 12, 2020
30e29e8
Create requirements.txt
jarroddominguez Nov 12, 2020
e6c6612
temp
jarroddominguez Nov 13, 2020
320b1eb
Merge branch 'main' of https://github.com/caam37830/project-group-8 i…
jarroddominguez Nov 13, 2020
52960cb
temp
jarroddominguez Nov 13, 2020
a371926
Update .gitignore
jackpotrykus Nov 13, 2020
4a84b22
Delete .DS_Store
jackpotrykus Nov 13, 2020
0844ea9
yessir
Nov 13, 2020
cbfd81f
Merge branch 'main' of https://github.com/caam37830/project-group-8 i…
Nov 13, 2020
4038020
sad
Nov 13, 2020
da02e15
temp
jarroddominguez Nov 13, 2020
9ad6c5f
Create python-publish.yml
jarroddominguez Nov 13, 2020
7e62ba4
temp
jarroddominguez Nov 13, 2020
4c07cd5
temp
jarroddominguez Nov 13, 2020
24bd111
temp
jarroddominguez Nov 13, 2020
96baa0a
temp
jarroddominguez Nov 13, 2020
cf55d37
temp
jarroddominguez Nov 13, 2020
ef65c03
extension to checkpoint
annaoschouten Nov 13, 2020
e30c4ad
Merge branch 'main' of github.com:caam37830/project-group-8 into main
annaoschouten Nov 13, 2020
7734b22
maybe?
Nov 13, 2020
9a80c63
MMergeerge branch 'main' of https://github.com/caam37830/project-grou…
Nov 13, 2020
25b11ac
Delete K05Agent.png
jarroddominguez Nov 13, 2020
6dfadde
Delete K05ODE.png
jarroddominguez Nov 13, 2020
c2e554f
Delete K40Agent.png
jarroddominguez Nov 13, 2020
e11719a
Delete K40ODE.png
jarroddominguez Nov 13, 2020
32aba4c
Delete PhaseBAgent.png
jarroddominguez Nov 13, 2020
d7b2fd2
Delete PhaseKAgent.png
jarroddominguez Nov 13, 2020
9a0c991
Delete PhaseKODE.png
jarroddominguez Nov 13, 2020
712d82f
temp
jarroddominguez Nov 13, 2020
d43d0e9
temp
jarroddominguez Nov 13, 2020
2b2b262
yes?
Nov 13, 2020
66a2b15
yes
Nov 13, 2020
032761f
temp
jarroddominguez Nov 13, 2020
abbd3ef
Delete slurm-6867202.out
jarroddominguez Nov 13, 2020
aef0de1
Delete slurm-6868850.out
jarroddominguez Nov 13, 2020
15f6892
Delete slurm-6871434.out
jarroddominguez Nov 13, 2020
19cc93f
Delete slurm-6872306.out
jarroddominguez Nov 13, 2020
371a4cd
Delete slurm-6877076.out
jarroddominguez Nov 13, 2020
71b10ef
update test
annaoschouten Nov 13, 2020
ff57c06
Merge branch 'main' of github.com:caam37830/project-group-8 into main
annaoschouten Nov 13, 2020
e971187
yes
Nov 13, 2020
e1e30ec
this itMerge branch 'main' of https://github.com/caam37830/project-gr…
Nov 13, 2020
0b08314
temp
jarroddominguez Nov 13, 2020
33d03d1
yep
jarroddominguez Nov 13, 2020
0b2f80c
Create test.yml
jarroddominguez Nov 13, 2020
fe6e601
Delete python-publish.yml
jarroddominguez Nov 13, 2020
1775e66
Update README.md
jarroddominguez Nov 13, 2020
0f62a50
Update README.md
jarroddominguez Nov 13, 2020
7817123
Intro to SIR model
annaoschouten Nov 13, 2020
912da3f
format
annaoschouten Nov 13, 2020
8517aef
Jack writeup
jackpotrykus Nov 13, 2020
ef2e47c
Linted with Python Black
jackpotrykus Nov 13, 2020
82413c1
Updated .gitignore
jackpotrykus Nov 18, 2020
28b700c
Update README.md
jackpotrykus Nov 18, 2020
397c9d6
refactored
jackpotrykus Nov 23, 2020
f8b4a13
refactored SIRModel
jackpotrykus Nov 23, 2020
69f1f4d
temp
jarroddominguez Nov 29, 2020
ce431bf
peep the sim
jarroddominguez Nov 29, 2020
ec3298c
temp
jarroddominguez Nov 29, 2020
a8292b6
maybe
Nov 29, 2020
efabed3
my mes# modified: ../doc/checkpoint/plots/k05Agent.png
Nov 29, 2020
1e6030a
<commit message>
Nov 29, 2020
e17bcef
ok yes
jarroddominguez Nov 29, 2020
32b731b
Merge branch 'main' of https://github.com/caam37830/project-group-8 i…
jarroddominguez Nov 29, 2020
2e36d25
maybe
Nov 30, 2020
393722f
temp
jarroddominguez Nov 30, 2020
77235f6
plots
Nov 30, 2020
3730dfb
temp
jarroddominguez Nov 30, 2020
e709705
Merge branch 'main' of https://github.com/caam37830/project-group-8 i…
jarroddominguez Nov 30, 2020
d29f240
plots
Nov 30, 2020
b5b0e4c
update
jarroddominguez Nov 30, 2020
aeca9f8
Merge branch 'main' of https://github.com/caam37830/project-group-8 i…
jarroddominguez Nov 30, 2020
85d0a28
plots
Nov 30, 2020
2142718
new run
jarroddominguez Nov 30, 2020
008f7bc
yup
jarroddominguez Nov 30, 2020
47046d2
plots
Nov 30, 2020
22b7187
changes
jarroddominguez Nov 30, 2020
37d7d8b
Merge branch 'main' of https://github.com/caam37830/project-group-8 i…
jarroddominguez Nov 30, 2020
a1a07df
fixes
jarroddominguez Nov 30, 2020
0b9c117
update
jarroddominguez Nov 30, 2020
016d9a9
plots
Nov 30, 2020
c13a225
updates
jarroddominguez Nov 30, 2020
d882d65
Merge branch 'main' of https://github.com/caam37830/project-group-8 i…
jarroddominguez Nov 30, 2020
9586010
ugh
jarroddominguez Nov 30, 2020
00ac223
mk
Nov 30, 2020
ada9e8e
Merge branch 'main' of https://github.com/caam37830/project-group-8 i…
Nov 30, 2020
9a17e24
fixes
jarroddominguez Dec 1, 2020
e23d1b2
Merge branch 'main' of https://github.com/caam37830/project-group-8 i…
jarroddominguez Dec 1, 2020
ba84d54
changes
jarroddominguez Dec 1, 2020
6d33ee4
plots
Dec 1, 2020
ab95e91
merge
Dec 1, 2020
525744f
error
Dec 1, 2020
3408299
fixes
jarroddominguez Dec 1, 2020
88c8f05
Merge branch 'main' of https://github.com/caam37830/project-group-8 i…
jarroddominguez Dec 1, 2020
90fa5b3
plots
Dec 1, 2020
17e3137
added words
jarroddominguez Dec 1, 2020
a2ca1e1
commented code
jarroddominguez Dec 1, 2020
46a5d6d
test update
jarroddominguez Dec 1, 2020
a7747b7
ODE extension
annaoschouten Dec 2, 2020
b24314f
ConwayAgent
jackpotrykus Dec 3, 2020
75be0a1
reorg
jackpotrykus Dec 3, 2020
1946729
spatial and move extension
annaoschouten Dec 5, 2020
c4f4ab4
reinfect simulations
annaoschouten Dec 7, 2020
7c0a3d5
conway_agent unit tests
jackpotrykus Dec 7, 2020
70e96d8
conway agent sbatch
jackpotrykus Dec 7, 2020
7714769
conway plots dir (ready to run)
jackpotrykus Dec 7, 2020
28cea9b
back to local
Dec 7, 2020
88053c8
conway animations
jackpotrykus Dec 7, 2020
00c3220
spatial and reinfection report
annaoschouten Dec 7, 2020
d92f9aa
X
annaoschouten Dec 7, 2020
da2db5b
update
annaoschouten Dec 7, 2020
f7a762c
update
annaoschouten Dec 8, 2020
bcf041e
fix plots
annaoschouten Dec 8, 2020
a1de680
final report, team8
jackpotrykus Dec 9, 2020
e7614ff
README
jackpotrykus Dec 9, 2020
a3001e6
README links
jackpotrykus Dec 9, 2020
817703a
fixed typo
jackpotrykus Dec 9, 2020
7eaa213
Delete .test_ode.py.swp
jackpotrykus Dec 9, 2020
088ffa8
Update test.yml
jarroddominguez Dec 9, 2020
854fb1b
Update README.md
jackpotrykus Dec 9, 2020
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
37 changes: 37 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@

# This is a basic workflow to help you get started with Actions

name: CI

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.6
uses: actions/setup-python@v1
with:
python-version: 3.6
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Test with pytest
run: pytest test/test_agent.py
- name: Test with pytest
run: pytest test/test_ode.py
- name: Test with pytest
run: pytest test/test_smart_agent.py
- name: Test with pytest
run: pytest test/test_conway_agent.py
- name: Test with pytest
run: pytest test/test_reinfect.py
156 changes: 156 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
# MacOS junk files
*.DS_Store

# IDE junk files
.vscodea
.idea

# TeX junk files
*.aux
*.fdb_latexmk
*.fls
*.log
*.out
*.synctex.gz
*.toc

# The rest follows from the standard Python .gitignore, available at:
# https://raw.githubusercontent.com/github/gitignore/master/Python.gitignore
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/
30 changes: 30 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# project-group-8

## CAAM 37830: Final Project
Group members:

* Jarrod Dominguez
* Anna Schouten
* Jack Potrykus


## Overview of this Repository

This repository has a lot more than just the `sir` module. Some points of interest:

* See `sir` for agent based class and ODE based class, and classes for our extensions.
* See `test` for unit tests for model classes.
* See `Scripts` for proccess simulations and plots.
* See [`doc/final/final_report_team8.pdf`](https://github.com/caam37830/project-group-8/blob/main/doc/final/final_report_team8.pdf) for our final written report. The `TeX` source code is also available in this folder, in the subdirectory `final_tex`. It can be compiled using `pdflatex`; be sure to invoke `--shell-escape` if you want to compile it from source yourself.
* See `doc/checkpoint` for our preliminary findings, discussing of next steps (extensions and spatial implementation), and basic explanation of the SIR model.

We use [`psf/black`](https://github.com/psf/black) as a linter on all `*.py` files in this project to maintain consistent code style. You can read about its opinions [here](https://github.com/psf/black#the-black-code-style).

## Assignment Overview

* Midterm checkpoint
* [Guidelines](https://github.com/caam37830/default-project/blob/main/midterm_checkpoint.md)
* [SIR model overview](https://github.com/caam37830/default-project/blob/main/SIR.md)
* Final report
* [Guidelines](https://github.com/caam37830/default-project/blob/main/final_report.md)
* [Spatial requirement overview](https://github.com/caam37830/default-project/blob/main/spatial.md)
Empty file added Scripts/conway_agent.err
Empty file.
Loading