WIP - Do some ranges refactoring

Mister-Kitty · Dec 30, 2023 · 746289e · 746289e
1 parent 73ffb65
commit 746289e
Show file tree

Hide file tree

Showing 76 changed files with 178 additions and 250 deletions.
diff --git a/Default Ranges/6 Max/RFI/BTN.txt b/Default Ranges/6 Max/RFI/BTN.txt
diff --git a/Default Ranges/6 Max/RFI/CO.txt b/Default Ranges/6 Max/RFI/CO.txt
diff --git a/Default Ranges/6 Max/RFI/HJ.txt b/Default Ranges/6 Max/RFI/HJ.txt
diff --git a/Default Ranges/6 Max/RFI/LJ.txt b/Default Ranges/6 Max/RFI/LJ.txt
diff --git a/Default Ranges/6 Max/RFI/SB.txt b/Default Ranges/6 Max/RFI/SB.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/BTN vs/BB Call.txt b/Default Ranges/6 Max/vs 3Bet/BTN vs/BB Call.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/BTN vs/BB Raise.txt b/Default Ranges/6 Max/vs 3Bet/BTN vs/BB Raise.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/BTN vs/SB Call.txt b/Default Ranges/6 Max/vs 3Bet/BTN vs/SB Call.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/BTN vs/SB Raise.txt b/Default Ranges/6 Max/vs 3Bet/BTN vs/SB Raise.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/CO vs/BB Call.txt b/Default Ranges/6 Max/vs 3Bet/CO vs/BB Call.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/CO vs/BB Raise.txt b/Default Ranges/6 Max/vs 3Bet/CO vs/BB Raise.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/CO vs/BTN Call.txt b/Default Ranges/6 Max/vs 3Bet/CO vs/BTN Call.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/CO vs/BTN Raise.txt b/Default Ranges/6 Max/vs 3Bet/CO vs/BTN Raise.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/CO vs/SB Call.txt b/Default Ranges/6 Max/vs 3Bet/CO vs/SB Call.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/CO vs/SB Raise.txt b/Default Ranges/6 Max/vs 3Bet/CO vs/SB Raise.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/HJ vs/BB Call.txt b/Default Ranges/6 Max/vs 3Bet/HJ vs/BB Call.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/HJ vs/BB Raise.txt b/Default Ranges/6 Max/vs 3Bet/HJ vs/BB Raise.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/HJ vs/BTN Call.txt b/Default Ranges/6 Max/vs 3Bet/HJ vs/BTN Call.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/HJ vs/BTN Raise.txt b/Default Ranges/6 Max/vs 3Bet/HJ vs/BTN Raise.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/HJ vs/CO Call.txt b/Default Ranges/6 Max/vs 3Bet/HJ vs/CO Call.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/HJ vs/CO Raise.txt b/Default Ranges/6 Max/vs 3Bet/HJ vs/CO Raise.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/HJ vs/SB Call.txt b/Default Ranges/6 Max/vs 3Bet/HJ vs/SB Call.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/HJ vs/SB Raise.txt b/Default Ranges/6 Max/vs 3Bet/HJ vs/SB Raise.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/LJ vs/BB Call.txt b/Default Ranges/6 Max/vs 3Bet/LJ vs/BB Call.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/LJ vs/BB Raise.txt b/Default Ranges/6 Max/vs 3Bet/LJ vs/BB Raise.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/LJ vs/BTN Call.txt b/Default Ranges/6 Max/vs 3Bet/LJ vs/BTN Call.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/LJ vs/BTN Raise.txt b/Default Ranges/6 Max/vs 3Bet/LJ vs/BTN Raise.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/LJ vs/CO Call.txt b/Default Ranges/6 Max/vs 3Bet/LJ vs/CO Call.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/LJ vs/CO Raise.txt b/Default Ranges/6 Max/vs 3Bet/LJ vs/CO Raise.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/LJ vs/SB Call.txt b/Default Ranges/6 Max/vs 3Bet/LJ vs/SB Call.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/LJ vs/SB Raise.txt b/Default Ranges/6 Max/vs 3Bet/LJ vs/SB Raise.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/SB vs/vs BB Call.txt b/Default Ranges/6 Max/vs 3Bet/SB vs/vs BB Call.txt
diff --git a/Default Ranges/6 Max/vs 3Bet/SB vs/vs BB Raise.txt b/Default Ranges/6 Max/vs 3Bet/SB vs/vs BB Raise.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs BTN/BB Call.txt b/Default Ranges/6 Max/vs RFI/vs BTN/BB Call.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs BTN/BB Raise.txt b/Default Ranges/6 Max/vs RFI/vs BTN/BB Raise.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs BTN/SB Call.txt b/Default Ranges/6 Max/vs RFI/vs BTN/SB Call.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs BTN/SB Raise.txt b/Default Ranges/6 Max/vs RFI/vs BTN/SB Raise.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs CO/BB Call.txt b/Default Ranges/6 Max/vs RFI/vs CO/BB Call.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs CO/BB Raise.txt b/Default Ranges/6 Max/vs RFI/vs CO/BB Raise.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs CO/BTN Call.txt b/Default Ranges/6 Max/vs RFI/vs CO/BTN Call.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs CO/BTN Raise.txt b/Default Ranges/6 Max/vs RFI/vs CO/BTN Raise.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs CO/SB Call.txt b/Default Ranges/6 Max/vs RFI/vs CO/SB Call.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs CO/SB Raise.txt b/Default Ranges/6 Max/vs RFI/vs CO/SB Raise.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs HJ/BB Call.txt b/Default Ranges/6 Max/vs RFI/vs HJ/BB Call.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs HJ/BB Raise.txt b/Default Ranges/6 Max/vs RFI/vs HJ/BB Raise.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs HJ/BTN Call.txt b/Default Ranges/6 Max/vs RFI/vs HJ/BTN Call.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs HJ/BTN Raise.txt b/Default Ranges/6 Max/vs RFI/vs HJ/BTN Raise.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs HJ/CO Call.txt b/Default Ranges/6 Max/vs RFI/vs HJ/CO Call.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs HJ/CO Raise.txt b/Default Ranges/6 Max/vs RFI/vs HJ/CO Raise.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs HJ/SB Call.txt b/Default Ranges/6 Max/vs RFI/vs HJ/SB Call.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs HJ/SB Raise.txt b/Default Ranges/6 Max/vs RFI/vs HJ/SB Raise.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs LJ/BB Call.txt b/Default Ranges/6 Max/vs RFI/vs LJ/BB Call.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs LJ/BB Raise.txt b/Default Ranges/6 Max/vs RFI/vs LJ/BB Raise.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs LJ/BTN Call.txt b/Default Ranges/6 Max/vs RFI/vs LJ/BTN Call.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs LJ/BTN Raise.txt b/Default Ranges/6 Max/vs RFI/vs LJ/BTN Raise.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs LJ/CO Call.txt b/Default Ranges/6 Max/vs RFI/vs LJ/CO Call.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs LJ/CO Raise.txt b/Default Ranges/6 Max/vs RFI/vs LJ/CO Raise.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs LJ/HJ Call.txt b/Default Ranges/6 Max/vs RFI/vs LJ/HJ Call.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs LJ/HJ Raise.txt b/Default Ranges/6 Max/vs RFI/vs LJ/HJ Raise.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs LJ/SB Call.txt b/Default Ranges/6 Max/vs RFI/vs LJ/SB Call.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs LJ/SB Raise.txt b/Default Ranges/6 Max/vs RFI/vs LJ/SB Raise.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs SB/BB Call.txt b/Default Ranges/6 Max/vs RFI/vs SB/BB Call.txt
diff --git a/Default Ranges/6 Max/vs RFI/vs SB/BB Raise.txt b/Default Ranges/6 Max/vs RFI/vs SB/BB Raise.txt
diff --git a/src/main/java/com/gtohelper/datafetcher/controllers/HandAnalysisController.java b/src/main/java/com/gtohelper/datafetcher/controllers/HandAnalysisController.java
@@ -8,7 +8,6 @@
 import com.gtohelper.utility.Popups;
 import com.gtohelper.utility.SaveFileHelper;
 import javafx.application.Platform;
