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

LEGUP 6.0.1 Push #776

Merged
merged 22 commits into from
Apr 2, 2024
Merged

LEGUP 6.0.1 Push #776

merged 22 commits into from
Apr 2, 2024

Conversation

charlestian23
Copy link
Collaborator

@charlestian23 charlestian23 commented Mar 27, 2024

Pushing updates from March to master:

  • Removed Inno Setup code
  • Updated Javadoc Java version
  • Added some preliminary work for region support in LEGUP
  • Improved auto-formatter behavior
  • Added more tests for Short Truth Table and Light Up
  • Added Finish Room Case Rule to Nurikabe
  • Fixed a bizarre Satisfy Rule Case Rule bug for Light Up ([BUG] Bizzarre Satify Number behavior #555)

@charlestian23 charlestian23 mentioned this pull request Mar 29, 2024
10 tasks
* Attempting improvements

* Added git config info

* Added check for modified files

* Modifying GitHub Token use

* Temporarily changing user for my fork

* Change fork checking and repo name retrieval

* Changing back

Testing these changes on my fork now doesn't work

* Removed distribution

* Didn't properly change back

* More testing

* Testing to see if this works...?

* Update java-autoformat.yml

* Set upstream

* Changing back to Bram

* Changing method to create pull request

* Modifying job execution conditions

* Automated Java code formatting changes

* Update java-autoformat.yml

Changed branch name to be unique and fail task on master PRs

* More debugging

* More debugging

* More changes

* Adding bad formatting for testing

* Automated Java code formatting changes

* Even more debugging

* Bug fixing

* EVEN MORE DEBUGGING

* Debugging...

* Update java-autoformat.yml

* Update java-autoformat.yml

* Update java-autoformat.yml

* Update java-autoformat.yml

* Update java-autoformat.yml

* Update java-autoformat.yml

* Update java-autoformat.yml

* Update java-autoformat.yml

* Bad formatting for testing

* Update java-autoformat.yml

* Update java-autoformat.yml

* Automated Java code formatting changes

* Update java-autoformat.yml

* DEBUG

* Trying different way to check for modified files

* Bad formatting for testing

* Automated Java code formatting changes

* More changes   more testing

* Automated Java code formatting changes

---------

Co-authored-by: Bram van Heuveln <[email protected]>
@charlestian23 charlestian23 marked this pull request as ready for review March 29, 2024 20:51
charlestian23 and others added 12 commits March 29, 2024 17:09
* Created Or Contradiction test files

* Added false or test

* Fixed false or test and added unknown or test

* Methods should start with lowercase

* Added true or test and removed useless lines

* Added Not Contradiction test

* Remove useless print statement

* Added And Contradiction tests

* Removed useless imports

* Fixed bug with test

* Added conditional test cases

* Create ConditionalContradictionRuleTest.java

Added Conditional Contradiction Rule tests

* Added biconditional test files

* Fixed typo

* Create BiconditionalContradictionRuleTest.java

Added biconditional contradiction rule tests

* Added single test file

* Added remaining test files

* Added JUnit test

* Removed unused tests

Removed deprecated importer and statement tests

---------

Co-authored-by: Chase Grajeda <76405306 [email protected]>
Co-authored-by: Chase-Grajeda <[email protected]>
* Created conditional case rule test files

* More test files

* Created Conditional Case Rule tests

* Added test files

* Started creating tests

Added true biconditional tests, false biconditional tests are not written yet

* Finished False tests and changed variable names

* Update BiconditionalCaseRuleTest.java

Modified comments

* Update OrCaseRuleTest.java

Fixed inaccurate comments

---------

Co-authored-by: Chase Grajeda <76405306 [email protected]>
* Automated Java code formatting changes

* Automated Java code formatting changes

---------

Co-authored-by: Bram van Heuveln <[email protected]>
Co-authored-by: Charles Tian <46334090 [email protected]>
[LightUp] Added FinishWithEmptyDirectRule test cases
* Update SurroundRegionDirectRule.java

* Update SurroundRegionDirectRule.java

* Update SurroundRegionDirectRule.java

* Create FinishRoomCaseRule.java

* more work done to finish room case rule. Also since there currently is no case rules that alter 2 separate puzzzle tiles I added the basis for those in the case rule class

* Finish Room Case rule work

Remove unecessary changes from caseRule.java. Show all work before deleting uneccesary bits from finishRoom case rule attempt.

* FinishRoomCaseRule initial completed attempt

First clean attempt at rule.

* get draft pull

need help

* Changed the ID

* Update FinishRoomCaseRule.java

* Finish Room Case Rule Basically Done

Rooms seem to be finished correctly including all edge cases. Arrow color is still red but may be fixed when updating my branch.

* Cleaned up code

Removed print statements and unnecessary lines

* Finish Room green arrows and test case start

Green arrows now show when rule is ran correctly. Red arrow when incorrect and larger than 5 paths. Started the test case for it.

* Tests and rule rework

Work on test class and start of work within Rule and CaseRule to correctly display error message when too many cases are generated

* Generalized max cases

Max cases is generalized for each case rule. Can be altered from the original 10 to whichever you choose. I input 5 for finish room and 2 for black or white case rule in Nurikabe but can be done for case rules in other puzzles. AutoCaseRuleCommand was changed as well to display message when too many cases of the case rule is generated.

* FinishRoom Image

Created and added new image to display the finish room case rule

* Added argument for minimum number of case rules

* Test Case initial

Initial passing cases, may need additional work but currently passes.

* Update CaseRule.java

* False justification bug fix

Fixes green arrow when using case rule after altering 1 random tile. Also sets minimum cases number to 2.

---------

Co-authored-by: Ivan Ho <41582274 [email protected]>
Co-authored-by: Charles Tian <46334090 [email protected]>
Co-authored-by: charlestian23 <[email protected]>
* This should work

* Some cleanup, can't find the bug still

* Added 1 case error checking

* Revert "Some cleanup, can't find the bug still"

This reverts commit 8721534.

* Revert "This should work"

This reverts commit 3f4eb25.

* Code reordering and added comments

* CHECKSTYLE
* Update SurroundRegionDirectRule.java

* Update SurroundRegionDirectRule.java

* Update SurroundRegionDirectRule.java

* Create FinishRoomCaseRule.java

* more work done to finish room case rule. Also since there currently is no case rules that alter 2 separate puzzzle tiles I added the basis for those in the case rule class

* Finish Room Case rule work

Remove unecessary changes from caseRule.java. Show all work before deleting uneccesary bits from finishRoom case rule attempt.

* FinishRoomCaseRule initial completed attempt

First clean attempt at rule.

* get draft pull

need help

* Changed the ID

* Update FinishRoomCaseRule.java

* Finish Room Case Rule Basically Done

Rooms seem to be finished correctly including all edge cases. Arrow color is still red but may be fixed when updating my branch.

* Cleaned up code

Removed print statements and unnecessary lines

* Finish Room green arrows and test case start

Green arrows now show when rule is ran correctly. Red arrow when incorrect and larger than 5 paths. Started the test case for it.

* Tests and rule rework

Work on test class and start of work within Rule and CaseRule to correctly display error message when too many cases are generated

* Generalized max cases

Max cases is generalized for each case rule. Can be altered from the original 10 to whichever you choose. I input 5 for finish room and 2 for black or white case rule in Nurikabe but can be done for case rules in other puzzles. AutoCaseRuleCommand was changed as well to display message when too many cases of the case rule is generated.

* FinishRoom Image

Created and added new image to display the finish room case rule

* Added argument for minimum number of case rules

* Test Case initial

Initial passing cases, may need additional work but currently passes.

* Update CaseRule.java

* False justification bug fix

Fixes green arrow when using case rule after altering 1 random tile. Also sets minimum cases number to 2.

* deleting cases fix

fixes bug where correct cases would be generated and the user would delete one of the cases and the arrows would still show as green being a logical move.

---------

Co-authored-by: Ivan Ho <41582274 [email protected]>
Co-authored-by: Charles Tian <46334090 [email protected]>
Co-authored-by: charlestian23 <[email protected]>
Copy link
Collaborator

@Chase-Grajeda Chase-Grajeda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes reviewed iteratively. Sending to prod

@Chase-Grajeda Chase-Grajeda merged commit a0c7dcf into master Apr 2, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants