Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
4532612
cleanup
systemallica May 13, 2020
d01ef9b
cleanup
systemallica May 13, 2020
affd192
cleanup
systemallica May 13, 2020
b46e3e3
docs and cleanup
systemallica May 13, 2020
88ac8a3
typo
systemallica May 13, 2020
d109fbe
cleanup and begin morfist implementation
systemallica May 13, 2020
06d2846
get default config + update categorical idx
systemallica May 13, 2020
23c5c28
fix: config
systemallica May 13, 2020
89a17c2
some more work into implementing morfist
systemallica May 14, 2020
d2fcab8
some morfist advancements
systemallica May 14, 2020
f9a6fde
updated selection algorithm
systemallica May 14, 2020
8d3c2b1
cleanup
systemallica May 14, 2020
6f1753a
updated induction algorithm
systemallica May 15, 2020
c486380
cleanup
systemallica May 15, 2020
3b3fd8b
cleanup
systemallica May 15, 2020
0c08e41
test
systemallica May 15, 2020
a28fc90
updated CanonicalModel
systemallica May 15, 2020
79e8924
refacto
systemallica May 15, 2020
ca48dc6
rename old inference algorithm
systemallica May 15, 2020
1e7a555
fix some dask-related old code
systemallica May 16, 2020
fa7c834
update main test
systemallica May 16, 2020
eb89d22
refacto
systemallica May 16, 2020
c71cc88
refacto vector_prediction
systemallica May 16, 2020
e430eae
refacto inference
systemallica May 16, 2020
7f0b860
update dependencies
systemallica May 18, 2020
d4f53e0
improve readability
systemallica May 18, 2020
bd5ac9f
update mixed algorithm initialization + update test + update requirem…
systemallica Jul 13, 2020
90c227f
docs and cleanup
systemallica Jul 13, 2020
3b280e5
update requirements
systemallica Jul 13, 2020
820de7b
delete unused prediction file and rename vector_prediction
systemallica Jul 13, 2020
5e351d8
improve readability
systemallica Jul 13, 2020
705f0e8
Merge branch 'master' of https://github.com/eliavw/mercs into merge-e…
systemallica Jul 13, 2020
d6e33d9
Merge branch 'merge-eliavw' into dev
systemallica Jul 13, 2020
5179870
fix: typo
systemallica Jul 13, 2020
e0ea70b
docs
systemallica Jul 13, 2020
4ebb14b
fix: regression introduced with last merge
systemallica Jul 13, 2020
8cc89ac
fix: initialization
systemallica Jul 13, 2020
63f9991
fix warnings + readability improvements
systemallica Jul 13, 2020
57bbc81
docs
systemallica Jul 14, 2020
811aef9
fix: CanonicalModel mixed classes + readability inference
systemallica Jul 14, 2020
d95a015
remove duplicated CompositeModel + improve some docs
systemallica Jul 20, 2020
5b92685
docs: legacy inference
systemallica Jul 20, 2020
0c3b2c7
docs + glossary
systemallica Jul 20, 2020
67f3a11
docs
systemallica Jul 20, 2020
8cf4453
found root of the problem
systemallica Jul 20, 2020
2fc87ae
remove unused legacy code
systemallica Jul 20, 2020
e76b585
fix: mix -> mixed
systemallica Jul 20, 2020
5fc2e90
updated project files + moved graphviz
systemallica Jul 20, 2020
03513fb
removed even more unused code
systemallica Jul 20, 2020
87c9324
cleanup
systemallica Jul 21, 2020
98167fc
fix: select nominal (inference)
systemallica Jul 21, 2020
d004200
cleanup
systemallica Jul 21, 2020
86ff90d
Merge pull request #1 from systemallica/dev
systemallica Jul 21, 2020
54fc487
move test dir + new tests for mixed trees
systemallica Jul 22, 2020
f11b21c
update dependencies
systemallica Jul 22, 2020
c1159fe
add poetry as dependency manager + update dependencies
systemallica Jul 22, 2020
6579262
fix: imports
systemallica Jul 22, 2020
c98571a
Merge pull request #3 from systemallica/dev
systemallica Jul 22, 2020
c1f4b9b
corrections
systemallica Jul 22, 2020
24f4163
Merge pull request #4 from systemallica/dev
systemallica Jul 22, 2020
4fdd7fd
fix: param
systemallica Jul 23, 2020
f4d516d
update morfist
systemallica Jul 24, 2020
50f430e
update morfist@0.1.5
systemallica Jul 24, 2020
418b107
update import strategy
systemallica Jul 25, 2020
677703a
restore show_q_diagram
systemallica Jul 25, 2020
7380456
new and streamlined deployment strategy
systemallica Jul 25, 2020
10d0d32
Create python-app.yml
systemallica Jul 25, 2020
8a12d38
Update python-app.yml
systemallica Jul 25, 2020
2d87e29
Merge pull request #5 from systemallica/dev
systemallica Jul 25, 2020
70797e1
add missing dependencies
systemallica Jul 25, 2020
3e83855
fix: docs
systemallica Jul 25, 2020
1307c41
remove mkdocs build output from repo
systemallica Jul 25, 2020
3153ac3
publish on PyPi
systemallica Jul 25, 2020
d6afe23
update README.md
systemallica Jul 25, 2020
ffbd912
update README.md
systemallica Jul 25, 2020
a49f281
0.0.43
systemallica Jul 25, 2020
377abee
0.0.44
systemallica Jul 25, 2020
3c69028
Update python-app.yml
systemallica Jul 25, 2020
80914c1
remove .vscode from repository
systemallica Jul 25, 2020
804901f
simplified m_codes generation
systemallica Jul 26, 2020
2572576
remove jupyter notebooks from repo
systemallica Jul 30, 2020
0666f78
update dependencies
systemallica Aug 6, 2020
a43ac19
add data
systemallica Aug 10, 2020
1b07dd5
update morfist
systemallica Aug 10, 2020
f729217
delete unnecessary data + add missing datasets
systemallica Aug 16, 2020
1513638
update dependencies
systemallica Aug 16, 2020
0399399
more data refinements
systemallica Aug 16, 2020
33e11c8
data pre-procesising
systemallica Aug 16, 2020
c08ce19
fix: mixed model scoring
systemallica Aug 16, 2020
2a52f5d
improvement: classification target detection
systemallica Aug 16, 2020
a231c73
update morfist@0.3.2
systemallica Aug 16, 2020
956e0fb
fix: nrmse calculation
systemallica Aug 16, 2020
98ec341
data pre-processing
systemallica Aug 16, 2020
4b114e2
improve readability of inference.py + remove print that was added by …
systemallica Aug 16, 2020
c0f038c
update morfist@0.3.3
systemallica Aug 16, 2020
f3a5a31
fix: label detection
systemallica Aug 16, 2020
d32d285
add: evaluation metrics
systemallica Aug 16, 2020
4615e18
add: tests for hear and sf1 datasets
systemallica Aug 16, 2020
77c60f5
add: tests for wine and auto datasets
systemallica Aug 16, 2020
0682ea7
fix: tests
systemallica Aug 16, 2020
f18b4b0
0.0.45
systemallica Aug 16, 2020
19ec2fd
add: test for student dataset
systemallica Aug 16, 2020
39e9996
update docs
systemallica Aug 17, 2020
38dc019
update docs
systemallica Aug 17, 2020
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
42 changes: 42 additions & 0 deletions .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# This workflow will install Python dependencies, run tests and lint with a single version of Python
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: MERCS

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install Poetry
uses: dschep/install-poetry-action@v1.3
with:
# Use the preview version of Poetry
preview: false
- name: Install dependencies
run: |
poetry install
python3 -m pip install --upgrade pip
pip install flake8 pytest
python -m pip install "dask[complete]"
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest
run: |
pytest
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Notebooks
.ipynb_checkpoints
*/ipynb_checkpoints/*
note/

#Models
*/*.pkl
Expand Down Expand Up @@ -36,3 +37,10 @@ MANIFEST

