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

Classify for more than two jokers

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@305 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Jannis Harder 2011-05-29 18:51:06 +02:00
parent cb50f92edd
commit c09a94a359
2 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/jrummikub/model/StoneSet.java
View file

@ -66,40 +66,33 @@ public class StoneSet implements Iterable<Stone>, Sizeable {
if (stones.size() < 3) {
return new Pair<Type, Integer>(INVALID, 0);
}
int nonJoker1 = -1, nonJoker2 = -1;
int nonJoker = -1;
for (int i = 0; i < stones.size(); i++) {
if (stones.get(i).isJoker()) {
continue;
}
nonJoker2 = nonJoker1;
nonJoker1 = i;
nonJoker = i;
}
if (nonJoker2 == -1) {
// Z first
if (nonJoker1 == 0 && stones.get(nonJoker1).getValue() < 12) {
return new Pair<Type, Integer>(RUN, isValidRun(nonJoker1));
if (nonJoker == -1) {
if (stones.size() > 13) {
return new Pair<Type, Integer>(INVALID, 0);
} else if (stones.size() > 4) {
return new Pair<Type, Integer>(RUN, 91 - (stones.size() - 13)*(stones.size() - 14)/2);
} else {
int value = stones.get(nonJoker1).getValue() * stones.size();
return new Pair<Type, Integer>(GROUP, value);
return new Pair<Type, Integer>(GROUP, stones.size() * 13);
}
}
// is run
if (stones.get(nonJoker1).getColor() == stones.get(nonJoker2)
.getColor()) {
if (isValidRun(nonJoker1) > 0) {
return new Pair<Type, Integer>(RUN, isValidRun(nonJoker1));
}
return new Pair<Type, Integer>(INVALID, 0);
}
// is group
else {
if (isValidGroup(stones.get(nonJoker1).getValue()) > 0) {
return new Pair<Type, Integer>(GROUP, isValidGroup(stones.get(
nonJoker1).getValue()));
}
int runScore = isValidRun(nonJoker);
int groupScore = isValidGroup(stones.get(nonJoker).getValue());
if (runScore > groupScore) {
return new Pair<Type, Integer>(RUN, runScore);
} else if (groupScore == 0) {
return new Pair<Type, Integer>(INVALID, 0);
} else {
return new Pair<Type, Integer>(GROUP, groupScore);
}
}

2
test/jrummikub/model/StoneSetTest.java
View file

@ -165,7 +165,7 @@ public class StoneSetTest {
new Stone(RED), new Stone(RED)));
assertSet(GROUP, 4 * 13, Arrays.asList(new Stone(RED),
new Stone(RED), new Stone(RED), new Stone(RED)));
assertSet(RUN, 5 * 11, Arrays.asList(new Stone(RED),
assertSet(RUN, 13 + 12 + 11 + 10 + 9, Arrays.asList(new Stone(RED),
new Stone(RED), new Stone(RED), new Stone(RED), new Stone(RED)));
assertSet(RUN, 5 * 10, Arrays.asList(new Stone(RED),
new Stone(RED), new Stone(RED), new Stone(RED), new Stone(12, RED)));