search

nkremerh / sugarscape

Development repository for the Digital Terraria Lab implementation of the Sugarscape agent-based societal simulation.
https://github.com/digital-terraria-lab/sugarscape
MIT License
7 stars 11 forks source link

Modifies some function and variable ordering so they're alphabetized #116

Closed amuller26 closed 2 weeks ago

amuller26 commented 3 weeks ago

Alphabetizes everything that can be listed in alphabetical order.

amuller26 commented 3 weeks ago

Some functions and variables I didn't alphabetize because I wasn't sure if there was a specific reason why they are grouped how they are, like everything in the Sugarsape __init__.

nkremerh commented 2 weeks ago

Resolved merge conflicts. @amuller26, please double check I did not accidentally overwrite any of your changes by comparing this to your local version.

amuller26 commented 2 weeks ago

I finished modifying all files, and I am pretty sure all of the conflicts are now resolved and merged.

nkremerh commented 2 weeks ago

Just kidding. Now the merge conflicts should be resolved. I accidentally introduced a bug into the master branch which broke this PR for a bit. All fixed. Ready for review.

amuller26 commented 2 weeks ago

Fixed.