Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
ljvmiranda921 committed Feb 10, 2019
2 parents fe1ffee + f831652 commit 3a14e43
Show file tree
Hide file tree
Showing 2 changed files with 165 additions and 11 deletions.
152 changes: 152 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
{
"projectName": "pyswarms",
"projectOwner": "ljvmiranda921",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
"README.md"
],
"imageSize": 100,
"commit": false,
"contributors": [
{
"login": "whzup",
"name": "Aaron",
"avatar_url": "https://avatars3.githubusercontent.com/u/39431903?v=4",
"profile": "https://github.com/whzup",
"contributions": [
"maintenance",
"code",
"doc",
"test",
"ideas",
"review"
]
},
{
"login": "Carl-K",
"name": "Carl-K",
"avatar_url": "https://avatars2.githubusercontent.com/u/13661469?v=4",
"profile": "https://github.com/Carl-K",
"contributions": [
"code",
"test"
]
},
{
"login": "SioKCronin",
"name": "Siobhán K Cronin",
"avatar_url": "https://avatars2.githubusercontent.com/u/19956669?v=4",
"profile": "http://www.siobhankcronin.com/",
"contributions": [
"code",
"maintenance",
"ideas"
]
},
{
"login": "jazcap53",
"name": "Andrew Jarcho",
"avatar_url": "https://avatars3.githubusercontent.com/u/1452951?v=4",
"profile": "http://andrewjarcho.com",
"contributions": [
"test",
"code"
]
},
{
"login": "mamadyonline",
"name": "Mamady",
"avatar_url": "https://avatars1.githubusercontent.com/u/20543370?v=4",
"profile": "https://github.com/mamadyonline",
"contributions": [
"code"
]
},
{
"login": "jayspeidell",
"name": "Jay Speidell",
"avatar_url": "https://avatars3.githubusercontent.com/u/26357788?v=4",
"profile": "https://github.com/jayspeidell",
"contributions": [
"code"
]
},
{
"login": "slek120",
"name": "Eric",
"avatar_url": "https://avatars2.githubusercontent.com/u/3589574?v=4",
"profile": "https://github.com/slek120",
"contributions": [
"bug",
"code"
]
},
{
"login": "CPapadim",
"name": "CPapadim",
"avatar_url": "https://avatars1.githubusercontent.com/u/13984473?v=4",
"profile": "https://github.com/CPapadim",
"contributions": [
"bug",
"code"
]
},
{
"login": "dfhljf",
"name": "JiangHui",
"avatar_url": "https://avatars1.githubusercontent.com/u/7887642?v=4",
"profile": "https://github.com/dfhljf",
"contributions": [
"code"
]
},
{
"login": "nik1082",
"name": "Jericho Arcelao",
"avatar_url": "https://avatars3.githubusercontent.com/u/17260188?v=4",
"profile": "https://github.com/nik1082",
"contributions": [
"code"
]
},
{
"login": "jdbohrman",
"name": "James D. Bohrman",
"avatar_url": "https://avatars2.githubusercontent.com/u/27848025?v=4",
"profile": "http://www.jdbohrman.xyz",
"contributions": [
"code"
]
},
{
"login": "bradahoward",
"name": "bradahoward",
"avatar_url": "https://avatars2.githubusercontent.com/u/24660861?v=4",
"profile": "https://github.com/bradahoward",
"contributions": [
"code"
]
},
{
"login": "ThomasCES",
"name": "ThomasCES",
"avatar_url": "https://avatars2.githubusercontent.com/u/18325841?v=4",
"profile": "https://github.com/ThomasCES",
"contributions": [
"code"
]
},
{
"login": "danielcorreia96",
"name": "Daniel Correia",
"avatar_url": "https://avatars0.githubusercontent.com/u/17486065?v=4",
"profile": "https://github.com/danielcorreia96",
"contributions": [
"bug",
"code"
]
}
],
"contributorsPerLine": 7
}
24 changes: 13 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -277,17 +277,6 @@ This project was inspired by the [pyswarm] module that performs PSO with
constrained support. The package was created with [Cookiecutter] and the
[`audreyr/cookiecutter-pypackage`] project template.

This is currently maintained by Lester James V. Miranda with other helpful
contributors:

