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

Merge master into dev #856

Closed
wants to merge 303 commits into from
Closed
Changes from 2 commits
Commits
Show all changes
303 commits
Select commit Hold shift + click to select a range
81fed78
Merge pull request #763 from B-McCusker56/binary
B-McCusker56 Mar 15, 2024
e2ee69c
Fixed bugs and continued Contradiciton rule work
B-McCusker56 Mar 22, 2024
9984846
Merge pull request #769 from B-McCusker56/binary
B-McCusker56 Mar 22, 2024
b6c29ad
Added copy in BinaryBoard, fixed getCell with checking out of bounds
zacharybonagura Mar 22, 2024
81a78bb
Added copy in BinaryBoard, fixed getCell with checking out of bounds
zacharybonagura Mar 22, 2024
7bc8739
Three adjacent CR complete and prelim testing done
B-McCusker56 Mar 22, 2024
1b9390a
Merge pull request #770 from B-McCusker56/binary
B-McCusker56 Mar 22, 2024
97a50dd
Tested UnbalancedRowOrColumnContradictionRule to verify correction
zacharybonagura Mar 23, 2024
418f3b6
Tested UnbalancedRowOrColumnContradictionRule to verify correction
zacharybonagura Mar 23, 2024
974c7a4
Fixed checkStyle error in ThreeAdjacentContradictionRule
zacharybonagura Mar 23, 2024
bafc113
Deleted unnecessary file that was auto created
zacharybonagura Mar 23, 2024
ce20def
OneZeroCaseRule working version complete, began writing SurroundPairD…
B-McCusker56 Mar 26, 2024
b303e73
Merge pull request #774 from B-McCusker56/binary
B-McCusker56 Mar 26, 2024
5972432
Finished DuplicateRowsOrColumnsContradictionRule for rows but not col…
zacharybonagura Mar 26, 2024
13aa225
Merge branch 'binary' of https://github.com/Bram-Hub/LEGUP into binary
zacharybonagura Mar 26, 2024
012fe90
fixed stylecheck errors
B-McCusker56 Mar 26, 2024
c545154
fixed stylecheck errors
B-McCusker56 Mar 26, 2024
5f6f092
All rules complete and ready for test suite, constructed additional t…
B-McCusker56 Mar 28, 2024
fd0ea65
Merge pull request #778 from B-McCusker56/binary
B-McCusker56 Mar 28, 2024
c55b5d2
Cleaned rule files, unified formatting, removed print statements from…
B-McCusker56 Mar 28, 2024
24d3df2
Merge branch 'Bram-Hub:binary' into binary
B-McCusker56 Mar 28, 2024
2fbc3f0
Cleaned rule files, unified formatting, removed print statements from…
B-McCusker56 Mar 28, 2024
9c0d0b0
Merge branch 'binary' of https://github.com/B-McCusker56/LEGUP into b…
B-McCusker56 Mar 28, 2024
a38365e
Merge pull request #779 from B-McCusker56/binary
B-McCusker56 Mar 28, 2024
27f0d91
Found error in ThreeAdjacentContradictionRule, missing valid contradi…
zacharybonagura Mar 29, 2024
6d43ce0
Fixed checkStyle error "if construct must use {}'s"
zacharybonagura Mar 30, 2024
82536af
Fixed buggy three adjacent contradiction rule
B-McCusker56 Apr 5, 2024
6a3c973
Merge pull request #796 from B-McCusker56/binary
B-McCusker56 Apr 5, 2024
534e556
Made slight progress in onetilegap direct rule
zacharybonagura Apr 5, 2024
be1b82f
Merge branch 'binary' of https://github.com/Bram-Hub/LEGUP into binary
zacharybonagura Apr 5, 2024
0e29a15
Slight progress with SurroundPairDirectRule
zacharybonagura Apr 5, 2024
10efd8b
Completed and tested all rules to verify correctness.
zacharybonagura Apr 9, 2024
51b5646
Added final rule images, adjusted nming converntions for rule images,…
B-McCusker56 Apr 12, 2024
5d9064a
Merge pull request #800 from B-McCusker56/binary
B-McCusker56 Apr 12, 2024
cf59a17
Added Wiki Contributions
B-McCusker56 Apr 12, 2024
15f6643
Added Binary Puzzle Presentation
B-McCusker56 Apr 12, 2024
9c90e2f
Merge branch 'binary' of https://github.com/B-McCusker56/LEGUP into b…
B-McCusker56 Apr 12, 2024
65b07e9
Merge pull request #802 from B-McCusker56/binary
B-McCusker56 Apr 13, 2024
714daee
Added Wiki Contributions
B-McCusker56 Apr 13, 2024
c1d8dd1
Merge branch 'Bram-Hub:binary' into binary
B-McCusker56 Apr 13, 2024
8260833
Merge pull request #803 from B-McCusker56/binary
B-McCusker56 Apr 13, 2024
44d0de5
Add files via upload
zacharybonagura Apr 13, 2024
19fbed6
Made improvement to rule images
B-McCusker56 Apr 16, 2024
1301f88
Merge pull request #809 from B-McCusker56/binary
B-McCusker56 Apr 16, 2024
2e17567
Delete LEGUP Binary Puzzle Progress.pptx
charlestian23 Apr 16, 2024
04f5728
Delete LEGUPBinaryPuzzleProgress.pptx
charlestian23 Apr 16, 2024
e8396af
Delete WikiContributions.md
charlestian23 Apr 16, 2024
6fe8768
deleted blank file
zacharybonagura Apr 16, 2024
b7e5857
Merge branch 'binary' of https://github.com/Bram-Hub/LEGUP into binary
zacharybonagura Apr 16, 2024
bb64783
Removed useless config file
charlestian23 Apr 16, 2024
fb8c02a
Merge branch 'binary' of https://github.com/Bram-Hub/LEGUP into binary
charlestian23 Apr 16, 2024
2e9fa05
Merge branch 'dev' into binary
charlestian23 Apr 16, 2024
68e8e67
Automated Java code formatting changes
Bram28 Apr 16, 2024
9e41523
Comment out nonfunctional test
summerhenson Apr 16, 2024
0308ce5
Merge branch 'dev' into binary
charlestian23 May 5, 2024
277a2b9
Automated Java code formatting changes
Bram28 May 5, 2024
afbde38
Merge branch 'Bram-Hub:master' into master
zacharybonagura May 9, 2024
3b82c5b
Merge pull request #1 from Bram-Hub/binary
zacharybonagura May 9, 2024
f49f9a6
Merge pull request #818 from Bram-Hub/dev
Chase-Grajeda Jun 1, 2024
d85b9ab
Test commit
zacharybonagura Jun 4, 2024
d2b3798
Fixed Surround Pair bug, worked when one tile gap was supposed to be …
zacharybonagura Jun 6, 2024
320d03c
Fixed One Tile Gap bug, worked when surround pair was supposed to be …
zacharybonagura Jun 7, 2024
3abd581
Untested fix for StarBattleBoard copy function
summerhenson Jun 7, 2024
5f7b65c
Created a more structured way of fixing OneTileGap and SurroundPair d…
zacharybonagura Jun 7, 2024
65c2287
Merge pull request #821 from zachbonagura/binary
zacharybonagura Jun 7, 2024
ebc20df
Start first Clashing Orbit contradiction rule test
summerhenson Jun 7, 2024
71cae2b
Modified CompleteRowColumn to allow multiple cells to be selected to …
zacharybonagura Jun 8, 2024
3431226
Created puzzle editor functionality for the binary puzzle
zacharybonagura Jun 9, 2024
bd27094
Renamed and created more binary files, updated unknowntile image
zacharybonagura Jun 9, 2024
1a54846
Made progress toward a create puzzle button from file list
zacharybonagura Jun 9, 2024
e8a7cbe
Updated home page buttons
zacharybonagura Jun 11, 2024
f9a369d
Merge pull request #823 from zachbonagura/binary
zacharybonagura Jun 11, 2024
b192b79
Create 6x6 Star Battle Normal1 visualized (DO NOT OPEN AS A PUZZLE).png
offline171 Jun 11, 2024
6d8d050
Create 5x5 Star Battle Normal visualized (DO NOT OPEN AS A PUZZLE).png
offline171 Jun 11, 2024
9dff936
Fixed first clashing orbit test
summerhenson Jun 11, 2024
8d1f230
Finished Clashing Orbit contradiction rule test suite
summerhenson Jun 11, 2024
307d8ef
Start Too Few Stars contradiction rule test
summerhenson Jun 11, 2024
aabdd05
Updated toolbar in Puzzle Editor to remove unnecessary buttons
zacharybonagura Jun 13, 2024
f9f8aa6
Modified Puzzle Editor so if there are no non-placeable elements or p…
zacharybonagura Jun 13, 2024
7c273d4
Modified Binary Puzzle File Editor Number Tile and Image
zacharybonagura Jun 13, 2024
62b7811
Fixed FinishRoom case rule bug in Nurikabe so cells are modifiable
zacharybonagura Jun 13, 2024
cd17e87
Create FalseContradiction
summerhenson Jun 14, 2024
c0fc026
Merge branch 'master' into star-battle
summerhenson Jun 14, 2024
9ef4cd4
Merge remote-tracking branch 'upstream/star-battle' into star-battle
offline171 Jun 14, 2024
12add88
Merge pull request #824 from zachbonagura/binary
zacharybonagura Jun 14, 2024
ee22ec0
Created EliminateTheImpossible direct rule
zacharybonagura Jun 14, 2024
7d02f11
Finish Too Few Stars contradiction rule tests
summerhenson Jun 14, 2024
d3a677e
Too Many Stars tests
offline171 Jun 14, 2024
9f42c2d
Fixed checkstyle errors in ElementFrame
zacharybonagura Jun 14, 2024
71838a5
Combined placeable elements and nonplaceable elements into just eleme…
zacharybonagura Jun 16, 2024
eda8b22
Removed Edit Puzzle button on home page, resized home page
zacharybonagura Jun 17, 2024
9ae0fae
Removed extra buttons in proof solver, added directions button that w…
zacharybonagura Jun 18, 2024
fac81fb
Made progress with binary test suite for surround pair
zacharybonagura Jun 18, 2024
732bc78
Too Many Stars test suite
offline171 Jun 18, 2024
a83844a
Made progress with binary test suite for surround pair
zacharybonagura Jun 18, 2024
1a1bf5e
Editing Blackout test
offline171 Jun 18, 2024
1203860
Basic Surround Star direct rule tests
summerhenson Jun 18, 2024
c3fb60d
Merge pull request #826 from zachbonagura/binary
zacharybonagura Jun 18, 2024
65db0f7
Made progress with eliminate the impossible direct rule
zacharybonagura Jun 18, 2024
02bf6f5
Blackout Test Suite first test
offline171 Jun 18, 2024
3206f46
test committ
ContemporaryNietzsche Jun 18, 2024
c03d7e6
Merge branch 'binary' of https://github.com/ContemporaryNietzsche/LEG…
ContemporaryNietzsche Jun 18, 2024
58ff2bf
t
ContemporaryNietzsche Jun 20, 2024
ec8e1d3
commented before implementation
ContemporaryNietzsche Jun 21, 2024
109293b
Merge branch 'Bram-Hub:star-battle' into star-battle
summerhenson Jun 21, 2024
b222cdc
Finishing Blackout Test
offline171 Jun 21, 2024
cd42e83
Added new Surround Star direct rule test
summerhenson Jun 21, 2024
6772071
Finish with Stars
offline171 Jun 21, 2024
4db09f9
added generateAllBinaryStrings functions(pair programmed with Zach)
ContemporaryNietzsche Jun 21, 2024
ac95969
Make a rule name more accurate
summerhenson Jun 21, 2024
c3265d3
fixed some variables (extra 0 bug found) and commented/explained some…
ContemporaryNietzsche Jun 21, 2024
4a1ab37
Merge pull request #828 from summerhenson/star-battle
offline171 Jun 21, 2024
d286dda
Merge branch 'Bram-Hub:star-battle' into star-battle
offline171 Jun 21, 2024
7049e9f
finished the generate possibilites function for ETP
ContemporaryNietzsche Jun 22, 2024
a884291
Modified "Create Puzzle" to become puzzle editor, when clicked opens …
zacharybonagura Jun 23, 2024
3350325
Merge pull request #827 from ContemporaryNietzsche/binary
zacharybonagura Jun 23, 2024
3dcc3d5
Added create and open toolbar buttons when first opening puzzle editor
zacharybonagura Jun 23, 2024
de2b08a
Added Too Few Stars contradiction rule test
summerhenson Jun 25, 2024
d30206d
new 2 star puzzle
offline171 Jun 25, 2024
6e5dc78
added functions to eliminate the impossible (still wip)
ContemporaryNietzsche Jun 25, 2024
1ab5eb2
Merge pull request #830 from ContemporaryNietzsche/binary
ContemporaryNietzsche Jun 25, 2024
dfadd67
Merge branch 'binary' into binary
zacharybonagura Jun 28, 2024
cb6ad78
Merge pull request #831 from zachbonagura/binary
zacharybonagura Jun 28, 2024
9fbb412
Modified EliminateTheImpossible so it produces the correct combinatio…
zacharybonagura Jun 28, 2024
dbbaca6
Update 10x10 Star Battle 2star Normal1.xml
offline171 Jun 28, 2024
24bd384
First test case boards for Columns w/in Regions direct rule
summerhenson Jun 28, 2024
cf78cac
Added new Too Few Stars contradiction rule test case
summerhenson Jun 28, 2024
dc73947
Added second new test case for Too Few Stars contradiction rule
summerhenson Jun 28, 2024
53a0ac6
Merge branch 'Bram-Hub:star-battle' into star-battle
summerhenson Jun 28, 2024
1441f93
Each possible binary string combination is added to row
zacharybonagura Jun 28, 2024
541edff
Fixed EliminateTheImpossible so each row is a deep copy of original
zacharybonagura Jun 28, 2024
2e6b526
Merge branch 'star-battle' of https://github.com/offline171/LEGUP int…
offline171 Jun 28, 2024
7575f17
Fixed curly brace checkstyle error
zacharybonagura Jun 28, 2024
81483de
Modified Puzzle Solver -> when opened, a blank board is shown with no…
zacharybonagura Jun 30, 2024
3b5b7d0
Fixed case rule bug that causes proof tree to lock when deleting if t…
zacharybonagura Jul 2, 2024
88c6f69
Enhanced finish room case rule in nurikabe to inlucde options of room…
zacharybonagura Jul 8, 2024
dd6aca0
Merge pull request #832 from summerhenson/star-battle
summerhenson Jul 9, 2024
925ff9c
Added undo and redo buttons to puzzle solver tool bar, fixed major re…
zacharybonagura Jul 9, 2024
d69e634
Removed unnecessary logger error info
zacharybonagura Jul 9, 2024
379613e
Merge pull request #829 from offline171/star-battle
summerhenson Jul 9, 2024
b5c10be
Fixed checkStyle error in Board
zacharybonagura Jul 9, 2024
5f73f44
Fix bug with iterating through and modifying collections in Star Batt…
summerhenson Jul 9, 2024
c46c698
Merge pull request #834 from zachbonagura/binary
zacharybonagura Jul 9, 2024
b527b9a
Added row functionality for eliminate the impossible
zacharybonagura Jul 9, 2024
34c73d4
Merge pull request #835 from zachbonagura/binary
zacharybonagura Jul 9, 2024
34b166a
Started Columns Within Regions direct rule test suite
summerhenson Jul 9, 2024
c2687b7
Fixed bug with XWithinY direct rules
summerhenson Jul 12, 2024
d37284c
Fixed return strings for some X Within Y direct rules
summerhenson Jul 12, 2024
453fe30
Added Image for PushoutAdjacentDirectRule
offline171 Jul 12, 2024
1268ca4
Merge pull request #837 from offline171/star-battle
offline171 Jul 12, 2024
7750b73
Name change
offline171 Jul 12, 2024
2b83775
Merge pull request #839 from offline171/star-battle
offline171 Jul 12, 2024
45b594e
Lock transition states before a future case rule, flash background re…
zacharybonagura Jul 14, 2024
39dbef4
Modified finish room case rule to allow a minimum of only one state
zacharybonagura Jul 14, 2024
c2c3aab
Updated finish room case rule test to match current functionality
zacharybonagura Jul 14, 2024
3e8a438
Fixed bug that prevented user from deleting transition from the root …
zacharybonagura Jul 14, 2024
616ff88
Updated images to binary puzzle
zacharybonagura Jul 15, 2024
621b581
Updated binary contradiction images
zacharybonagura Jul 16, 2024
b18857f
Merge pull request #840 from zachbonagura/binary
zacharybonagura Jul 16, 2024
f32fe76
Wrote test for Columns Within Regions direct rule and fixed the bug i…
summerhenson Jul 16, 2024
2e62d41
Bug fix for X Within Y direct rules
summerhenson Jul 16, 2024
060897a
Finish ColumnsWithinRegions direct rule tests
summerhenson Jul 16, 2024
5d767a7
Refactored ZeroOrOneCaseRule
zacharybonagura Jul 18, 2024
3fd0d80
Created PreventWastedDigitDirectRule and WastedDigitContradictionRule
zacharybonagura Jul 19, 2024
2ff6899
Refactored ThreeAdjacentContradictionRule to TrioContradictionRule
zacharybonagura Jul 19, 2024
7d9d2d5
Refactored PreventWastedDigitDirectRule to SaveBlockerDirectRule, Was…
zacharybonagura Jul 19, 2024
e8bd65e
Test case files for Columns Within Rows direct rule
summerhenson Jul 19, 2024
d2347f3
EmptyAdjacentDirectRule added
offline171 Jul 19, 2024
cf121b6
Made progress toward UniqueRowColumnDirectRule
zacharybonagura Jul 19, 2024
4b7e1e9
Columns Within Rows direct rule tests
summerhenson Jul 19, 2024
4d8a7c7
Fixed null reference bug in some direct rules
summerhenson Jul 19, 2024
d93a06e
Merge branch 'Bram-Hub:star-battle' into star-battle
summerhenson Jul 19, 2024
eac5fd5
Added tests (function not working)
offline171 Jul 19, 2024
57f09be
Merge pull request #842 from summerhenson/star-battle
summerhenson Jul 19, 2024
36090d0
Created solution for rows in UniqueRowColumnDirectRule
zacharybonagura Jul 19, 2024
82e0e97
Fixed bug in duplicate rows columns
zacharybonagura Jul 19, 2024
9010903
Created image for unique row column direct rule
zacharybonagura Jul 19, 2024
f371ee2
Updated rule descriptions for zero or one case rule and surround pair…
zacharybonagura Jul 19, 2024
a3e1ca7
Changed rule name sizes for buttons so names fit within button box
zacharybonagura Jul 20, 2024
44de989
Test case files for Regions Within Columns direct rule
summerhenson Jul 23, 2024
9d95045
Fixed an issue where tests wouldn't run
offline171 Jul 23, 2024
4fa089a
Made progress toward a reset button for puzzle editor that clears all…
zacharybonagura Jul 23, 2024
d92d567
Regions Within Columns direct rule test suite
summerhenson Jul 23, 2024
c1510b7
New 5x5 1 star puzzle file
summerhenson Jul 26, 2024
f99a1d1
Debugging process rooted out issue
offline171 Jul 26, 2024
9abd9c0
Merge pull request #845 from offline171/star-battle
summerhenson Jul 26, 2024
b0afc36
First half of Regions Within Rows direct rule test suite
summerhenson Jul 26, 2024
8ca9d07
Merge branch 'Bram-Hub:star-battle' into star-battle
summerhenson Jul 26, 2024
5c3cc1c
Merge branch 'star-battle' of https://github.com/summerhenson/LEGUP i…
summerhenson Jul 26, 2024
e8de3de
Created puzzle files for binary
zacharybonagura Jul 27, 2024
af6fd72
Combined SurroundPair and OneTileGap direct rules into PreventTrio di…
zacharybonagura Jul 27, 2024
75e74c7
Fully implemented UniqueRowColumn direct rule and organized code
zacharybonagura Jul 27, 2024
e5bbc51
Added more puzzle files to binary
zacharybonagura Jul 28, 2024
543626e
Added right click functionality to binary to cycle backwards compared…
zacharybonagura Jul 28, 2024
dd0e37b
Added reset functionality for puzzle editor
zacharybonagura Jul 28, 2024
412ea9e
Updated binary reference sheet
zacharybonagura Jul 28, 2024
f3a97e6
Fixed undo redo error when deleting nodes
zacharybonagura Jul 28, 2024
b2ba642
Enhanced UniqueRowColumn direct rule
zacharybonagura Jul 29, 2024
b2c93b9
Fixed reset button for both opening existing file or creating new fil…
zacharybonagura Jul 29, 2024
d22226d
Fixed puzzle editor malfunction under multiple puzzles
zacharybonagura Jul 29, 2024
e55541e
Merge branch 'Bram-Hub:binary' into binary
zacharybonagura Jul 29, 2024
76d3f2e
Merge branch 'binary' of https://github.com/zachbonagura/LEGUP into b…
zacharybonagura Jul 30, 2024
f61454c
Updated sudoku image directories
zacharybonagura Jul 30, 2024
8f62435
Removed debug print statements
zacharybonagura Jul 30, 2024
e1564ec
Merge branch 'binary' into dev
zacharybonagura Jul 30, 2024
60f1a73
Fixed merge conflicts
zacharybonagura Jul 30, 2024
513f228
Fixed image bug for complete row column direct rule
zacharybonagura Jul 30, 2024
562cdbb
Finish Regions Within Rows inference rule tests
summerhenson Jul 30, 2024
485791f
Implemented skyscrapers puzzle editor functionality, created no clue …
zacharybonagura Jul 31, 2024
cc70ece
Implemented sudoku puzzle editor functionality
zacharybonagura Jul 31, 2024
9f6de7d
Renamed menu buttons in puzzle solver
zacharybonagura Jul 31, 2024
abbe550
Added documentation to binary main files
zacharybonagura Aug 1, 2024
fe42b93
Added documentation to binary rules and reorganized/restructured bits…
zacharybonagura Aug 1, 2024
965b66d
Added treeTent isBoardComplete function
zacharybonagura Aug 1, 2024
b1708f3
Fixed resize proof functionality
zacharybonagura Aug 1, 2024
9dbd831
Changed Skyscrapers valid dimensions to minimum 3x3
zacharybonagura Aug 1, 2024
eac3c6b
Added new skyscrapers contradiction rule images
zacharybonagura Aug 2, 2024
54184df
Rewrite Columns Within Regions inference rule
summerhenson Aug 2, 2024
4fe7e5f
Added new skyscrapers direct rule images
zacharybonagura Aug 2, 2024
2d0026e
Finish reworking X Within Y rules
summerhenson Aug 6, 2024
9e9d8b2
Star or Empty case rule test
summerhenson Aug 6, 2024
c4ce4cc
Updated several image files
zacharybonagura Aug 8, 2024
e73720e
Updated number for cell case rule image
zacharybonagura Aug 8, 2024
e89393f
Fixed save file bug in puzzle editor that did not save most recent pa…
zacharybonagura Aug 8, 2024
5e7cef7
Added code specifications to all methods in all classes in app directory
zacharybonagura Aug 8, 2024
fb5df3d
Added code specifications to the classes themselves in app directory
zacharybonagura Aug 8, 2024
8180f7c
Added code specifications to all missing methods and class descriptio…
zacharybonagura Aug 9, 2024
760b493
Added code specifications to all missing methods and class descriptio…
zacharybonagura Aug 9, 2024
cac3fa4
Added code specifications to all missing methods and class descriptio…
zacharybonagura Aug 9, 2024
581654e
Added code specifications to all missing methods and class descriptio…
zacharybonagura Aug 9, 2024
5ed4a27
Added code specifications to all missing methods and class descriptio…
zacharybonagura Aug 9, 2024
bc0b425
Added code specifications to all missing methods and class descriptio…
zacharybonagura Aug 9, 2024
4715d11
Added code specifications to all missing methods and class descriptio…
zacharybonagura Aug 9, 2024
fea6f0f
Added code specifications to all missing methods and class descriptio…
zacharybonagura Aug 9, 2024
9935e3b
Merge pull request #849 from summerhenson/star-battle
summerhenson Aug 9, 2024
e29ff9c
Added code specifications to all missing methods and class descriptio…
zacharybonagura Aug 9, 2024
b361a09
Added code specifications to all missing methods and class descriptio…
zacharybonagura Aug 10, 2024
63c3a9d
Removed PuzzleEditorDialog class rather implemented functionaliy dire…
zacharybonagura Aug 10, 2024
12a3014
Added code specifications to all missing methods and class descriptio…
zacharybonagura Aug 10, 2024
86e8c38
Fixed number tile in binary where cycled through the unknown tile as …
zacharybonagura Aug 11, 2024
373ac5d
Added code specifications to all missing methods and class descriptio…
zacharybonagura Aug 12, 2024
87ad777
Fixed clear history bug
zacharybonagura Aug 19, 2024
80dc899
Merge branch 'dev'
zacharybonagura Aug 19, 2024
c6ec39e
Fixed Binary Cell merge conflict
zacharybonagura Aug 19, 2024
7b45547
Merge branch 'master' into master
zacharybonagura Aug 19, 2024
a89e85b
Merge branch 'star-battle'
zacharybonagura Aug 19, 2024
c274436
Starbattle rules causing checkstyle error on github
zacharybonagura Aug 19, 2024
76aa2e7
Revert "Starbattle rules causing checkstyle error on github"
zacharybonagura Aug 19, 2024
e51bcd3
Revert "Merge branch 'star-battle'"
zacharybonagura Aug 19, 2024
f6889a4
Merge pull request #852 from zacharybonagura/master
Chase-Grajeda Aug 30, 2024
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
Original file line number Diff line number Diff line change
@@ -136,11 +136,12 @@ public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElem

System.out.println("Number of possible binary combinations: " + rowCopies.size());

ArrayList<ArrayList<BinaryCell>> nonContraRows = new ArrayList<>();
int rowIdx = 0;
for(ArrayList<BinaryCell> curRow : rowCopies){
int charIdx = 0;
System.out.println(rowResult.get(rowIdx));
for(int i = 0; i < curRow.size(); i++ ) {
for(int i = 0; i < curRow.size(); i++) {
if (curRow.get(i).getData() == 2) {
if (rowResult.get(rowIdx).charAt(charIdx) == '0') {
curRow.get(i).setData(0);
@@ -152,10 +153,43 @@ else if (rowResult.get(rowIdx).charAt(charIdx) == '1') {
}
System.out.print(curRow.get(i).getData() + " ");
}

boolean threeAdjacent = false;
int count = 1;
for(int i = 1; i < curRow.size(); i++) {
if (curRow.get(i).getData() == curRow.get(i-1).getData()) {
count++;
if (count == 3) {
threeAdjacent = true;
break;
}
} else {
count = 1;
}
}

if (!threeAdjacent) {
nonContraRows.add(curRow);
}

rowIdx++;
System.out.println();
}

System.out.println("Number of non contradiction rows: " + nonContraRows.size());
int colNum = binaryCell.getLocation().x;
boolean invalid = false;
for(int i = 0; i < nonContraRows.size(); i++) {
if (nonContraRows.get(i).get(colNum).getData() != binaryCell.getData()) {
invalid = true;
break;
}
}

if (!invalid) {
return null;
}

return "Grouping of Three Ones or Zeros not found";

}