-import javafx.beans.binding.Bindings;
 import javafx.beans.property.*;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -18,8 +17,6 @@
 import javafx.scene.input.MouseEvent;
 import javafx.util.Callback;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.sql.SQLException;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -521,7 +518,7 @@ private void initializeSituationMaps() {
         heroOOPSituationList.add(new SituationComboBoxMapping("2Bet - Villain calls vs Hero", Situation.RFI, LastAction.RAISE));
         heroOOPSituationList.add(new SituationComboBoxMapping("3Bet - Hero calls vs Villain", Situation.V3BET, LastAction.CALL));
         heroOOPSituationList.add(new SituationComboBoxMapping("4Bet - Villain calls vs Hero", Situation.V3BET, LastAction.RAISE));
-        heroOOPSituationList.add(new SituationComboBoxMapping("5Bet - Hero calls vs Villain", Situation.CALL5BET, LastAction.CALL));
+        heroOOPSituationList.add(new SituationComboBoxMapping("5Bet - Hero calls vs Villain", Situation.V5BET, LastAction.CALL));
     }
 
     private void getPositionVsPositionHands() {

diff --git a/src/main/java/com/gtohelper/datafetcher/controllers/solversettings/RangeFilesController.java b/src/main/java/com/gtohelper/datafetcher/controllers/solversettings/RangeFilesController.java
@@ -140,7 +140,7 @@ private String getFilePathRelativeToFolder(String folderPath, String filePath) {
     }
 
     public Ranges loadRangeFiles() {
-        return rangeFilesModel.loadRangeFiles(actionToRangeFileMap);
+        return rangeFilesModel.loadRangeFromRangeFolder(rangeFolderLocation.getText());
     }
 
     void loadFieldsFromModel() {
@@ -150,8 +150,8 @@ void loadFieldsFromModel() {
             // If the range folder location DNE, like on first launch or user fuckery, we
             // regenerate it from resources.
             ClassLoader classLoader = RangeFilesController.class.getClassLoader();
-            InputStream inputStream = classLoader.getResourceAsStream("6 Max.zip");
-            String outputFolder = "Default Ranges/";
+            InputStream inputStream = classLoader.getResourceAsStream("Default-Cash-100bb.zip");
+            String outputFolder = "Ranges/";
 
             try(ZipInputStream zipInputStream = new ZipInputStream(inputStream)) {
                 ZipEntry entry;
@@ -173,7 +173,7 @@ void loadFieldsFromModel() {
             }
 
             // Default range generation successful. Now let's update and set new folder location.
-            Path sixmaxFolderPath = Paths.get(outputFolder + "6 Max").toAbsolutePath();
+            Path sixmaxFolderPath = Paths.get(outputFolder + "Default-Cash-100bb").toAbsolutePath();
             savedFolder = sixmaxFolderPath.toString();
             rangeFilesModel.saveTextField("rangeFolderLocation", savedFolder);
         }

diff --git a/src/main/java/com/gtohelper/datafetcher/models/WorkQueueModel.java b/src/main/java/com/gtohelper/datafetcher/models/WorkQueueModel.java
@@ -391,9 +391,10 @@ private SolverOutput dispatchSolve(SolveTask solve, Work.WorkSettings settings,
             RangeData ipRange = ranges.getRangeForHand(solve.getHandData().ipPlayer);
 
             if(ipRange == null || oopRange == null) {
-                String error = String.format("Could not resolve range files for handId = %d (aka board %s, %d bet pot, with aggressor seats %s)",
-                        solve.getHandData().id_hand, CardResolver.getBoardString(solve.getHandData()),
-                        solve.getHandData().highestPreflopBetLevel, solve.getHandData().str_aggressors_p);
+                String error = String.format("No matching range exists for hand (board %s, %d bet pot, with PF aggressor seats %s)",
+                        CardResolver.getBoardString(solve.getHandData()),
+                        solve.getHandData().highestPreflopBetLevel,
+                        solve.getHandData().str_aggressors_p);
                 Logger.log(error);
                 results.setError(error);
                 return results;