Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
d5caa50
add use cases
Pietervanhalem May 30, 2022
1661a7a
testpush
luke-moth Jun 2, 2022
90412a2
superlog module
luke-moth Jun 30, 2022
f3e9eee
update graph
luke-moth Jul 1, 2022
c1e9397
update notebook testcase
luke-moth Jul 1, 2022
7654e6c
update notebooks (temp for demo)
luke-moth Jul 1, 2022
94b389a
update24
luke-moth Jul 1, 2022
59a7327
fix paths for tests
luke-moth Jul 1, 2022
304a89a
add actions
Pietervanhalem Jul 4, 2022
fd67511
fix
Pietervanhalem Jul 4, 2022
c8f346e
add test dependecies
Pietervanhalem Jul 4, 2022
cf8772b
typo
Pietervanhalem Jul 4, 2022
d0de3da
Merge pull request #40 from VanOord/GithubActions
Pietervanhalem Jul 4, 2022
c31559e
add requirements for new tests
luke-moth Jul 7, 2022
e06b081
fixing isort and flake8 failed tests
frank-klein-schaarsberg-wb Jul 15, 2022
9ace75d
fixing approximation assertions in existing tests tests/test_delay_pl…
frank-klein-schaarsberg-wb Jul 15, 2022
38990c5
blackify
frank-klein-schaarsberg-wb Jul 15, 2022
403996c
isort and blackify
frank-klein-schaarsberg-wb Jul 15, 2022
74789e1
new functionality sprint2
luke-moth Aug 29, 2022
e77f39d
add testcases
luke-moth Aug 29, 2022
5d4e188
fix testcase
luke-moth Aug 29, 2022
8b1b08f
refactored, combined and cleaned up critical path functionalities
frank-klein-schaarsberg-wb Oct 7, 2022
83adfe1
plotting the CP in the gantt chart
frank-klein-schaarsberg-wb Oct 7, 2022
552970a
jupyter notebook critical path
frank-klein-schaarsberg-wb Oct 7, 2022
169d3f9
removes old tests
frank-klein-schaarsberg-wb Oct 7, 2022
0fc6363
blackify and isort
frank-klein-schaarsberg-wb Oct 7, 2022
3ca2007
cp testing
frank-klein-schaarsberg-wb Oct 7, 2022
5113ed7
Merge pull request #41 from VanOord/WIBO-critical-path-dev
frank-klein-schaarsberg-wb Oct 7, 2022
fdfdc41
removed redundant blocks from notebook 24_cutters and barges.ipynb
frank-klein-schaarsberg-wb Oct 11, 2022
cfe97fb
removing WIBO test case
frank-klein-schaarsberg-wb Oct 11, 2022
0f48a12
Merge branch 'master' into WIBO-critical-path
frank-klein-schaarsberg-wb Oct 11, 2022
0bc45ec
Merge branch 'master' into WIBO-critical-path
frank-klein-schaarsberg-wb Oct 11, 2022
c11a290
fix version of flake8
frank-klein-schaarsberg-wb Oct 11, 2022
8f31f44
Merge branch 'WIBO-critical-path' of https://github.com/VanOord/OpenC…
frank-klein-schaarsberg-wb Oct 11, 2022
261d320
merge with master, clear output from 16_feeder to resolve conflicts
Nov 2, 2022
091b864
only build book from TU Delft
Nov 3, 2022
4548500
Merge branch 'master' into WIBO-critical-path
Nov 3, 2022
eb29ce5
easier id_map for plotly legend
GerbenJdeBoer Mar 1, 2023
9504f17
allow both dicts and lists
GerbenJdeBoer Mar 2, 2023
98cfd78
apply easier arguments
GerbenJdeBoer Mar 2, 2023
dcf42d2
update post analysis with occupancy
GerbenJdeBoer Mar 2, 2023
c47ea64
add post analysis cutter occupancy
GerbenJdeBoer Mar 2, 2023
b41f8c8
more generic analysis for cutter occupancy
GerbenJdeBoer Mar 2, 2023
49aa122
explore optimal number of barges
GerbenJdeBoer Mar 2, 2023
dd3a21e
use critical path to visualize cutter occupancy
GerbenJdeBoer Mar 2, 2023
246596e
100 occupancy is not yet always critical path
GerbenJdeBoer Mar 2, 2023
5a4c820
added comparison by cost and occupancy
GerbenJdeBoer Mar 3, 2023
897c5d7
extend comparison with overall duration
GerbenJdeBoer Mar 3, 2023
f54b80d
facilitate filtering of activities
GerbenJdeBoer Mar 3, 2023
43e78c2
gannt chart no legend for many vessels
GerbenJdeBoer Mar 3, 2023
115a2f4
bundle sites in dict
GerbenJdeBoer Mar 5, 2023
098a81e
export concepts and model activities with IDs
GerbenJdeBoer Mar 5, 2023
1f6e7f4
fix occupancy to match total_amount
GerbenJdeBoer Mar 6, 2023
0715272
export datamodel for BI reuse
GerbenJdeBoer Mar 6, 2023
66e01dd
save time range in sec
GerbenJdeBoer Mar 8, 2023
b74848c
ActivityType > ActivityClass
GerbenJdeBoer Mar 8, 2023
796aab8
export_ranges to package
GerbenJdeBoer Mar 8, 2023
222a61e
reorder notebook into logical story
GerbenJdeBoer Mar 8, 2023
e355c1a
remove need for id_map
GerbenJdeBoer Mar 8, 2023
d2fe9cd
export resources = concept assignments
GerbenJdeBoer Mar 8, 2023
16043be
remove filter complexity
GerbenJdeBoer Mar 8, 2023
a05db08
export to file
GerbenJdeBoer Mar 8, 2023
adb2673
add ranking plot
GerbenJdeBoer Mar 8, 2023
eecb936
Concepts Type > Class
GerbenJdeBoer Mar 8, 2023
f4ddfa6
vesselname wbs=abs:name for BI post analysis
GerbenJdeBoer Mar 10, 2023
ee68d90
add power consumption to post analysis
GerbenJdeBoer Mar 11, 2023
2b9ea36
move simulation kpi extractor to def
GerbenJdeBoer Mar 11, 2023
0d63b3c
pass a specific fleet to run
GerbenJdeBoer Mar 11, 2023
6db005c
generate run compare all possible fleets
GerbenJdeBoer Mar 11, 2023
52ac84a
changed numbers and plots
GerbenJdeBoer Mar 17, 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
108 changes: 108 additions & 0 deletions .github/workflows/actions.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
name: CI

