neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implemented Table, passes tests

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@90 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Jannis Harder 2011-05-03 19:06:16 +02:00
parent 760f914494
commit 7b8732714d
2 changed files with 61 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/jrummikub/model/Table.java
View file

@ -1,5 +1,7 @@
package jrummikub.model;
import jrummikub.util.Pair;
/** Class administering the {@link Stone}s on the game-Table */
public class Table extends StoneTray<StoneSet> {
@ -11,13 +13,66 @@ public class Table extends StoneTray<StoneSet> {
* stone to pick up
*/
public void pickUpStone(Stone stone) {
// TODO implement this method
// Find the set of the stone
StoneSet set = null;
Position setPosition = null;
int stonePosition = 0;
setLoop: for (Pair<StoneSet, Position> i : this) {
set = i.getFirst();
setPosition = i.getSecond();
stonePosition = 0;
for (Stone j : set) {
if (j == stone) {
break setLoop;
}
stonePosition++;
}
}
// Stone not found
if (set == null) {
return;
}
splitSet(set, setPosition, stonePosition);
}
private void splitSet(StoneSet set, Position setPosition, int stonePosition) {
pickUp(set);
Pair<StoneSet, StoneSet> firstSplit = set.splitAt(stonePosition);
Pair<StoneSet, StoneSet> secondSplit = firstSplit.getSecond().splitAt(1);
StoneSet leftSet = firstSplit.getFirst();
StoneSet rightSet = secondSplit.getSecond();
if (set.classify() == StoneSet.Type.RUN) {
Position leftPosition, rightPosition;
leftPosition = setPosition;
rightPosition = new Position(setPosition.getX() + stonePosition, setPosition.getY());
drop(leftSet, leftPosition);
drop(rightSet, rightPosition);
} else {
Position newPosition = new Position(setPosition.getX() + 0.5f, setPosition.getY());
if (leftSet == null) {
drop(rightSet, newPosition);
} else if (rightSet == null) {
drop(leftSet, newPosition);
} else {
drop(leftSet.join(rightSet), newPosition);
}
}
}
/** Tests the Table for rule conflicts by checking all the {@link StoneSet} */
public boolean isValid() {
// TODO implement this method
return false;
for (Pair<StoneSet, Position> i : this) {
if (!i.getFirst().isValid()) {
return false;
}
}
return true;
}
}

6
test/jrummikub/model/TableTest.java
View file

@ -50,7 +50,7 @@ public class TableTest {
for (Object i : testTable) {
counter++;
}
assertEquals(counter, 1);
assertEquals(1, counter);
}
@Test
@ -58,7 +58,7 @@ public class TableTest {
public void testPickUpStoneRun() {
Stone targetStone = new Stone(BLACK);
testTable.drop(new StoneSet(Arrays.asList(new Stone(1, RED), targetStone,
new Stone(3, BLACK))), new Position(0,0));
new Stone(3, RED))), new Position(0,0));
assertTrue(testTable.isValid());
testTable.pickUpStone(targetStone);
assertFalse(testTable.isValid());
@ -67,6 +67,6 @@ public class TableTest {
for (Object i : testTable) {
counter++;
}
assertEquals(counter, 2);
assertEquals(2, counter);
}
}