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.

Sign up for GitHub

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

Jump to bottom

Keeping main up to date with dev #25

Merged
merged 83 commits into from
Apr 29, 2024
Merged

Keeping main up to date with dev #25

merged 83 commits into from
Apr 29, 2024

Commits on Apr 12, 2024

  1. feat: changed Board class name to Tetris

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    b6da87a View commit details
    Browse the repository at this point in the history

  2. docs: made a agent design dokument

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    9d8624f View commit details
    Browse the repository at this point in the history

  3. fix: correct import path

    @SverreNystad
    SverreNystad committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    7b96ee3 View commit details
    Browse the repository at this point in the history

  4. refactor: remove print statements

    @SverreNystad
    SverreNystad committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    104fce6 View commit details
    Browse the repository at this point in the history

  5. refactor: change script name

    @SverreNystad
    SverreNystad committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    17e3017 View commit details
    Browse the repository at this point in the history

  6. feat: add heuristicAgent

    @SverreNystad
    SverreNystad committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    783637c View commit details
    Browse the repository at this point in the history

  7. fix: correct random agent tests

    @SverreNystad
    SverreNystad committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    a3a9e7e View commit details
    Browse the repository at this point in the history

  8. fix: correct script import of tetris in the tests

    @SverreNystad
    SverreNystad committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    f82d98c View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. fix: forgot to change an import

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    1fa6f9c View commit details
    Browse the repository at this point in the history

  2. fix: lines are now cleared correctly

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    8125f2a View commit details
    Browse the repository at this point in the history

  3. feat: transitioned input managmentm to pygame

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    32649d3 View commit details
    Browse the repository at this point in the history

  4. choire:fixed and removed some commnets

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    3ee4bc7 View commit details
    Browse the repository at this point in the history

  5. fix:removed match statements for compatibility

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    ef1761c View commit details
    Browse the repository at this point in the history

  6. refactor: change all calls for board to calls for prevBoard

    @JonBergland
    JonBergland committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    4fd4f04 View commit details
    Browse the repository at this point in the history

  7. feat: implement utility-method

    @JonBergland
    JonBergland committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    8cf7adf View commit details
    Browse the repository at this point in the history

  8. feat: implement random agent

    @henrinha
    henrinha committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    3220d71 View commit details
    Browse the repository at this point in the history

  9. Co-authored-by: Eduard Prokhorikhin <[email protected]… 

    …y.github.com>

