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

No Limits implementiert und getestet, geht

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@413 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-06-11 04:09:29 +02:00
parent 8b1e09f025
commit 2c4d2ba28b
4 changed files with 161 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -85,17 +85,20 @@ public class StoneSet implements Iterable<Stone>, Sizeable, Serializable {
if (nonJoker == -1) {
if (stones.size() > settings.getHighestValue()
&& stones.size() > settings.getStoneColors().size()) {
&& stones.size() > settings.getStoneColors().size()
&& !settings.isNoLimits()) {
return new Pair<Type, Integer>(INVALID, 0);
} else if (stones.size() > settings.getStoneColors().size()) {
return new Pair<Type, Integer>(
RUN,
(settings.getHighestValue() * (settings
.getHighestValue() + 1))
/ 2
- (stones.size() - settings.getHighestValue())
* (stones.size() - settings.getHighestValue() - 1)
/ 2);
int value = 0;
int stoneValue = settings.getHighestValue();
for (int i = 0; i < stones.size(); i++) {
value += stoneValue;
stoneValue--;
if (stoneValue == 0) {
stoneValue = settings.getHighestValue();
}
}
return new Pair<Type, Integer>(RUN, value);
} else {
return new Pair<Type, Integer>(GROUP, stones.size()
* settings.getHighestValue());
@ -126,24 +129,33 @@ public class StoneSet implements Iterable<Stone>, Sizeable, Serializable {
int startValue = stones.get(referencePosition).getValue()
- referencePosition;
int endValue = startValue + stones.size() - 1;
if (startValue < 1 || endValue > settings.getHighestValue()) {
return 0;
if (!settings.isNoLimits()) {
if (startValue < 1 || endValue > settings.getHighestValue()) {
return 0;
}
}
int value = 0;
for (int i = 0; i < stones.size(); i++) {
int expectedValue = i + startValue;
while (expectedValue < 1) {
expectedValue += settings.getHighestValue();
}
while (expectedValue > settings.getHighestValue()) {
expectedValue -= settings.getHighestValue();
}
value += expectedValue;
if (stones.get(i).isJoker()) {
continue;
}
if (stones.get(i).getColor() != runColor) {
return 0;
}
if (stones.get(i).getValue() != i + startValue) {
if (stones.get(i).getValue() != expectedValue) {
return 0;
}
}
int value = 0;
for (int i = 0; i < stones.size(); i++) {
value += startValue + i;
}
return value;
}