Skip to content

Commit 8b67c56

Browse files
committed
Merge branch 'dev'
2 parents 63927d0 + 213a2ed commit 8b67c56

256 files changed

Lines changed: 43266 additions & 413 deletions

File tree

Some content is hidden

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

.github/workflows/pythonapp.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/pythonapp_push.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,16 @@ jobs:
66
build:
77

88
runs-on: ubuntu-latest
9+
strategy:
10+
matrix:
11+
python-version: ['3.6', '3.7', '3.8', '3.9']
912

1013
steps:
1114
- uses: actions/checkout@master
12-
- name: Set up Python 3.7
13-
uses: actions/setup-python@master
15+
- name: Set up Python ${{ matrix.python-version }}
16+
uses: actions/setup-python@v2
1417
with:
15-
python-version: 3.7
18+
python-version: ${{ matrix.python-version }}
1619
- name: Install dependencies
1720
run: |
1821
python -m pip install --upgrade pip

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,11 @@ build/
99
moead_framework.egg-info/
1010

1111
dist/
12+
13+
.coverage
14+
15+
coverage.xml
16+
17+
docs/doctrees/
18+
docs/.buildinfo
19+
docs/.DS_Store

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,34 @@
22

33
[![status](https://joss.theoj.org/papers/a81ea21d0358e013000b0b3b926bd4ba/status.svg)](https://joss.theoj.org/papers/a81ea21d0358e013000b0b3b926bd4ba)
44
[![Python application](https://github.com/moead-framework/framework/workflows/Python%20application/badge.svg?branch=master)](https://github.com/moead-framework/framework/actions?query=workflow%3A%22Python+application%22)
5+
[![codecov](https://codecov.io/gh/moead-framework/framework/branch/master/graph/badge.svg?token=J7MAU5E6BB)](https://codecov.io/gh/moead-framework/framework)
56
[![PyPI](https://img.shields.io/pypi/v/moead-framework)](https://pypi.org/project/moead-framework/)
67
[![GitHub](https://img.shields.io/github/license/moead-framework/framework?style=flat)](https://github.com/moead-framework/framework/blob/master/LICENCE)
78

89
This python package *moead-framework* is a modular framework for multi-objective evolutionary algorithms by decomposition.
910
The goal is to provide a modular framework for scientists and researchers interested in
1011
experimenting with MOEA/D and its numerous variants.
1112

12-
The documentation is available here: [https://moead-framework.github.io/documentation/](https://moead-framework.github.io/documentation/html/index.html) and can be edited on this repository: [https://github.com/moead-framework/documentation](https://github.com/moead-framework/documentation).
13+
The documentation is available here: [https://moead-framework.github.io/framework/](https://moead-framework.github.io/framework/html/index.html) and can be edited in the folder docs of this repository.
1314

1415
# Installation instructions
1516

1617
Create a virtual environment with [conda](https://docs.conda.io/en/latest/miniconda.html) or [virtualenv](https://packaging.python.org/guides/installing-using-pip-and-virtual-environments/#creating-a-virtual-environment)
1718

18-
The package is available in pypi, you can install it with:
19+
The package is available in pypi with a linux environment for python 3.6, 3.7, 3.8 and 3.9, you can install it with:
1920

2021
pip install moead-framework
2122

2223
# Example
2324

24-
from moead_framework.aggregation.tchebycheff import Tchebycheff
25-
from moead_framework.algorithm.combinatorial.moead import Moead
26-
from moead_framework.problem.combinatorial.rmnk import Rmnk
25+
from moead_framework.aggregation import Tchebycheff
26+
from moead_framework.algorithm.combinatorial import Moead
27+
from moead_framework.problem.combinatorial import Rmnk
2728
from moead_framework.tool.result import save_population
2829

2930

3031
###############################
31-
# Init the problem #
32+
# Initialize the problem #
3233
###############################
3334
# The file is available here : https://github.com/moead-framework/data/blob/master/problem/RMNK/Instances/rmnk_0_2_100_1_0.dat
3435
# Others instances are available here : https://github.com/moead-framework/data/tree/master/problem/RMNK/Instances

docs/.nojekyll

Whitespace-only changes.

docs/Makefile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Minimal makefile for Sphinx documentation
2+
#
3+
4+
# You can set these variables from the command line, and also
5+
# from the environment for the first two.
6+
SPHINXOPTS ?=
7+
SPHINXBUILD ?= sphinx-build
8+
SOURCEDIR = .
9+
BUILDDIR = .
10+
11+
# Put it first so that "make" without argument is like "make help".
12+
help:
13+
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
14+
15+
.PHONY: help Makefile
16+
17+
# Catch-all target: route all unknown targets to Sphinx using the new
18+
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
19+
%: Makefile
20+
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/_static/custom_theme.css

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/* This file intentionally left blank. */
2+
.wy-nav-content {
3+
max-width: inherit;
4+
}
5+
6+
.wy-menu-vertical li.toctree-l3 span.toctree-expand, .wy-menu-vertical li.current > a span.toctree-expand{
7+
display: none;
8+
}
9+
10+
.wy-menu-vertical li.toctree-l4{
11+
display: none;
12+
}
13+
.wy-body-for-nav .wy-nav-content-wrap a:visited {
14+
color: #2980B9;
15+
}

docs/api.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.. _components:
2+
3+
Library Reference
4+
===========================================
5+
6+
.. toctree::
7+
:maxdepth: 2
8+
9+
main_components
10+
other_components

docs/conf.py

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# Configuration file for the Sphinx documentation builder.
2+
#
3+
# This file only contains a selection of the most common options. For a full
4+
# list see the documentation:
5+
# https://www.sphinx-doc.org/en/master/usage/configuration.html
6+
7+
# -- Path setup --------------------------------------------------------------
8+
9+
# If extensions (or modules to document with autodoc) are in another directory,
10+
# add these directories to sys.path here. If the directory is relative to the
11+
# documentation root, use os.path.abspath to make it absolute, like shown here.
12+
#
13+
import os
14+
import sys
15+
sys.path.insert(0, os.path.abspath('../'))
16+
17+
18+
# -- Project information -----------------------------------------------------
19+
20+
project = 'The Moead Framework'
21+
copyright = '2021, Geoffrey Pruvost'
22+
author = 'Geoffrey Pruvost'
23+
24+
# The full version, including alpha/beta/rc tags
25+
release = '1.0'
26+
27+
28+
# -- General configuration ---------------------------------------------------
29+
30+
# Add any Sphinx extension module names here, as strings. They can be
31+
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
32+
# ones.
33+
extensions = [
34+
'sphinxcontrib.bibtex',
35+
'sphinx.ext.autodoc',
36+
'sphinx.ext.doctest',
37+
'sphinx.ext.coverage',
38+
'sphinx.ext.napoleon',
39+
'sphinx.ext.autosummary',
40+
'sphinx.ext.viewcode',
41+
'sphinx.ext.coverage',
42+
'sphinx.ext.intersphinx',
43+
]
44+
45+
# Add any paths that contain templates here, relative to this directory.
46+
templates_path = ['_templates']
47+
48+
# List of patterns, relative to source directory, that match files and
49+
# directories to ignore when looking for source files.
50+
# This pattern also affects html_static_path and html_extra_path.
51+
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
52+
53+
autosummary_generate = True
54+
autodoc_default_flags = ['class', 'members', 'inherited-members', 'show-inheritance']
55+
autodoc_member_order = 'groupwise'
56+
57+
# -- Options for HTML output -------------------------------------------------
58+
59+
# The theme to use for HTML and HTML Help pages. See the documentation for
60+
# a list of builtin themes.
61+
#
62+
#html_theme = 'alabaster'
63+
html_theme = "sphinx_rtd_theme"
64+
65+
# Add any paths that contain custom static files (such as style sheets) here,
66+
# relative to this directory. They are copied after the builtin static files,
67+
# so a file named "default.css" will overwrite the builtin "default.css".
68+
html_static_path = ['_static']
69+
70+
html_css_files = [
71+
'custom_theme.css',
72+
]

docs/contributing.rst

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Contributing
3+
===========================================
4+
5+
When contributing to this project, please first discuss the change you wish to make via issue,
6+
email, or any other method with the owners of this repository before making a change.
7+
8+
Please note we have a code of conduct, please follow it in all your interactions with the project.
9+
10+
Pull Request Process
11+
________________________________
12+
13+
1. Ensure any install or build dependencies are removed before the end of the layer when doing a
14+
build.
15+
2. Update the README.md with details of changes to the interface, this includes new environment
16+
variables, exposed ports, useful file locations and container parameters.
17+
3. Update the documentation with a new Pull Request on the repository https://github.com/moead-framework/documentation.
18+
4. Don't forget to add unit tests.
19+
5. Create a new branch and a Pull Request to merge your work on the **dev** branch of the project.
20+
21+
22+
Code of Conduct
23+
________________________________
24+
25+
The code of conduct is available here: https://github.com/moead-framework/framework/blob/master/CODE_OF_CONDUCT.md.

0 commit comments

Comments
 (0)