Co-authored-by: Jon Bergland <[email protected]>
    @SFossdal
    SFossdal committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    d01e087 View commit details
    Browse the repository at this point in the history

  10. feat: implement random agent

    @henrinha
    henrinha committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    8a319e3 View commit details
    Browse the repository at this point in the history

  11. feat: made heuristic agent

    @henrinha
    henrinha committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    bd7bc63 View commit details
    Browse the repository at this point in the history

  12. merge

    @henrinha
    henrinha committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    072a6eb View commit details
    Browse the repository at this point in the history

  13. fix: ⬇️ Double hard drop fixed

    @oystkva
    oystkva committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    a57e8a9 View commit details
    Browse the repository at this point in the history

  14. Co-authored-by: Jon Bergland <[email protected]>

    @SFossdal
    SFossdal committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    d096247 View commit details
    Browse the repository at this point in the history

  15. feat: create heuristic agent

    @maiahi
    maiahi committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    5cc1a4a View commit details
    Browse the repository at this point in the history

  16. refactor: clean code in heuristic_agent.py

    @SverreNystad
    SverreNystad authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    216fd65 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. feat: add methods for training agent

    @henrinha
    henrinha committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    ccbb41c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into randomAgentSindre

    @JonBergland
    JonBergland authored Apr 16, 2024
    Configuration menu
    Copy the full SHA
    102b0ef View commit details
    Browse the repository at this point in the history

  3. Merge pull request #19 from CogitoNTNU/randomAgentSindre 

    Random agent sindre
    @JonBergland
    JonBergland authored Apr 16, 2024
    Configuration menu
    Copy the full SHA
    06fd95c View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/randomAgentHenrik' into dev

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    1c729d4 View commit details
    Browse the repository at this point in the history

  5. fix: added Henrik's implementation of heuristick agent as separete fi… 

    …le and class
    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    0d64422 View commit details
    Browse the repository at this point in the history

  6. test: fixed heurestic tests

    @SFossdal
    SFossdal committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    ee6d68c View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' of https://github.com/CogitoNTNU/TetrisAI into dev

    @SFossdal
    SFossdal committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    c538870 View commit details
    Browse the repository at this point in the history

  8. refactor: changed varible-symbol in for loops

    @henrinha
    henrinha committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    c5e67f9 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'dev' of https://github.com/CogitoNTNU/TetrisAI into dev

    @henrinha
    henrinha committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    af5fb49 View commit details
    Browse the repository at this point in the history

  10. test: fixed heuristic tests

    @SFossdal
    SFossdal committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    40c449e View commit details
    Browse the repository at this point in the history

  11. Merge branch 'dev' of https://github.com/CogitoNTNU/TetrisAI into dev

    @SFossdal
    SFossdal committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    63fab48 View commit details
    Browse the repository at this point in the history

  12. test: change initialization of board

    @maiahi
    maiahi committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    007eb89 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'dev' of https://github.com/CogitoNTNU/TetrisAI into dev

    @maiahi
    maiahi committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    3bc03df View commit details
    Browse the repository at this point in the history

  14. feat: settup for genetic alg agent

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    671801e View commit details
    Browse the repository at this point in the history

  15. Merge branch 'dev' of https://github.com/CogitoNTNU/TetrisAI into dev

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    14a1f09 View commit details
    Browse the repository at this point in the history

  16. fix: 📌 doAction fixed

    @oystkva
    oystkva committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    9933b9e View commit details
    Browse the repository at this point in the history

  17. Merge branch 'dev' of https://github.com/CogitoNTNU/TetrisAI into dev

    @oystkva
    oystkva committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    0c3a13a View commit details
    Browse the repository at this point in the history

  18. feat: random trainer made

    @henrinha
    henrinha committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    76f60ca View commit details
    Browse the repository at this point in the history

  19. Merge branch 'dev' of https://github.com/CogitoNTNU/TetrisAI into dev

    @henrinha
    henrinha committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    ac7933f View commit details
    Browse the repository at this point in the history

  20. feat: made check average method of hyperparms

    @henrinha
    henrinha committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    522ca21 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'dev' of https://github.com/CogitoNTNU/TetrisAI into 22-… 

    …implement-geneticalgagent-jon-og-maia
    @maiahi
    maiahi committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    0d1d347 View commit details
    Browse the repository at this point in the history

  22. fix: 🚧 Board and heuristic agent result tests fixed

    @oystkva
    oystkva committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    a4e0959 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'dev' of https://github.com/CogitoNTNU/TetrisAI into dev

    @oystkva
    oystkva committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    38f23d0 View commit details
    Browse the repository at this point in the history

  24. feat: start implementing geneticAlgAgent 

    Co-authored-by: Jon Bergland <[email protected]>
    @maiahi @JonBergland
    maiahi and JonBergland committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    4e510d7 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. feat: 🎨 Block rotations and spawn area of board implemented as origin… 

    …al game; doAction() made pure; the block placement, checks and new block functionality previously located in the doAction() method parsed to its own method updateBoard()
    @oystkva
    oystkva committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    16fa161 View commit details
    Browse the repository at this point in the history

  2. fix: changed up the tests and underlying code so that they are correct

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    db75d86 View commit details
    Browse the repository at this point in the history

  3. feat: added basic pygame visuals

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    c5ab56e View commit details
    Browse the repository at this point in the history

  4. feat: continue working on genetic algorithm agent 

    Co-authored-by: Jon Bergland <[email protected]>
    @maiahi @JonBergland
    maiahi and JonBergland committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    52bb373 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. fix:removed old files that were no longer in use

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    9641f41 View commit details
    Browse the repository at this point in the history

  2. feat: added backbone for multiple corols

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    6704d2d View commit details
    Browse the repository at this point in the history

  3. feat: fixed test to work with the color settup

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    1eae354 View commit details
    Browse the repository at this point in the history

  4. feat: Added support for colors in pygame gui

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    32d03ba View commit details
    Browse the repository at this point in the history

  5. feat: made a demo mode for agents

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    a187860 View commit details
    Browse the repository at this point in the history

  6. fix: utility now calculated of properly

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    409fd66 View commit details
    Browse the repository at this point in the history

  7. feat: added demo mode for agent

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    fd2983f View commit details
    Browse the repository at this point in the history

  8. fix: optimize code

    @maiahi
    maiahi committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    6d3846a View commit details
    Browse the repository at this point in the history

  9. Revert "3 make tetris board"

    @JonBergland @maiahi
    JonBergland authored and maiahi committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    06fed5e View commit details
    Browse the repository at this point in the history

  10. feat: start implementing geneticAlgAgent 

    Co-authored-by: Jon Bergland <[email protected]>
    @maiahi @JonBergland
    maiahi and JonBergland committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    45202d9 View commit details
    Browse the repository at this point in the history

  11. feat: continue working on genetic algorithm agent 

    Co-authored-by: Jon Bergland <[email protected]>
    @maiahi @JonBergland
    maiahi and JonBergland committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    1916547 View commit details
    Browse the repository at this point in the history

  12. fix: optimize code

    @maiahi
    maiahi committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    1719762 View commit details
    Browse the repository at this point in the history

  13. Merge branch '22-implement-geneticalgagent-jon-og-maia' of https://gi… 

    …thub.com/CogitoNTNU/TetrisAI into 22-implement-geneticalgagent-jon-og-maia
    @maiahi
    maiahi committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    2c3281c View commit details
    Browse the repository at this point in the history

  14. refactor: optimize code 

    Co-authored-by: Jon Bergland <[email protected]>
