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

Implemented UID System for Rules #93

Merged
merged 41 commits into from
Mar 15, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift click to select a range
c77bacd
Update .gitignore
charlestian23 Dec 21, 2021
eb2cbca
Added ID parameter to Rule class
charlestian23 Dec 21, 2021
247fc7d
Nurikabe rule IDs added
charlestian23 Dec 21, 2021
c751610
Merge pull request #61 from Bram-Hub/uid_add_nurikabe_id
charlestian23 Dec 21, 2021
c50c253
Added getRuleByID()
charlestian23 Dec 21, 2021
e218a14
Preliminary conversion of PuzzleImporter and PuzzleExporter to use ID…
charlestian23 Dec 21, 2021
49c35fc
Assigned Battleship IDs
charlestian23 Dec 23, 2021
8d367a6
Assigned Fillapix IDs
charlestian23 Dec 23, 2021
8223954
Create heyawake_reference_sheet.txt
charlestian23 Mar 6, 2022
7c9b4bb
Added IDs
charlestian23 Mar 6, 2022
d1381ff
Create masyu_reference_sheet.txt
charlestian23 Mar 6, 2022
1a4e157
Added Masyu IDs
charlestian23 Mar 6, 2022
9d51432
Update BlackContradictionRule.java
charlestian23 Mar 6, 2022
ce4604a
Merge pull request #79 from Bram-Hub/uid_add_masyu_id
charlestian23 Mar 7, 2022
28308d2
Merge pull request #78 from Bram-Hub/uid_add_heyawake_id
charlestian23 Mar 7, 2022
36eb2cf
Create lightup_reference_sheet.txt
charlestian23 Mar 7, 2022
9e4b7d5
Assigned IDs to Nurikabe classes
charlestian23 Mar 7, 2022
9553c8a
Create skyscrapers_reference_sheet.txt
charlestian23 Mar 7, 2022
c3cb785
Update skyscrapers_reference_sheet.txt
charlestian23 Mar 7, 2022
21fdcfc
Assigned Skyscraper IDs
charlestian23 Mar 7, 2022
1496b6a
Create sudoku_reference_sheet.txt
charlestian23 Mar 7, 2022
bb3a627
Added Sudoku IDs
charlestian23 Mar 7, 2022
2e43ece
Create treetent_reference_sheet.txt
charlestian23 Mar 8, 2022
16edbea
Added TreeTent IDs
charlestian23 Mar 8, 2022
3da23c5
Added Short Truth Table IDs
charlestian23 Mar 8, 2022
e2e1095
Added missing Short Truth Table ID
charlestian23 Mar 8, 2022
f910b4a
Merge pull request #80 from Bram-Hub/uid_assign_ids
charlestian23 Mar 8, 2022
307fab3
Merge pull request #81 from Bram-Hub/uid
charlestian23 Mar 8, 2022
d0bd0ab
Update CantReachWhiteContradictionRule.java
charlestian23 Mar 8, 2022
9a0dcdc
Merge pull request #82 from Bram-Hub/uid_get_rule_by_id
charlestian23 Mar 8, 2022
41e869e
Generic Constructors modified
charlestian23 Mar 9, 2022
8ada7d1
Update shorttruthtable_reference_sheet.txt
charlestian23 Mar 9, 2022
ad6a442
Elimination rule IDs added
charlestian23 Mar 9, 2022
626d824
Introduction rule IDs added
charlestian23 Mar 9, 2022
4c7fc77
Case rule IDs assigned
charlestian23 Mar 9, 2022
d23c66a
Added contradiction rule IDs
charlestian23 Mar 9, 2022
0471a5c
Update BasicRuleAtomic.java
charlestian23 Mar 9, 2022
7af3397
Merge pull request #85 from Bram-Hub/uid_issue83_short-truth-table-id…
charlestian23 Mar 9, 2022
0a6e808
Update BasicRule_Generic.java
charlestian23 Mar 10, 2022
81ab94b
Merge branch 'uid' into dev-uid_resolve-conflicts
charlestian23 Mar 10, 2022
662b51d
Small edits
Chase-Grajeda Mar 15, 2022
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
Prev Previous commit
Next Next commit
Added IDs
  • Loading branch information
