Skip to content

Commit e7b7094

Browse files
authored
Merge pull request #87 from mitigation-controller/release_0.2.0
Release 0.2.0
2 parents 466f4ef + 880cd57 commit e7b7094

File tree

100 files changed

+1977
-1469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1977
-1469
lines changed

.github/workflows/ci_matlab.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Matlab tests
2+
on: push
3+
jobs:
4+
build:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- uses: actions/checkout@v2
8+
- uses: matlab-actions/setup-matlab@v0
9+
with:
10+
release: R2020b
11+
- uses: matlab-actions/run-tests@v0
12+
with:
13+
source-folder: mitc
14+
code-coverage-cobertura: coverage.xml
15+
- uses: codecov/codecov-action@v1
16+
with:
17+
file: coverage.xml

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33

44
# Results subdirectories
55
/Results/*/
6+
7+
# Code coverage results
8+
/tests/Reports/

CHANGELOG.md

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,32 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [0.2.0] - 2021-07-12
9+
10+
### Fixed
11+
- Fix `remove_missing.m` to check for data type "missing"
12+
13+
### Added
14+
- Testing environment coupled with GitHub actions and Codecov
15+
- Penalty/incentive functionality
16+
- Add verification of project data
17+
18+
### Changed
19+
- Update GUI layout to include penalty/incentive
20+
- Update GUI with document and feedback buttons
21+
- Update GUI to show T_orig
22+
- Update GUI to verify raw data
23+
- Update messages and errors
24+
- General code refactoring
25+
826
## [0.1.1] - 2021-01-18
927

10-
## Fixed
28+
### Fixed
1129
- Issue with missing T_pl in `select_critical_path.m`
1230

1331
## [0.1.0] - 2020-12-18
1432

15-
## Added
33+
### Added
1634

1735
- MATLAB GUI
1836
- MitC stand-alone installer
@@ -21,7 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2139
- CITATION.cff
2240
- CHANGELOG.md
2341

24-
## Changed
42+
### Changed
2543
- Restructured repository directories
2644
- Create modular code base to make it callable by GUI
2745

@@ -30,7 +48,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3048
### Added
3149

3250
- This is the initial version of mitc.
33-
51+
-
52+
[0.2.0]: https://github.com/mitigation-controller/mitc/releases/tag/0.2.0
3453
[0.1.1]: https://github.com/mitigation-controller/mitc/releases/tag/0.1.1
3554
[0.1.0]: https://github.com/mitigation-controller/mitc/releases/tag/0.1.0
3655
[0.0.1]: https://github.com/mitigation-controller/mitc/releases/tag/0.0.1

CONTRIBUTING.md

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# Contributing guidelines
2+
3+
We welcome any kind of contribution to our software, from simple comment or question to a full fledged [pull request](https://help.github.com/articles/about-pull-requests/).
4+
5+
A contribution can be one of the following cases:
6+
7+
1. you have a question;
8+
1. you think you may have found a bug (including unexpected behavior);
9+
1. you want to make some kind of change to the code base (e.g. to fix a bug, to add a new feature, to update documentation);
10+
1. you want to make a new release of the code base.
11+
12+
The sections below outline the steps in each case.
13+
14+
## You have a question
15+
16+
1. use the search functionality [here](https://github.com/mitigation-controller/mitc/issues) to see if someone already filed the same issue;
17+
1. if your issue search did not yield any relevant results, make a new issue;
18+
1. apply the "Question" label; apply other labels when relevant.
19+
20+
## You think you may have found a bug
21+
22+
1. use the search functionality [here](https://github.com/mitigation-controller/mitc/issues) to see if someone already filed the same issue;
23+
1. if your issue search did not yield any relevant results, make a new issue, making sure to provide enough information to the rest of the community to understand the cause and context of the problem. Depending on the issue, you may want to include:
24+
- make use of the bug report template;
25+
- the [SHA hashcode](https://help.github.com/articles/autolinked-references-and-urls/#commit-shas) of the commit that is causing your problem;
26+
- some identifying information (name and version number) for dependencies you're using;
27+
- information about the operating system;
28+
1. apply relevant labels to the newly created issue.
29+
30+
## You want to make some kind of change to the code base
31+
32+
1. (**important**) announce your plan to the rest of the community *before you start working*. This announcement should be in the form of a (new) issue;
33+
1. (**important**) wait until some kind of consensus is reached about your idea being a good idea;
34+
1. if needed, fork the repository to your own Github profile and create your own feature branch off of the latest dev commit. While working on your feature branch, make sure to stay up to date with the dev branch by pulling in changes, possibly from the 'upstream' repository (follow the instructions [here](https://help.github.com/articles/configuring-a-remote-for-a-fork/) and [here](https://help.github.com/articles/syncing-a-fork/));
35+
1. we make use of the Gitflow branching method, see [here](https://github.com/mitigation-controller/mitc/wiki/Branch-Management)
36+
1. make sure the existing tests still work by running `run_tests.m`;
37+
1. add your own tests (if necessary);
38+
1. update or expand the documentation;
39+
1. update the `CHANGELOG.md` file with change;
40+
1. [push](https://docs.github.com/en/github/using-git/pushing-commits-to-a-remote-repository#pushing-tags) your feature branch to (your fork of) the MitC repository on GitHub;
41+
1. create the pull request to the `dev` branch, e.g. following the instructions [here](https://help.github.com/articles/creating-a-pull-request/).
42+
43+
In case you feel like you've made a valuable contribution, but you don't know how to write or run tests for it, or how to generate the documentation: don't let this discourage you from making the pull request; we can help you! Just go ahead and submit the pull request, but keep in mind that you might be asked to append additional commits to your pull request.
44+
45+
## You want to make a new release of the code base
46+
47+
To create release you need write permission on the repository.
48+
49+
1. Create a release branch from the dev branch.
50+
1. Check author list in `citation.cff` and `.zenodo.json` files
51+
1. Follow the compiling and packaging steps described [here](https://github.com/mitigation-controller/mitc/wiki/Compile-and-package)
52+
1. Update the `CHANGELOG.md` to include changes made
53+
1. Follow the steps [here](https://github.com/mitigation-controller/mitc/wiki/Compile-and-package) to package and compile the application.
54+
1. Goto [GitHub release page](https://github.com/mitigation-controller/mitc/releases)
55+
1. Press draft a new release button
56+
1. Fill version, title and description field
57+
1. Press the Publish Release button
58+
59+
A Zenodo entry will be made for the release with its own DOI.
60+
61+
These contributing guidelines are based on the description in this [repository](https://github.com/matchms/matchms/blob/master/CONTRIBUTING.md)

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright [2020] [TU Delft]
189+
Copyright [2020] [Technische Universiteit Delft]
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

README.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
<img width="500" src=doc/MitC_logo.png>
33
</p>
44

5-
_The MitC software is currently under development and in a pre-release state._
6-
75
![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/mitigation-controller/mitc?include_prereleases)
86
![GitHub](https://img.shields.io/github/license/mitigation-controller/mitc)
9-
[![DOI](https://zenodo.org/badge/307504138.svg)](https://zenodo.org/badge/latestdoi/307504138)
7+
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4507337.svg)](https://doi.org/10.5281/zenodo.4507337)
8+
[![codecov](https://codecov.io/gh/mitigation-controller/mitc/branch/main/graph/badge.svg?token=9OZ7V9WWY2)](https://codecov.io/gh/mitigation-controller/mitc)
109

1110
The ongoing research deals with the development of an automated risk-mitigation tool for construction projects, namely the Mitigation Controller (MitC). MitC is a state-of-the-art tool that can assist project managers to have a full grip on the progress of their running construction projects. It takes as input a complete project schedule and returns several outputs that help the project manager take actions to prevent potential delays.
1211

13-
The source code was developed and tested with MATLAB R2019a.
12+
The source code was developed and tested with MATLAB R2019a and R2020b.
1413

1514
Work done by:
1615

@@ -21,7 +20,6 @@ Work done by:
2120
* Ruud Binnekamp: Concept development and supervision
2221

2322
## Installation
24-
2523
* Download the reposity as a zip file. For the latest release, please check [releases page](https://github.com/mitigation-controller/mitc/releases) for available downloads.
2624
* Extract the zip archive on your computer.
2725

@@ -39,19 +37,20 @@ User does not have access to MATLAB:
3937
* Run the installed application.
4038

4139
## User documentation
42-
[User documentation](https://github.com/mitigation-controller/mitc/tree/main/doc/User_Manual.md)
40+
For a detailed explanation about installing and using the software, please look at out [user documentation](https://github.com/mitigation-controller/mitc/tree/main/doc/User_Manual.md).
4341

4442
## Did you find a bug or have a feature request?
45-
Excellent, please let us know by creating a new issue using the appropriate [templates](https://github.com/mitigation-controller/mitc/issues/new/choose).
43+
Excellent, please have a look at our contribution [guidelines](https://github.com/mitigation-controller/mitc/blob/main/CONTRIBUTING.md).
4644

4745
## Contributing
48-
You are welcome to contribute as developer to the code via pull requests.
46+
You are welcome to contribute as developer to the code via pull requests. Please look at the contribution [guidelines](https://github.com/mitigation-controller/mitc/blob/main/CONTRIBUTING.md).
47+
4948
#### Prerequisites:
5049
* MATLAB 2019a or higher.
5150
* The _Optimization Toolbox_ , _Statistics and Machine Learning Toolbox_, and _Application Compiler_.
5251

5352
#### Installation
54-
* Download the MitC repository from via the terminal:
53+
* Download the MitC repository from via a terminal:
5554
`git clone https://github.com/mitigation-controller/mitc.git`
5655
* All source code can be found in the mitc directory.
5756

codecov.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ignore:
2+
- "mitc/run_tests.m"
3+
- "mitc/bin/randraw.m"

data/Case study 1.xlsx

98.6 KB
Binary file not shown.
99.2 KB
Binary file not shown.

data/Case study 2 correlation.xlsx

99.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)