Skip to content

Commit

Permalink
Merge pull request #87 from mitigation-controller/release_0.2.0
Browse files Browse the repository at this point in the history
Release 0.2.0
  • Loading branch information
omarkamouh authored Jul 12, 2021
2 parents 466f4ef + 880cd57 commit e7b7094
Show file tree
Hide file tree
Showing 100 changed files with 1,977 additions and 1,469 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/ci_matlab.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Matlab tests
on: push
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: matlab-actions/setup-matlab@v0
with:
release: R2020b
- uses: matlab-actions/run-tests@v0
with:
source-folder: mitc
code-coverage-cobertura: coverage.xml
- uses: codecov/codecov-action@v1
with:
file: coverage.xml
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@

# Results subdirectories
/Results/*/

# Code coverage results
/tests/Reports/
27 changes: 23 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,32 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.2.0] - 2021-07-12

### Fixed
- Fix `remove_missing.m` to check for data type "missing"

### Added
- Testing environment coupled with GitHub actions and Codecov
- Penalty/incentive functionality
- Add verification of project data

### Changed
- Update GUI layout to include penalty/incentive
- Update GUI with document and feedback buttons
- Update GUI to show T_orig
- Update GUI to verify raw data
- Update messages and errors
- General code refactoring

## [0.1.1] - 2021-01-18

## Fixed
### Fixed
- Issue with missing T_pl in `select_critical_path.m`

## [0.1.0] - 2020-12-18

## Added
### Added

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

## Changed
### Changed
- Restructured repository directories
- Create modular code base to make it callable by GUI

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

- This is the initial version of mitc.

-
[0.2.0]: https://github.com/mitigation-controller/mitc/releases/tag/0.2.0
[0.1.1]: https://github.com/mitigation-controller/mitc/releases/tag/0.1.1
[0.1.0]: https://github.com/mitigation-controller/mitc/releases/tag/0.1.0
[0.0.1]: https://github.com/mitigation-controller/mitc/releases/tag/0.0.1
61 changes: 61 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Contributing guidelines

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/).

A contribution can be one of the following cases:

1. you have a question;
1. you think you may have found a bug (including unexpected behavior);
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);
1. you want to make a new release of the code base.

The sections below outline the steps in each case.

## You have a question

1. use the search functionality [here](https://github.com/mitigation-controller/mitc/issues) to see if someone already filed the same issue;
1. if your issue search did not yield any relevant results, make a new issue;
1. apply the "Question" label; apply other labels when relevant.

## You think you may have found a bug

1. use the search functionality [here](https://github.com/mitigation-controller/mitc/issues) to see if someone already filed the same issue;
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:
- make use of the bug report template;
- the [SHA hashcode](https://help.github.com/articles/autolinked-references-and-urls/#commit-shas) of the commit that is causing your problem;
- some identifying information (name and version number) for dependencies you're using;
- information about the operating system;
1. apply relevant labels to the newly created issue.

## You want to make some kind of change to the code base

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;
1. (**important**) wait until some kind of consensus is reached about your idea being a good idea;
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/));
1. we make use of the Gitflow branching method, see [here](https://github.com/mitigation-controller/mitc/wiki/Branch-Management)
1. make sure the existing tests still work by running `run_tests.m`;
1. add your own tests (if necessary);
1. update or expand the documentation;
1. update the `CHANGELOG.md` file with change;
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;
1. create the pull request to the `dev` branch, e.g. following the instructions [here](https://help.github.com/articles/creating-a-pull-request/).

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.

## You want to make a new release of the code base

To create release you need write permission on the repository.

1. Create a release branch from the dev branch.
1. Check author list in `citation.cff` and `.zenodo.json` files
1. Follow the compiling and packaging steps described [here](https://github.com/mitigation-controller/mitc/wiki/Compile-and-package)
1. Update the `CHANGELOG.md` to include changes made
1. Follow the steps [here](https://github.com/mitigation-controller/mitc/wiki/Compile-and-package) to package and compile the application.
1. Goto [GitHub release page](https://github.com/mitigation-controller/mitc/releases)
1. Press draft a new release button
1. Fill version, title and description field
1. Press the Publish Release button

A Zenodo entry will be made for the release with its own DOI.

These contributing guidelines are based on the description in this [repository](https://github.com/matchms/matchms/blob/master/CONTRIBUTING.md)
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [2020] [TU Delft]
Copyright [2020] [Technische Universiteit Delft]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
17 changes: 8 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@
<img width="500" src=doc/MitC_logo.png>
</p>

_The MitC software is currently under development and in a pre-release state._

![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/mitigation-controller/mitc?include_prereleases)
![GitHub](https://img.shields.io/github/license/mitigation-controller/mitc)
[![DOI](https://zenodo.org/badge/307504138.svg)](https://zenodo.org/badge/latestdoi/307504138)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4507337.svg)](https://doi.org/10.5281/zenodo.4507337)
[![codecov](https://codecov.io/gh/mitigation-controller/mitc/branch/main/graph/badge.svg?token=9OZ7V9WWY2)](https://codecov.io/gh/mitigation-controller/mitc)

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.

The source code was developed and tested with MATLAB R2019a.
The source code was developed and tested with MATLAB R2019a and R2020b.

Work done by:

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

## Installation

* 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.
* Extract the zip archive on your computer.

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

## User documentation
[User documentation](https://github.com/mitigation-controller/mitc/tree/main/doc/User_Manual.md)
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).

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

## Contributing
You are welcome to contribute as developer to the code via pull requests.
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).

#### Prerequisites:
* MATLAB 2019a or higher.
* The _Optimization Toolbox_ , _Statistics and Machine Learning Toolbox_, and _Application Compiler_.

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

Expand Down
3 changes: 3 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ignore:
- "mitc/run_tests.m"
- "mitc/bin/randraw.m"
Binary file added data/Case study 1.xlsx
Binary file not shown.
Binary file added data/Case study 2 No correlation.xlsx
Binary file not shown.
Binary file added data/Case study 2 correlation.xlsx
Binary file not shown.
Binary file removed data/Case study.xlsx
Binary file not shown.
Binary file removed doc/Capture.PNG
Binary file not shown.
Binary file added doc/GUI_screenshot_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e7b7094

Please sign in to comment.