Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mister-Kitty
Mister-Kitty committed Jan 2, 2024
1 parent 746289e commit 2fe42a4
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 98 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# https://www.atlassian.com/git/tutorials/saving-changes/gitignore

solver results/**
Ranges
*.gto
*.cfr

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gtohelper/datafetcher/models/WorkQueueModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class WorkQueueModel extends Saveable {

// No indexable java.concurrent structure with .take() exists. So
// we use the BlockingQueue and lock it for rebuilds to move item indexes ~ which are only valid if the Queue size > 2.
private Object pendingQueueLock = new Object();
private final Object pendingQueueLock = new Object();
private LinkedBlockingQueue<Work> pendingWorkQueue;

public WorkQueueModel(SaveFileHelper saveHelper, Consumer<Boolean> solverStatusCallback, Consumer<SolveTask> startedOnTaskCallback,
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gtohelper/domain/HandData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ public static class PlayerHandData implements Serializable {

// Calculated fields to be set
// These 3 fields are the info for the last action taken by the player.
public class LastActionForStreet implements Serializable{
public class LastActionForStreet implements Serializable {
private static final long serialVersionUID = 1L;
public short betLevel;
public Seat vsSeat;
Expand Down
78 changes: 1 addition & 77 deletions src/main/java/com/gtohelper/domain/PreflopState.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,46 +88,6 @@ public static int getBetLevelFromSituationAndLastAction(Situation situation, Las
}
}

private void fromString(String string) {
String[] splitStrings = string.split(delimiter);

// peel off the first segments until we find the leading 'situation'
int index = 0;
for(; index < splitStrings.length && situation == null; index++) {
String split = splitStrings[index];
// Check to see if it's a defined Situation
for(Situation s : Situation.values()) {
if(s.name.equals(split)) {
situation = s;
break;
}
}
}

assert index < splitStrings.length;

// index is now pointing at the split _after_ we find the 'situation'.
// This is because index++ is called before the break condition.
if(situation == Situation.LIMP) {
limpFromString(splitStrings[index]);
} else if(situation == Situation.RFI) {
rfiFromString(splitStrings[index]);
} else if(situation == Situation.VRFI) {
// Note that these FromStrings() have Villain, then hero as their parameter.
vRfiFromString(splitStrings[index], splitStrings[index + 1], splitStrings[index + 2]);
} else if(situation == Situation.V3BET) {
v3BetFromString(splitStrings[index + 1], splitStrings[index], splitStrings[index + 2]);
} else if(situation == Situation.V4BET) {
v4BetFromString(splitStrings[index], splitStrings[index + 1], splitStrings[index + 2]);
} else if(situation == Situation.V5BET) {
call5BetFromString(splitStrings[index + 1], splitStrings[index], splitStrings[index + 2]);
} else {
// todo: log error.
assert false;
}

}

@Override
public boolean equals(Object obj) {
if(obj == this)
Expand Down Expand Up @@ -161,65 +121,29 @@ else if(situation == Situation.V4BET)
else if(situation == Situation.V5BET)
return call5BetToString();
else
return "";
}

private void limpFromString(String heroPosition) {
heroSeat = Seat.fromString(heroPosition);
villainSeat = Seat.BB;
lastHeroAction = LastAction.CALL;
return "Invalid preflop state";
}

private String limpToString() {
return situation.name + delimiter + heroSeat.name;
}

private void rfiFromString(String heroPosition) {
heroSeat = Seat.fromString(heroPosition);
villainSeat = Seat.BB;
lastHeroAction = LastAction.RAISE;
}

private String rfiToString() {
return situation.name + delimiter + heroSeat.name;
}

private void vRfiFromString(String villainPosition, String heroPosition, String lastAction) {
heroSeat = Seat.fromString(heroPosition);
villainSeat = Seat.fromString(villainPosition.substring(1)); // remove the starting "v"
lastHeroAction = LastAction.fromString(lastAction);
}

private String vRfiToString() {
return situation.name + delimiter + "v" + villainSeat.name + delimiter + heroSeat.name + delimiter + lastHeroAction;
}

private void v3BetFromString(String villainPosition, String heroPosition, String lastAction) {
heroSeat = Seat.fromString(heroPosition);
villainSeat = Seat.fromString(villainPosition.substring(1)); // remove the starting "v"
lastHeroAction = LastAction.fromString(lastAction);
}

private String v3BetToString() {
return situation.name + delimiter + heroSeat.name + delimiter + "v" + villainSeat.name + delimiter + lastHeroAction;
}

private void v4BetFromString(String villainPosition, String heroPosition, String lastAction) {
heroSeat = Seat.fromString(heroPosition);
villainSeat = Seat.fromString(villainPosition.substring(1)); // remove the starting "v"
lastHeroAction = LastAction.fromString(lastAction);
}

private String v4BetToString() {
return situation.name + delimiter + "v" + villainSeat.name + delimiter + heroSeat.name + delimiter + lastHeroAction;
}

private void call5BetFromString(String villainPosition, String heroPosition, String lastAction) {
heroSeat = Seat.fromString(heroPosition);
villainSeat = Seat.fromString(villainPosition.substring(1)); // remove the starting "v"
lastHeroAction = LastAction.fromString(lastAction);
}

private String call5BetToString() {
return situation.name + delimiter + heroSeat.name + delimiter + "v" + villainSeat.name + delimiter + lastHeroAction;
}
Expand Down
33 changes: 17 additions & 16 deletions src/main/java/com/gtohelper/domain/Ranges.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,23 +60,15 @@ public void fillEmptyRanges() {
}

private void fillNoVillainMap(HashMap<PreflopState, RangeData> map, Situation sit, LastAction lastAction) {
RangeData lastRangeData = null;

PreflopState action = new PreflopState(sit, Seat.BB, Seat.SB, lastAction);
action.lastHeroAction = lastAction;
PreflopState action = new PreflopState();
action.situation = sit;
action.heroSeat = Seat.BB;
action.villainSeat = Seat.SB;

// This edge case is needed because the villainSeat is different.
RangeData data = map.get(action);
lastRangeData = data;
action.villainSeat = Seat.BB;
action.lastHeroAction = lastAction;

for(int heroIndex = 1; heroIndex < Seat.preflopPositionsDESC.length; heroIndex++) {
RangeData lastRangeData = null;
for(int heroIndex = 0; heroIndex < Seat.preflopPositionsDESC.length; heroIndex++) {
action.heroSeat = Seat.preflopPositionsDESC[heroIndex];

data = map.get(action);
RangeData data = map.get(action);
if ((data == null || data.isTheEmptyRange) && (lastRangeData != null && !lastRangeData.isTheEmptyRange))
map.put(new PreflopState(action), lastRangeData);
else
Expand Down Expand Up @@ -162,7 +154,11 @@ private void fillOPMap(HashMap<PreflopState, RangeData> map, Situation sit, Last
@Override
public RangeData put(PreflopState action, RangeData data) {
switch (action.situation) {
case LIMP -> limpMap.put(action, data);
case LIMP -> {
PreflopState noVersusAction = new PreflopState(action);
noVersusAction.villainSeat = null;
limpMap.put(noVersusAction, data);
}
case RFI -> RFIMap.put(action, data);
case VRFI -> vsRFIMap.put(action, data);
case V3BET -> vs3BetMap.put(action, data);
Expand All @@ -177,11 +173,16 @@ public RangeData put(PreflopState action, RangeData data) {

@Override
public RangeData get(Object obj) {
if (!(obj instanceof PreflopState action)) {
if (!(obj instanceof PreflopState)) {
return null;
}

return getBestMatch(action);
PreflopState newState = new PreflopState((PreflopState) obj);
if(newState.situation == Situation.LIMP) {
newState.villainSeat = null;
}

return getBestMatch(newState);
}

private RangeData getBestMatch(PreflopState action) {
Expand Down
21 changes: 18 additions & 3 deletions src/main/java/com/gtohelper/pt4datamanager/PT4HandDataDM.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,11 +195,26 @@ private void computeCalculatedFieldsForHandData(ArrayList<HandData> hands, int h
private void resolvePreflopActionForPlayersInHand(HandData hand) {
// Manually handle the all-limp case, to make edge cases in the following code chunk easier.
if(hand.highestPreflopBetLevel == 1) {
Seat earliestLimpSeat = Seat.BB;
for(PlayerHandData handData : hand.playerHandData) {
if(handData.seat.preflopPosition < earliestLimpSeat.preflopPosition) {
earliestLimpSeat = handData.seat;
}
}

for(PlayerHandData handData : hand.playerHandData) {
LastActionForStreet lastPreflopAction = handData.getLastActionForStreet(Street.PRE);
lastPreflopAction.betLevel = 1;
lastPreflopAction.vsSeat = Seat.BB;
lastPreflopAction.action = Action.CALL;

if(handData.seat == earliestLimpSeat)
lastPreflopAction.vsSeat = Seat.BB;
else
lastPreflopAction.vsSeat = earliestLimpSeat;

if(handData.seat == Seat.BB)
lastPreflopAction.action = Action.CHECK;
else
lastPreflopAction.action = Action.CALL;
}
return;
}
Expand Down Expand Up @@ -246,7 +261,7 @@ private void resolvePostflopActionForPlayersInHand(HandData hand, Street street,
LastActionForStreet lastAction = handData.getLastActionForStreet(street);
lastAction.betLevel = 0;
lastAction.vsSeat = null;
lastAction.action = Action.CALL;
lastAction.action = Action.CHECK;
}
return;
}
Expand Down

0 comments on commit 2fe42a4

Please sign in to comment.