charlestian23 committed Mar 6, 2022
commit 7c9b4bb409ff649ad1b5606ca5a4cab29cbd20fa
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 7,7 @@
public class AdjacentBlacksContradictionRule extends ContradictionRule {

public AdjacentBlacksContradictionRule() {
super("Adjacent Blacks",
super("HEYA-CONT-0001", "Adjacent Blacks",
"",
"edu/rpi/legup/images/heyawake/contradictions/adjacentBlacks.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 11,7 @@
public class BlackOrWhiteCaseRule extends CaseRule {

public BlackOrWhiteCaseRule() {
super("Black or White",
super("HEYA-CASE-0001", "Black or White",
"",
"edu/rpi/legup/images/heyawake/cases/BlackOrWhite.png");
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 1,8 @@
package edu.rpi.legup.puzzle.heyawake.rules;

public class BlackPathBasicRule {
public BlackPathBasicRule()
{
throw new RuntimeException("This rule has not been implemented");
}
}
Original file line number Diff line number Diff line change
@@ -1,4 1,9 @@
package edu.rpi.legup.puzzle.heyawake.rules;

public class BottleNeckBasicRule {
public class BottleNeckBasicRule
{
public BottleNeckBasicRule()
{
throw new RuntimeException("This rule has not been implemented");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 9,7 @@
public class FillRoomBlackBasicRule extends BasicRule {

public FillRoomBlackBasicRule() {
super("Fill Room Black",
super("HEYA-BASC-0003", "Fill Room Black",
"",
"edu/rpi/legup/images/heyawake/rules/FillRoomBlack.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 9,7 @@
public class FillRoomWhiteBasicRule extends BasicRule {

public FillRoomWhiteBasicRule() {
super("Fill Room White",
super("HEYA-BASC-0004", "Fill Room White",
"",
"edu/rpi/legup/images/heyawake/rules/FillRoomWhite.png");
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 1,9 @@
package edu.rpi.legup.puzzle.heyawake.rules;

public class OneRowBasicRule {
public class OneRowBasicRule
{
public OneRowBasicRule()
{
throw new RuntimeException("This rule has not been implemented");
}
}
Original file line number Diff line number Diff line change
@@ -1,4 1,9 @@
package edu.rpi.legup.puzzle.heyawake.rules;

public class PreventWhiteLineBasicRule {
public class PreventWhiteLineBasicRule
{
public PreventWhiteLineBasicRule()
{
throw new RuntimeException("This rule has not been implemented");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 7,7 @@
public class RoomTooEmptyContradictionRule extends ContradictionRule {

public RoomTooEmptyContradictionRule() {
super("Room too Empty",
super("HEYA-CONT-0002", "Room too Empty",
"",
"edu/rpi/legup/images/heyawake/contradictions/RoomTooEmpty.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 7,7 @@
public class RoomTooFullContradictionRule extends ContradictionRule {

public RoomTooFullContradictionRule() {
super("Room too Full",
super("HEYA-CONT-0003", "Room too Full",
"",
"edu/rpi/legup/images/heyawake/contradictions/RoomTooFull.png");
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 1,9 @@
package edu.rpi.legup.puzzle.heyawake.rules;

public class ThreeByThreeBasicRule {
public class ThreeByThreeBasicRule
{
public ThreeByThreeBasicRule()
{
throw new RuntimeException("This rule has not been implemented");
}
}
Original file line number Diff line number Diff line change
@@ -1,4 1,9 @@
package edu.rpi.legup.puzzle.heyawake.rules;

public class TwoInCornerBasicRule {
public class TwoInCornerBasicRule
{
public TwoInCornerBasicRule()
{
throw new RuntimeException("This rule has not been implemented");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 7,7 @@
public class WhiteAreaContradictionRule extends ContradictionRule {

public WhiteAreaContradictionRule() {
super("White Area",
super("HEYA-CONT-0004", "White Area",
"",
"edu/rpi/legup/images/heyawake/contradictions/WhiteArea.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 9,7 @@
public class WhiteAroundBlackBasicRule extends BasicRule {

public WhiteAroundBlackBasicRule() {
super("White Around Black",
super("HEYA-BASC-0009", "White Around Black",
"",
"edu/rpi/legup/images/heyawake/rules/WhiteAroundBlack.png");
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 1,9 @@
package edu.rpi.legup.puzzle.heyawake.rules;

public class WhiteEscapeBasicRule {
public class WhiteEscapeBasicRule
{
public WhiteEscapeBasicRule()
{
throw new RuntimeException("This rule has not been implemented");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 7,7 @@
public class WhiteLineContradictionRule extends ContradictionRule {

public WhiteLineContradictionRule() {
super("White Line",
super("HEYA-CONT-0005", "White Line",
"",
"edu/rpi/legup/images/heyawake/contradictions/WhiteLine.png");

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 1,9 @@
package edu.rpi.legup.puzzle.heyawake.rules;

public class ZigZagCaseRule {
public class ZigZagCaseRule
{
public ZigZagCaseRule()
{
throw new RuntimeException("This rule has not been implemented");
}
}
Original file line number Diff line number Diff line change
@@ -1,4 1,9 @@
package edu.rpi.legup.puzzle.heyawake.rules;

public class ZigZagWhiteBasicRule {
public class ZigZagWhiteBasicRule
{
public ZigZagWhiteBasicRule()
{
throw new RuntimeException("This rule has not been implemented");
}
}
Original file line number Diff line number Diff line change
@@ -1,19 1,20 @@
HEYA-BASC-0001 : BlackBetweenRegionsBasicRule
HEYA-BASC-0002 : BlackBottleNeckBasicRule
HEYA-BASC-0003 : CornerBlackBasicRule
HEYA-BASC-0004 : FillInBlackBasicRule
HEYA-BASC-0005 : FillInWhiteBasicRule
HEYA-BASC-0006 : PreventBlackSquareBasicRule
HEYA-BASC-0007 : SurroundRegionBasicRule
HEYA-BASC-0008 : UnreachableBasicRule
HEYA-BASC-0009 : WhiteBottleNeckBasicRule
HEYA-BASC-0001 : BlackPathBasicRule
HEYA-BASC-0002 : BottleNeckBasicRule
HEYA-BASC-0003 : FillRoomBlackBasicRule
HEYA-BASC-0004 : FillRoomWhiteBasicRule
HEYA-BASC-0005 : OneRowBasicRule
HEYA-BASC-0006 : PreventWhiteLineBasicRule
HEYA-BASC-0007 : ThreeByThreeBasicRule
HEYA-BASC-0008 : TwoInCornerBasicRule
HEYA-BASC-0009 : WhiteAroundBlackBasicRule
HEYA-BASC-0010 : WhiteEscapeBasicRule
HEYA-BASC-0011 : ZigZagWhiteBasicRule

HEYA-CONT-0001 : BlackSquareContradictionRule
HEYA-CONT-0002 : CantReachWhiteContradictionRule
HEYA-CONT-0003 : IsolateBlackContradictionRule
HEYA-CONT-0004 : MultipleNumbersContradictionRule
HEYA-CONT-0005 : NoNumberContradictionRule
HEYA-CONT-0006 : TooFewSpacesContradictionRule
HEYA-CONT-0007 : TooManySpacesContradictionRule
HEYA-CONT-0001 : AdjacentBlacksContradictionRule
HEYA-CONT-0002 : RoomTooEmptyContradictionRule
HEYA-CONT-0003 : RoomTooFullContradictionRule
HEYA-CONT-0004 : WhiteAreaContradictionRule
HEYA-CONT-0005 : WhiteLineContradictionRule

HEYA-CASE-0001 : BlackOrWhiteCaseRule
HEYA-CASE-0001 : BlackOrWhiteCaseRule
HEYA-CASE-0002 : ZigZagCaseRule