Merge pull request #48 from TUDelft-CITG/feature/reorganize-lock-and-…

…properties Feature/reorganize lock and properties
TUDelft-CITG · Aug 29, 2022 · aaab1b1 · aaab1b1
2 parents e638646 + c0c10e6
commit aaab1b1
Show file tree

Hide file tree

Showing 26 changed files with 4,131 additions and 3,864 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 # generated files
 fis_cache
+requests_cache.sqlite
 # generated by example notebook
 book/config.json
 book/examples/*

diff --git a/Dockerfile b/Dockerfile
@@ -2,11 +2,13 @@
 FROM continuumio/miniconda3
 
 # Install conda stuff first
-RUN conda install nomkl pyproj gdal
+# install gdal library
+RUN conda install nomkl pyproj
+RUN conda install -c conda-forge gdal nomkl
 
 WORKDIR /OpenTNSim
 ADD . /OpenTNSim
-
+RUN pip install --upgrade pip
 # Install the application
 RUN pip install -e .
 # and the testing dependencies

diff --git a/environment.yml b/environment.yml
@@ -21,6 +21,7 @@ dependencies:
   - jupyter=1
   - notebook=6
   - jupyterlab=3
+  - ipyleaflet
   - ipython=7
   - matplotlib=3
   - pint=0.18
@@ -41,4 +42,4 @@ dependencies:
   - gdal=3
 
   - pip:
-    - simpy
+    - simpy
diff --git a/notebooks/Example 07 - Using actual graphs and graph_module.py.ipynb b/notebooks/Example 07 - Using actual graphs and graph_module.py.ipynb
diff --git a/notebooks/Example 17 - Lock.ipynb b/notebooks/Example 17 - Lock.ipynb
diff --git a/notebooks/Shape-Files/README.md b/notebooks/Shape-Files/README.md
@@ -0,0 +1,7 @@
+# Shape files
+This directory contains three example shape files that are used for examples. Please do not add new ones to this directory because we want to keep the git repository for code only. You can use cloud buckets or zenodo to store larger datasets. 
+
+The examples networks include:
+- Amsterdam canal network, interesting for in city problems (last mile, electric ships)
+- Rottterdam - Antwerpen, interesting for inter city problems (port to port, locks)
+- 
diff --git a/.../Example 16 - Energy use in package.ipynb → .../Example 16 - Energy use in package.ipynb b/.../Example 16 - Energy use in package.ipynb → .../Example 16 - Energy use in package.ipynb
diff --git a/notebooks/broken/Example load digital twin scenario.ipynb b/notebooks/broken/Example load digital twin scenario.ipynb