# Sphinx documentation
docs/_build/

# mkdocs build
site/

# VSCode config
.vscode
.DS_Store
27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

114 changes: 0 additions & 114 deletions .vscode/.ropeproject/config.py

This file was deleted.

Binary file removed .vscode/.ropeproject/objectdb
Binary file not shown.
4 changes: 0 additions & 4 deletions .vscode/settings.json

This file was deleted.

1 change: 1 addition & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ Contributors
============

* Elia vw <elia.vw@gmail.com>
* Andrés Reverón Molina <andres@reveronmolina.me>
23 changes: 19 additions & 4 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,24 @@
Changelog
=========

Version 0.1
Version 0.0.45
===========

- Feature A added
- FIX: nasty bug #1729 fixed
- add your changes here!
- Added tests on several datasets
- Fixed label detection
- Fixed nrmse calculation
- Fixed target detection
- Fixed mixed model scoring
- Updated decision-tree-morfist@0.3.3

Version 0.0.44
===========

- Added the option to work with mixed(regression and classification) tasks
- Removed unused code
- General cleanup

Version 0.0.37
===========

- Initial version
21 changes: 10 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,23 @@ MERCS stands for **multi-directional ensembles of classification and regression

## Installation

Easy via pip;
Easy via pip:

```
pip install mercs
```

## Website
## Documentation

Our (very small) website can be found [here](https://eliavw.github.io/mercs/).
All the documentation and a quickstart guide can be accessed here:
[https://eliavw.github.io/mercs/](https://eliavw.github.io/mercs/)

## Run/Build locally
To run the project, you need [Poetry](https://python-poetry.org). Once installed:

## Tutorials

Cf. the [quickstart section](https://eliavw.github.io/mercs/quickstart) of the website.

## Code

MERCS is fully open-source cf. our [github-repository](https://github.com/eliavw/mercs/)
1. Clone the repository.
2. Run `poetry install`.
3. The development environment is ready. You can test it by running `pytest`.

## Publications

Expand All @@ -45,4 +44,4 @@ People involved in this project:
* [Elia Van Wolputte](https://eliavw.github.io/)
* Evgeniya Korneva
* [Prof. Hendrik Blockeel](https://people.cs.kuleuven.be/~hendrik.blockeel/)

* [Andrés Reverón Molina](https://andres.reveronmolina.me)
4 changes: 0 additions & 4 deletions config/.gitignore

This file was deleted.

Loading