Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
964a614
updates lead spec json file
andalexo Feb 16, 2022
dbfa3de
changes directory for data
andalexo Feb 16, 2022
073727f
adds instructions to README.md file; removes instruction.txt
andalexo Feb 16, 2022
c2e6608
adds gitignore file
andalexo Feb 16, 2022
a65aa6b
removes data from repository
andalexo Feb 16, 2022
eb2ece4
restructures repository
andalexo Feb 16, 2022
4e1ecdc
fixes for working example
andalexo Feb 16, 2022
5ed165c
fixes to use env vars for model execution
andalexo Feb 28, 2022
b6916be
updates requirements file
andalexo Feb 28, 2022
f8643ab
fixes .env requirement; fixes dict creation in the case of environ
andalexo Feb 28, 2022
c5c116d
updates README.md file
andalexo Feb 28, 2022
2a8735f
adds minor unfinished updates towards changing back to cli params
andalexo Jun 14, 2022
6f63731
updates lead spec json file
andalexo Jun 14, 2022
5bec11a
replaces params file with env (.env); sets output to non-variable nam…
andalexo Jun 16, 2022
780d640
fixes linting and other minor
andalexo Jun 16, 2022
7375007
sets linter's suggestions
andalexo Jun 17, 2022
90854ec
loads ui module only when --gui; packaging changes on pipenv and setu…
andalexo Jun 17, 2022
35be5fe
updates README.md file
andalexo Jun 17, 2022
7739a01
fixes kpis dict; adds gemeented area
andalexo Jun 22, 2022
58ec04c
adds sample data placeholder folder
andalexo Sep 12, 2022
ed63914
fixes bug for not env file given; updates set log level
andalexo Sep 12, 2022
4e6a263
cleans up comments
andalexo Sep 12, 2022
3377dbe
updates executable name
andalexo Sep 12, 2022
281aeac
removes old inputs from lead spec json
andalexo Sep 12, 2022
0c1ec5d
updates .env to work with docker run
andalexo Sep 12, 2022
eff19e8
updates Dockerfile with new entrypoint
andalexo Sep 12, 2022
3eb9435
updates README.md instructions and examples
andalexo Sep 12, 2022
3c28faa
cleans up old code
andalexo Sep 12, 2022
86d045c
version bump
andalexo Sep 12, 2022
306f8cf
introduces envctl; shapefiles as zip
andalexo Sep 19, 2022
60c1c3c
updates README.md for zip shapefiles
andalexo Sep 19, 2022
c1b81fe
version bump
andalexo Sep 19, 2022
db89771
updates lead spec json file
andalexo Sep 19, 2022
fa27ae1
updates lead spec json file; removes custom validators
andalexo Sep 23, 2022
d2c2698
Update 12-10
Oct 12, 2022
18152ed
updates kpis log
andalexo Oct 17, 2022
5f4e883
updates README examples
andalexo Oct 17, 2022
a833705
Merge branch 'Parcel-locker' into package-application
andalexo Feb 20, 2023
d0d3a9b
renames spec to modelspec.json
andalexo Feb 20, 2023
8e19c33
updates pipfile to use any 3.8 python
andalexo Feb 20, 2023
152267a
updates dockerfile to separate requirements from model
andalexo Feb 20, 2023
f1fd251
introduces the parcel locker configuration parameters needed
andalexo Feb 20, 2023
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
30 changes: 30 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
LABEL='default'
# boolean parameters
RUN_DEMAND_MODULE=true
CROWDSHIPPING_NETWORK=True
COMBINE_DELIVERY_PICKUP_TOUR=True
HYPERCONNECTED_NETWORK=FALSE
printKPI=True

# numeric parameters
PARCELS_PER_EMPL=0.00
Local2Local=0.04
# Willingess to SEND a parcel by CS
CS_cust_willingness=0.1
PARCELS_MAXLOAD=180
PARCELS_DROPTIME=120
PARCELS_SUCCESS_B2C=0.90
PARCELS_SUCCESS_B2B=0.95
PARCELS_GROWTHFREIGHT=1.0
PL_ZonalDemand=1.0

PARCELS_PER_HH_B2C=0.195
PARCELS_M=20.8
PARCELS_DAYS=250
PARCELS_M_HHS=8.0

# string list parameters
Gemeenten_studyarea=Delft,Midden_Delfland,Rijswijk,sGravenhage,Leidschendam_Voorburg

# number list parameters
parcelLockers_zones=1,2,3,2777,2801,2802
144 changes: 144 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
.idea
.vscode
.directory

data/

# 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/
19 changes: 19 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM python:3.8.12-slim-bullseye

WORKDIR /srv/parcel-generation

RUN apt-get update && \
apt-get install -y --no-install-recommends \
liblapack-dev libatlas-base-dev && \
rm -rf /var/lib/apt/lists/*

COPY setup.py requirements.txt README.md ./
RUN pip install --upgrade pip && \
pip install -r requirements.txt

COPY src src
RUN pip install .

WORKDIR /

ENTRYPOINT [ "parcel-generation", "-vv" ]
7 changes: 0 additions & 7 deletions Input/CEPshares.csv

This file was deleted.

2 changes: 0 additions & 2 deletions Input/MISSING FILES.txt

This file was deleted.

21 changes: 0 additions & 21 deletions Input/Params_ParcelGen.txt

This file was deleted.

Loading