Co-authored-by: henrinha <[email protected]>
    @maiahi @JonBergland @henrinha
    3 people committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    c5d917f View commit details
    Browse the repository at this point in the history

  15. refactor: optimize code

    @maiahi
    maiahi committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    384e97e View commit details
    Browse the repository at this point in the history

  16. refactor: optimize the equals function in tetris.py

    @JonBergland
    JonBergland committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    70e7e56 View commit details
    Browse the repository at this point in the history

  17. feat: add normalizing of new vector

    @maiahi
    maiahi committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    d145c8c View commit details
    Browse the repository at this point in the history

  18. Merge branch '22-implement-geneticalgagent-jon-og-maia' of https://gi… 

    …thub.com/CogitoNTNU/TetrisAI into 22-implement-geneticalgagent-jon-og-maia
    @JonBergland
    JonBergland committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    1cdd653 View commit details
    Browse the repository at this point in the history

  19. feat: add copy-method for Tetris-object

    @maiahi
    maiahi committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    7691353 View commit details
    Browse the repository at this point in the history

  20. feat: add deep_copy-method for copying board

    @maiahi
    maiahi committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    adedbfd View commit details
    Browse the repository at this point in the history

  21. refactor: change from copy.deepcopy to self defined copy-method

    @JonBergland
    JonBergland committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    39fcfd8 View commit details
    Browse the repository at this point in the history

  22. refactor: make use of list comprehensions in deepcopy-method in tetri… 

    …s.py
    @JonBergland
    JonBergland committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    b75e8f7 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. refactor: optimize _outOfBounds, _intersects, isValidBlockPosition an… 

    …d equals methods
    @JonBergland
    JonBergland committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    cb5d539 View commit details
    Browse the repository at this point in the history

  2. feat: add tests for equal method in tetris

    @JonBergland
    JonBergland committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    ee028a2 View commit details
    Browse the repository at this point in the history

  3. refactor: combine aggregate height, max_height and bumpiness

    @JonBergland
    JonBergland committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    6eaeca7 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2024

  1. Merge branch '22-implement-geneticalgagent-jon-og-maia' into dev

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    bcb056e View commit details
    Browse the repository at this point in the history

  2. Reapply "3 make tetris board" 

    This reverts commit 06fed5e.
    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    0d155ab View commit details
    Browse the repository at this point in the history

  3. fix: fixed deepcopy referance in getPossibleBoards

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    b4e8bad View commit details
    Browse the repository at this point in the history

  4. feat: add test code in main.py

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    22b514b View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2024

  1. test: added more complex test for getPossibleBoards

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    43908eb View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. test: added complex test for transition model

    @Eduard-Prokhorikhin
    Eduard-Prokhorikhin committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    e5e4a72 View commit details
    Browse the repository at this point in the history