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

UID Assign IDs #80

Merged
merged 20 commits into from
Mar 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Expand Up @@ -7,7 +7,8 @@
public class AdjacentShipsContradictionRule extends ContradictionRule {

public AdjacentShipsContradictionRule() {
super("Adjacent Ships",
super("BTSP-CONT-0001",
"Adjacent Ships",
"",
"edu/rpi/legup/images/battleship/contradictions/AdjacentShips.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
public class ContinueShipBasicRule extends BasicRule {

public ContinueShipBasicRule() {
super("Continue Ship",
super("BTSP-BASC-0001",
"Continue Ship",
"",
"edu/rpi/legup/images/battleship/rules/ContinueShip.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
public class FinishWithWaterBasicRule extends BasicRule {

public FinishWithWaterBasicRule() {
super("Finish with Water",
super("BTSP-BASC-0003",
"Finish with Water",
"",
"edu/rpi/legup/images/battleship/rules/finishWater.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
public class FinishedWithShipsBasicRule extends BasicRule {

public FinishedWithShipsBasicRule() {
super("Finished with Ships",
super("BTSP-BASC-0002",
"Finished with Ships",
"",
"edu/rpi/legup/images/battleship/rules/finishShip.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
public class IncompleteShipContradictionRule extends ContradictionRule {

public IncompleteShipContradictionRule() {
super("Incomplete Ship",
super("BTSP-CONT-0002",
"Incomplete Ship",
"",
"edu/rpi/legup/images/battleship/contradictions/IncompleteShip.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
public class SegmentTypeBasicRule extends BasicRule {

public SegmentTypeBasicRule() {
super("Segment Type",
super("BTSP-BASC-0004",
"Segment Type",
"",
"edu/rpi/legup/images/battleship/rules/SegmentChoice.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@

public class SegmentTypeCaseRule extends CaseRule {
public SegmentTypeCaseRule() {
super("Segment Type",
super("BTSP-CASE-0001",
"Segment Type",
"",
"edu/rpi/legup/images/battleship/cases/SegmentType.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
public class ShipLocationCaseRule extends CaseRule {

public ShipLocationCaseRule() {
super("Ship Location",
super("BTSP-CASE-0002",
"Ship Location",
"",
"edu/rpi/legup/images/battleship/cases/ShipLocations.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
public class ShipOrWaterCaseRule extends CaseRule {

public ShipOrWaterCaseRule() {
super("Ship or Water",
super("BTSP-CASE-0003",
"Ship or Water",
"",
"edu/rpi/legup/images/battleship/cases/ShipOrWater.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
public class SurroundShipBasicRule extends BasicRule {

public SurroundShipBasicRule() {
super("Surround Ship",
super("BTSP-BASC-0005",
"Surround Ship",
"",
"edu/rpi/legup/images/battleship/rules/SurroundShip.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
public class TooFewInFleetContradictionRule extends ContradictionRule {

public TooFewInFleetContradictionRule() {
super("Too Few in Fleet",
super("BTSP-CONT-0003",
"Too Few in Fleet",
"",
"edu/rpi/legup/images/battleship/contradictions/too_few_in_fleet.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
public class TooFewRowColContradictionRule extends ContradictionRule {

public TooFewRowColContradictionRule() {
super("Too few in row/col",
super("BTSP-CONT-0004",
"Too few in row/col",
"",
"edu/rpi/legup/images/battleship/contradictions/too_few_segments.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
public class TooManyInFleetContradictionRule extends ContradictionRule {

public TooManyInFleetContradictionRule() {
super("Too Many in Fleet",
super("BTSP-CONT-0005",
"Too Many in Fleet",
"",
"edu/rpi/legup/images/battleship/contradictions/too_many_in_fleet.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
public class TooManyRowColContradiction extends ContradictionRule {

public TooManyRowColContradiction() {
super("Too Many row/col",
super("BTSP-CONT-0006",
"Too Many row/col",
"",
"edu/rpi/legup/images/battleship/contradictions/too_many_segments.png");
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
BTSP-BASC-0001 : ContinueShipBasicRule
BTSP-BASC-0002 : FinishedWithShipsBasicRule
BTSP-BASC-0003 : FinishWithWaterBasicRule
BTSP-BASC-0004 : SegmentTypeBasicRule
BTSP-BASC-0005 : SurroundShipBasicRule

BTSP-CONT-0001 : AdjacentShipsContradictionRule
BTSP-CONT-0002 : IncompleteShipContradictionRule
BTSP-CONT-0003 : TooFewInFleetContradictionRule
BTSP-CONT-0004 : TooFewRowColContradictionRule
BTSP-CONT-0005 : TooManyInFleetContradictionRule
BTSP-CONT-0006 : TooManyRowColContradiction

BTSP-CASE-0001 : SegmentTypeCaseRule
BTSP-CASE-0002 : ShipLocationCaseRule
BTSP-CASE-0003 : ShipOrWaterCaseRule

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@

public class BlackOrWhiteCaseRule extends CaseRule {
public BlackOrWhiteCaseRule() {
super("Black or White",
super("FPIX-CASE-0001",
"Black or White",
"Each cell is either black or white.",
"edu/rpi/legup/images/fillapix/cases/BlackOrWhite.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@

public class FinishWithBlackBasicRule extends BasicRule {
public FinishWithBlackBasicRule() {
super("Finish with Black",
super("FPIX-BASC-0001",
"Finish with Black",
"The remaining unknowns around and on a cell must be black to satisfy the number",
"edu/rpi/legup/images/fillapix/rules/FinishWithBlack.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@

public class FinishWithWhiteBasicRule extends BasicRule {
public FinishWithWhiteBasicRule() {
super("Finish with White",
super("FinishWithWhiteBasicRule",
"Finish with White",
"The remaining unknowns around and on a cell must be white to satisfy the number",
"edu/rpi/legup/images/fillapix/rules/FinishWithWhite.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
public class TooFewBlackCellsContradictionRule extends ContradictionRule {

public TooFewBlackCellsContradictionRule() {
super("Too Few Black Cells",
super("FPIX-CONT-0001",
"Too Few Black Cells",
"There may not be fewer black cells than the number.",
"edu/rpi/legup/images/fillapix/contradictions/TooFewBlackCells.png");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
public class TooManyBlackCellsContradictionRule extends ContradictionRule {

public TooManyBlackCellsContradictionRule() {
super("Too Many Black Cells",
super("FPIX-CONT-0002",
"Too Many Black Cells",
"There may not be more black cells than the number",
"edu/rpi/legup/images/fillapix/contradictions/TooManyBlackCells.png");
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FPIX-BASC-0001 : FinishWithBlackBasicRule
FPIX-BASC-0002 : FinishWithWhiteBasicRule

FPIX-CONT-0001 : TooFewBlackCellsContradictionRule
FPIX-CONT-0002 : TooManyBlackCellsContradictionRule

FPIX-CASE-0001 : BlackOrWhiteCaseRule
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");
}
}
Loading