[Jrisk-cvs] SF.net SVN: domination-code:[2519] RiskAI/source/JRiskAI/src/risk/AI

[<yu...@us...>]

Revision: 2519
          http://sourceforge.net/p/domination/code/2519
Author:   yuranet
Date:     2024-04-19 10:05:40 +0000 (Fri, 19 Apr 2024)
Log Message:
-----------
fix to use new player type ids

Modified Paths:
--------------
    RiskAI/source/JRiskAI/src/risk/AI/Data_Structures/T_Game.java
    RiskAI/source/JRiskAI/src/risk/AI/Data_Structures/T_TrainingExampleWriter.java
    RiskAI/source/JRiskAI/src/risk/AI/Modules/AI_Framework.java

Modified: RiskAI/source/JRiskAI/src/risk/AI/Data_Structures/T_Game.java
===================================================================
--- RiskAI/source/JRiskAI/src/risk/AI/Data_Structures/T_Game.java	2024-04-17 16:16:37 UTC (rev 2518)
+++ RiskAI/source/JRiskAI/src/risk/AI/Data_Structures/T_Game.java	2024-04-19 10:05:40 UTC (rev 2519)
@@ -143,9 +143,6 @@
 		this.attackerArmies = game.getAttacker().getArmies();
 		int armiesLost = oldAttackerArmies == -1 ? 0 : oldAttackerArmies - attackerArmies;
 
-
-
-System.out.println("getLastBattle_ArmiesLost " + armiesLost);
 		int checkValue = game.getLastBattle_ArmiesLost();
 		if (armiesLost != checkValue) throw new IllegalStateException("value missmatch " + armiesLost + " != " + checkValue);
 
@@ -153,7 +150,7 @@
 	}
 
 	public void resetLastBattle_ArmiesLost() {
-System.out.println("resetLastBattle_ArmiesLost");
+		attacker = null;
 		attackerArmies = -1;
 		game.resetLastBattle_ArmiesLost();
 	}

Modified: RiskAI/source/JRiskAI/src/risk/AI/Data_Structures/T_TrainingExampleWriter.java
===================================================================
--- RiskAI/source/JRiskAI/src/risk/AI/Data_Structures/T_TrainingExampleWriter.java	2024-04-17 16:16:37 UTC (rev 2518)
+++ RiskAI/source/JRiskAI/src/risk/AI/Data_Structures/T_TrainingExampleWriter.java	2024-04-19 10:05:40 UTC (rev 2519)
@@ -2,6 +2,9 @@
 
 import java.io.*;
 import java.util.*;
+import net.yura.domination.engine.ai.framework.AIPlayerFrameworkBest;
+import net.yura.domination.engine.ai.framework.AIPlayerFrameworkCustom;
+import net.yura.domination.engine.ai.framework.AIPlayerFrameworkScripted;
 
 import net.yura.domination.engine.core.Card;
 import net.yura.domination.engine.core.Continent;
@@ -274,7 +277,7 @@
 			beginTag("mission", data);
 			addToData(T_Game.decentMissionToString(p.getMission(),p),data);
 			endTag("mission", data);
-			if (p.getType() == 7) { // Framework_custom
+			if (p.getType() == AIPlayerFrameworkCustom.TYPE) { // Framework_custom
 				beginTag("round_times", data);
 				for (int r = 0; r < this.frameworkTimers[i].size(); r++) {
 					addToData(String.valueOf(frameworkTimers[i].get(r).getTimer()),data);
@@ -429,17 +432,21 @@
 	
 	private String playerTypeToString(Player p) {
 		switch (p.getType()) {
-			case 0: return "human";
-			case 1: return "AI (Easy)";
-			case 2: return "AI (Hard)";
-			case 3: return "Neutral";
-			case 4: return "AI (Random)";
-			case 5: return "AI (Framework)";
-			case 6: return "AI (ExtraHard)";
-			case 7: return "AI (Framework_custom)";
-			case 8: return "AI (Framework_best)";
+			case Player.PLAYER_HUMAN: return "human";
+
+			case Player.PLAYER_AI_CRAP: return "AI (Crap)";
+			case Player.PLAYER_AI_EASY: return "AI (Easy)";
+			case Player.PLAYER_AI_AVERAGE: return "AI (Average)";
+			case Player.PLAYER_AI_HARD: return "AI (Hard)";
+
+			case Player.PLAYER_NEUTRAL: return "Neutral";
+
+			case AIPlayerFrameworkScripted.TYPE: return "AI (Framework)";
+			case AIPlayerFrameworkCustom.TYPE: return "AI (Framework_custom)";
+			case AIPlayerFrameworkBest.TYPE: return "AI (Framework_best)";
+
+			default: return "unknown";
 		}
-		return "unknown";
 	}
 	
 	private void deleteLastBoard(T_TrainingExample currentBoardTrainingExample) {

Modified: RiskAI/source/JRiskAI/src/risk/AI/Modules/AI_Framework.java
===================================================================
--- RiskAI/source/JRiskAI/src/risk/AI/Modules/AI_Framework.java	2024-04-17 16:16:37 UTC (rev 2518)
+++ RiskAI/source/JRiskAI/src/risk/AI/Modules/AI_Framework.java	2024-04-19 10:05:40 UTC (rev 2519)
@@ -18,7 +18,7 @@
 	
 	private Random rand = new Random(); // used in selectCapital only.
 	
-	private final boolean debugging = true;
+	private final boolean debugging = false;
 	private final boolean outputLog = false;
 	
 	protected C_IG_Mission igMission_module;