* Carl-K ([`@Carl-K`](https://github.com/Carl-K))
* Siobhán Cronin ([`@SioKCronin`](https://github.com/SioKCronin))
* Andrew Jarcho ([`@jazcap53`](https://github.com/jazcap53))
* Charalampos Papadimitriou ([`@CPapadim`](https://github.com/CPapadim))
* Mamady Nabé ([`@mamadyonline`](https://github.com/mamadyonline))
* Erik ([`@slek120`](https://github.com/slek120))
* Thomas ([`@ThomasCES`](https://github.com/ThomasCES))

[pyswarm]: https://github.com/tisimst/pyswarm
[Cookiecutter]: https://github.com/audreyr/cookiecutter
[`audreyr/cookiecutter-pypackage`]: https://github.com/audreyr/cookiecutter-pypackage
Expand Down Expand Up @@ -322,3 +311,16 @@ Not on the list? Ping us in the Issue Tracker!
Like it? Love it? Leave us a star on [Github] to show your appreciation!

[Github]: https://github.com/ljvmiranda921/pyswarms

## Contributors

Thanks goes to these wonderful people ([emoji key](https://github.com/all-contributors/all-contributors#emoji-key)):

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore -->
| [<img src="https://avatars0.githubusercontent.com/u/17486065?v=4" width="100px;" alt="Daniel Correia"/><br /><sub><b>Daniel Correia</b></sub>](https://github.com/danielcorreia96)<br />[🐛](https://github.com/ljvmiranda921/pyswarms/issues?q=author%3Adanielcorreia96 "Bug reports") [💻](https://github.com/ljvmiranda921/pyswarms/commits?author=danielcorreia96 "Code") | [<img src="https://avatars3.githubusercontent.com/u/39431903?v=4" width="100px;" alt="Aaron"/><br /><sub><b>Aaron</b></sub>](https://github.com/whzup)<br />[🚧](#maintenance-whzup "Maintenance") [💻](https://github.com/ljvmiranda921/pyswarms/commits?author=whzup "Code") [📖](https://github.com/ljvmiranda921/pyswarms/commits?author=whzup "Documentation") [⚠️](https://github.com/ljvmiranda921/pyswarms/commits?author=whzup "Tests") [🤔](#ideas-whzup "Ideas, Planning, & Feedback") [👀](#review-whzup "Reviewed Pull Requests") | [<img src="https://avatars2.githubusercontent.com/u/13661469?v=4" width="100px;" alt="Carl-K"/><br /><sub><b>Carl-K</b></sub>](https://github.com/Carl-K)<br />[💻](https://github.com/ljvmiranda921/pyswarms/commits?author=Carl-K "Code") [⚠️](https://github.com/ljvmiranda921/pyswarms/commits?author=Carl-K "Tests") | [<img src="https://avatars2.githubusercontent.com/u/19956669?v=4" width="100px;" alt="Siobhán K Cronin"/><br /><sub><b>Siobhán K Cronin</b></sub>](http://www.siobhankcronin.com/)<br />[💻](https://github.com/ljvmiranda921/pyswarms/commits?author=SioKCronin "Code") [🚧](#maintenance-SioKCronin "Maintenance") [🤔](#ideas-SioKCronin "Ideas, Planning, & Feedback") | [<img src="https://avatars3.githubusercontent.com/u/1452951?v=4" width="100px;" alt="Andrew Jarcho"/><br /><sub><b>Andrew Jarcho</b></sub>](http://andrewjarcho.com)<br />[⚠️](https://github.com/ljvmiranda921/pyswarms/commits?author=jazcap53 "Tests") [💻](https://github.com/ljvmiranda921/pyswarms/commits?author=jazcap53 "Code") | [<img src="https://avatars1.githubusercontent.com/u/20543370?v=4" width="100px;" alt="Mamady"/><br /><sub><b>Mamady</b></sub>](https://github.com/mamadyonline)<br />[💻](https://github.com/ljvmiranda921/pyswarms/commits?author=mamadyonline "Code") | [<img src="https://avatars3.githubusercontent.com/u/26357788?v=4" width="100px;" alt="Jay Speidell"/><br /><sub><b>Jay Speidell</b></sub>](https://github.com/jayspeidell)<br />[💻](https://github.com/ljvmiranda921/pyswarms/commits?author=jayspeidell "Code") |
| :---: | :---: | :---: | :---: | :---: | :---: | :---: |
| [<img src="https://avatars2.githubusercontent.com/u/3589574?v=4" width="100px;" alt="Eric"/><br /><sub><b>Eric</b></sub>](https://github.com/slek120)<br />[🐛](https://github.com/ljvmiranda921/pyswarms/issues?q=author%3Aslek120 "Bug reports") [💻](https://github.com/ljvmiranda921/pyswarms/commits?author=slek120 "Code") | [<img src="https://avatars1.githubusercontent.com/u/13984473?v=4" width="100px;" alt="CPapadim"/><br /><sub><b>CPapadim</b></sub>](https://github.com/CPapadim)<br />[🐛](https://github.com/ljvmiranda921/pyswarms/issues?q=author%3ACPapadim "Bug reports") [💻](https://github.com/ljvmiranda921/pyswarms/commits?author=CPapadim "Code") | [<img src="https://avatars1.githubusercontent.com/u/7887642?v=4" width="100px;" alt="JiangHui"/><br /><sub><b>JiangHui</b></sub>](https://github.com/dfhljf)<br />[💻](https://github.com/ljvmiranda921/pyswarms/commits?author=dfhljf "Code") | [<img src="https://avatars3.githubusercontent.com/u/17260188?v=4" width="100px;" alt="Jericho Arcelao"/><br /><sub><b>Jericho Arcelao</b></sub>](https://github.com/nik1082)<br />[💻](https://github.com/ljvmiranda921/pyswarms/commits?author=nik1082 "Code") | [<img src="https://avatars2.githubusercontent.com/u/27848025?v=4" width="100px;" alt="James D. Bohrman"/><br /><sub><b>James D. Bohrman</b></sub>](http://www.jdbohrman.xyz)<br />[💻](https://github.com/ljvmiranda921/pyswarms/commits?author=jdbohrman "Code") | [<img src="https://avatars2.githubusercontent.com/u/24660861?v=4" width="100px;" alt="bradahoward"/><br /><sub><b>bradahoward</b></sub>](https://github.com/bradahoward)<br />[💻](https://github.com/ljvmiranda921/pyswarms/commits?author=bradahoward "Code") | [<img src="https://avatars2.githubusercontent.com/u/18325841?v=4" width="100px;" alt="ThomasCES"/><br /><sub><b>ThomasCES</b></sub>](https://github.com/ThomasCES)<br />[💻](https://github.com/ljvmiranda921/pyswarms/commits?author=ThomasCES "Code") |
<!-- ALL-CONTRIBUTORS-LIST:END -->

This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

0 comments on commit 3a14e43

Please sign in to comment.