Add conflict handling to random algorithm#277

Merged

sutterj merged 54 commits intomasterfrom enhance/random-conflicts

Mar 22, 2019

+172-34

Commits on Feb 26, 2019

Added base functionality for conflict sorting in rrobin
livingstonp729
committed

Commits on Mar 5, 2019

Further edits to the round robin method
livingstonp729
committed

Commits on Mar 8, 2019

Added conflict_sorting function and asscociated test, still buggy
livingstonp729
committed

Commits on Mar 10, 2019

Commits on Mar 11, 2019

Refactoring of group_random_grouop_size
Tara Douglass
committed
Refactoring of group_random_group_size
Tara Douglass
committed
Added logic for multiple passes at grouping in group_random.py
shafferz
committed
Added logic for multiple passes at grouping in group_random.py

shafferz
and
livingstonp729
committed
Added conditional logic for storing top-scoring student group

shafferz
and
livingstonp729
committed
Stored and collected optimal group from average scoring

shafferz
and
livingstonp729
committed
Fixed broken test cases, added return call to group_random.py's _group_size function, and more!

committed
Code formatted with black, minimized pylint issues at this juncture

shafferz
and
livingstonp729
committed
Adding documentation

Tara Douglass
and
Spurrm
committed
Ensuring my branch is up-to-date

Tara Douglass
and
Spurrm
committed

Commits on Mar 12, 2019

Commits on Mar 15, 2019

Commits on Mar 16, 2019

Merge branch 'master' into enhance/random-conflicts
Michionlion
authored

Commits on Mar 17, 2019

Commits on Mar 18, 2019

Moved trailing comments to precede documenting
shafferz
authored

Commits on Mar 22, 2019