Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement Genetic Algorithm #267

Closed
wants to merge 46 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
9fc0c06
added the genetic_algorithm from maria's fork
Lancasterwu Mar 8, 2019
3512c29
moved the location for generic_algorithm
Lancasterwu Mar 8, 2019
8a583c7
update the package settings
Lancasterwu Mar 8, 2019
41615bd
added reference and license
Lancasterwu Mar 8, 2019
1da2527
used black and chanegd the file name
Lancasterwu Mar 8, 2019
f8cbae1
reformated group_genetic
Lancasterwu Mar 9, 2019
7c6e59c
Fix import statements
Mar 11, 2019
812aa03
Edit the "FIXME" statement to pass pylint
Mar 11, 2019
6d23f3a
Add docstrings
Mar 11, 2019
a044a35
Fix len pylint error
Mar 11, 2019
03b97b4
Fix some indentation errors
Mar 11, 2019
5ea108e
Fix line lengths
Mar 11, 2019
ea84095
ran black to reformat
enpuyou Mar 11, 2019
9bc3f9a
fixed indentation
enpuyou Mar 11, 2019
e77ad52
disable too many local variables
enpuyou Mar 11, 2019
b38b1ba
Changed indentation
enpuyou Mar 11, 2019
3adfe80
ran black
enpuyou Mar 11, 2019
164c650
Fixed pylint error
enpuyou Mar 11, 2019
7b3ff36
Added ansicolors for the import
enpuyou Mar 11, 2019
ab34d4b
updated pipfile.lock
enpuyou Mar 11, 2019
fbba629
Added in workbook file from Maria's branch. the license is updated as…
enpuyou Mar 11, 2019
69fbd83
Ran black to reformat
enpuyou Mar 11, 2019
99d60c1
disable global
enpuyou Mar 11, 2019
e900a52
Add pandas a dev package for workbook
Mar 11, 2019
03aaadd
Add in the constants for workbook
Mar 11, 2019
7d2cc76
Fix import statements in workbook
Mar 11, 2019
c244d71
Change config to constants
Mar 11, 2019
7ee9429
Supress a linting error
Mar 11, 2019
9a93a41
Removed zip call, increased pylint rating
Mar 12, 2019
567f57f
installed numpy and fixed nested blocks, increased pylint rating.
Mar 12, 2019
fa52184
Added pylint disable statements.
Mar 12, 2019
105c041
Added more disable statements
Mar 12, 2019
39a644f
Finished implementing disable statements. Pylint passing.
Mar 12, 2019
67e2a21
fixed formatting errors.
Mar 12, 2019
f05ea4d
Merge branch 'master' into feature/genetic-algorithm
Lancasterwu Mar 14, 2019
b58b747
Remove workbook since it is not needed
Mar 14, 2019
f5e1541
Remove import statement that uses workbook
Mar 14, 2019
ab78a4d
Fixed pipfile
Lancasterwu Mar 14, 2019
90c8751
Use black to reformate group_genetic
Lancasterwu Mar 14, 2019
6ae8012
Merge branch 'master' into feature/genetic-algorithm
Lancasterwu Mar 14, 2019
b1daf25
Merge branch 'master' into feature/genetic-algorithm
Lancasterwu Mar 14, 2019
5c6369f
Start implementating genetic algorithm
ilikerustoo Mar 14, 2019
207dd12
Merge branch 'master' into feature/genetic-algorithm
Lancasterwu Mar 14, 2019
943caba
Merge branch 'master' into feature/genetic-algorithm
Lancasterwu Mar 15, 2019
9cd1709
Merge branch 'master' into feature/genetic-algorithm
Michionlion Mar 16, 2019
5f316e1
Merge branch 'master' into feature/genetic-algorithm
Lancasterwu Mar 17, 2019
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
26 changes: 26 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -672,3 +672,29 @@ may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.

Notice that `group_genetic.py` and `workbook.py` is from
https://github.com/yeeunmariakim/gatorgrouper/blob/master
under MIT license:

MIT License

Copyright (c) 2019 Maria Kim

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
3 changes: 3 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ mixer = "*"
pylint = "*"
mutmut = "*"
hypothesis = "*"
numpy = "*"
ansicolors = "*"
awsebcli = "*"

[packages]
Expand All @@ -25,6 +27,7 @@ py = "*"
django = "==2.1.5"
networkx = "*"
social-auth-app-django = "*"
pandas = "*"

[pipenv]
allow_prereleases = true
112 changes: 112 additions & 0 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions gatorgrouper/utils/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
ALGORITHM_ROUND_ROBIN = "rrobin"
ALGORITHM_RANDOM = "random"
ALGORITHM_GRAPH = "graph"
ALGORITHM_GENETIC = "genetic"
DEFAULT_METHOD = ALGORITHM_RANDOM
DEFAULT_ABSENT = ""
DEFAULT_PREFERENCES = None
Expand All @@ -18,3 +19,9 @@
# recognizer
EMPTY_STRING = ""
ERROR = "error:"

# Define configuration variables

DEFAULT_GROUP_SIZE = 2
WORKBOOK = "GatorGrouper_(Responses).csv"
# WORKBOOK_CSV = WORKBOOK.replace(" ", "_") + ".csv"
Loading