on:
schedule:
- cron: "5 4 * * SUN"
push:
branches:
- "**"
tags:
- "v*"
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
# build the image
build:
runs-on: ubuntu-latest
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

# set up build using both layer and buildkit caching following this guide
# https://evilmartians.com/chronicles/build-images-on-github-actions-with-docker-layer-caching
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@master

- name: Cache Docker layers
uses: actions/cache@v2
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-single-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-single-buildx

- name: Build and export
uses: docker/build-push-action@v2
with:
context: .
builder: ${{ steps.buildx.outputs.name }}
file: ./Dockerfile
tags: openclsim:latest
outputs: type=docker,dest=/tmp/image.tar
cache-from: type=gha, scope=${{ github.workflow }}
cache-to: type=gha, scope=${{ github.workflow }}

- name: Upload image to github artifacts
uses: actions/upload-artifact@v2
with:
name: image
path: /tmp/image.tar
retention-days: 5

# test the image in parallel
test:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v2

# an explicit pull step is not strictly necessary, but it pulls in parallel
# and in the background while just `running docker-compose up` pulls images one by one
- name: Run docker-compose pull
run: docker-compose pull --ignore-pull-failures -q &
continue-on-error: true

- name: Download image from github artifacts
uses: actions/download-artifact@v2
with:
name: image
path: /tmp

- name: Load image into docker
run: |
docker load --input /tmp/image.tar
docker image ls -a

- name: Run docker-compose up
run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up -d --remove-orphans

- name: Install test dependecies
run: docker-compose exec -T package bash -c "pip install -e .[testing]"

- name: List installed packages
run: docker-compose exec -T package bash -c "pip freeze"

- name: Run tests
run: >-
docker-compose exec -T package bash -c '
pytest \
--cov=src \
--cov=app \
--durations=3 \
--cov-config=setup.cfg \
--cov-context=test \
--black \
--isort \
-W default \
tests src'

- name: Extract coverage from container
run: docker-compose exec -T package bash -c "cat .coverage" > .coverage

- name: Upload coverage
uses: actions/upload-artifact@v2
with:
path: .coverage
retention-days: 1
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
build_and_deploy_job:
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
if: github.repository_owner == 'TUDelft-CITG' && (github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed'))
runs-on: ubuntu-latest
name: Build and Deploy Job
steps:
Expand Down
2,712 changes: 2,698 additions & 14 deletions notebooks/16_Feeder.ipynb

Large diffs are not rendered by default.

Loading