[Jrisk-cvs] SF.net SVN: domination-code:[2552] RiskAI
Brought to you by:
yuranet
|
From: <yu...@us...> - 2024-06-05 21:16:43
|
Revision: 2552
http://sourceforge.net/p/domination/code/2552
Author: yuranet
Date: 2024-06-05 21:16:40 +0000 (Wed, 05 Jun 2024)
Log Message:
-----------
ai-data goes into current dir, not parent dir
Modified Paths:
--------------
RiskAI/README.txt
RiskAI/source/BoardArmyHistrogramCalc/src/boardarmyhistrogramcalc/Main.java
RiskAI/source/JRiskAI/src/net/yura/domination/engine/ai/framework/AIPlayerFrameworkAbstract.java
RiskAI/source/JRiskAI/src/risk/AI/Data_Structures/T_AISettings.java
RiskAI/source/JRiskAI/src/risk/AI/Data_Structures/T_TrainingExampleWriter.java
RiskAI/source/Trainer/src/trainer/Main.java
RiskAI/source/Trainer/train_dt_ig_continent
RiskAI/source/Trainer/train_dt_rp_de_cost.bat
RiskAI/source/Trainer/train_nn_ig_continent.bat
RiskAI/source/Trainer/train_nn_mp.bat
RiskAI/source/TrainingDataConverter/AIPlayerFrameworkSettings.txt
RiskAI/source/TrainingDataConverter/convert_dt_rp_de_cost.bat
RiskAI/source/TrainingDataConverter/convert_nn_ig_continent.bat
RiskAI/source/TrainingDataConverter/src/trainingdataconverter/Main.java
Modified: RiskAI/README.txt
===================================================================
--- RiskAI/README.txt 2024-06-04 20:15:11 UTC (rev 2551)
+++ RiskAI/README.txt 2024-06-05 21:16:40 UTC (rev 2552)
@@ -17,7 +17,7 @@
- source/JRiskAI/custom_framework.txt
- source/RiskBattleProbTable/BattleOutcomeTable.txt
- source/TrainingDataConverter/AIPlayerFrameworkSettings.txt
-copy "ai-data" folder into the parent folder of Domination
+copy "ai-data" folder into the Domination install dir
there seem to be 3 new AIs, from docs:
- Scripted Framework: Creates a purely scripted implementation of the framework.
Modified: RiskAI/source/BoardArmyHistrogramCalc/src/boardarmyhistrogramcalc/Main.java
===================================================================
--- RiskAI/source/BoardArmyHistrogramCalc/src/boardarmyhistrogramcalc/Main.java 2024-06-04 20:15:11 UTC (rev 2551)
+++ RiskAI/source/BoardArmyHistrogramCalc/src/boardarmyhistrogramcalc/Main.java 2024-06-05 21:16:40 UTC (rev 2552)
@@ -84,9 +84,11 @@
String boardStateDirectory;
if (args.length == 1) {
boardStateDirectory = args[0];
- } else{
- boardStateDirectory = "../ai-data_10_first/ai-data/training_examples/boardstates/";
}
+ else {
+ boardStateDirectory = "ai-data_10_first/ai-data/training_examples/boardstates/";
+ }
+
if (!boardStateDirectory.endsWith("/")) {
boardStateDirectory += "/";
}
Modified: RiskAI/source/JRiskAI/src/net/yura/domination/engine/ai/framework/AIPlayerFrameworkAbstract.java
===================================================================
--- RiskAI/source/JRiskAI/src/net/yura/domination/engine/ai/framework/AIPlayerFrameworkAbstract.java 2024-06-04 20:15:11 UTC (rev 2551)
+++ RiskAI/source/JRiskAI/src/net/yura/domination/engine/ai/framework/AIPlayerFrameworkAbstract.java 2024-06-05 21:16:40 UTC (rev 2552)
@@ -54,7 +54,7 @@
this.board = new T_Board(riskGame);
this.game = new T_Game(riskGame, board, aiSettings);
- this.trainingExample = new T_TrainingExampleWriter(riskGame, aiSettings, aiSettings.saveTrainingExample, "../ai-data/");
+ this.trainingExample = new T_TrainingExampleWriter(riskGame, aiSettings, aiSettings.saveTrainingExample, "ai-data/");
this.trainingExample.init(riskGame); // this used to be done AFTER player init, but i hope it will work if done before
}
@@ -114,11 +114,19 @@
@Override
public void setGame(RiskGame riskGame) {
if (riskGame == null) {
+
+ // TODO YURA we can prob just get it from the currentFrameworkAI
+ //AIPlayerFrameworkGlobal ais = currentFrameworkAI.frameworkGame;
+ //ais.gameOver(ais.riskGame.getCurrentPlayer());
+ //gameGlobal.remove(ais.riskGame);
+
for (AIPlayerFrameworkGlobal global : gameGlobal.values()) {
- if (global.riskGame.getState() == RiskGame.STATE_GAME_OVER) {
- global.gameOver(global.riskGame.getCurrentPlayer());
- gameGlobal.remove(global.riskGame);
- return;
+ if (global.aiPlayers.containsValue(currentFrameworkAI)) {
+ if (global.riskGame.getState() == RiskGame.STATE_GAME_OVER) {
+ global.gameOver(global.riskGame.getCurrentPlayer());
+ gameGlobal.remove(global.riskGame);
+ return;
+ }
}
}
}
Modified: RiskAI/source/JRiskAI/src/risk/AI/Data_Structures/T_AISettings.java
===================================================================
--- RiskAI/source/JRiskAI/src/risk/AI/Data_Structures/T_AISettings.java 2024-06-04 20:15:11 UTC (rev 2551)
+++ RiskAI/source/JRiskAI/src/risk/AI/Data_Structures/T_AISettings.java 2024-06-05 21:16:40 UTC (rev 2552)
@@ -35,7 +35,7 @@
/** Should the framework save game statistics. */
public boolean saveFullGameStats = false;
/** The directory where the trained AI models for the learning AI techniques are stored */
- public String trainedAIModelsDirectory = "../ai-data/trained_models/";
+ public String trainedAIModelsDirectory = "ai-data/trained_models/";
/***************************************************************/
/* */
/* IMPORTANT: When adding new variables, increase this number: */
Modified: RiskAI/source/JRiskAI/src/risk/AI/Data_Structures/T_TrainingExampleWriter.java
===================================================================
--- RiskAI/source/JRiskAI/src/risk/AI/Data_Structures/T_TrainingExampleWriter.java 2024-06-04 20:15:11 UTC (rev 2551)
+++ RiskAI/source/JRiskAI/src/risk/AI/Data_Structures/T_TrainingExampleWriter.java 2024-06-05 21:16:40 UTC (rev 2552)
@@ -27,7 +27,7 @@
"master_prioritizer", "initialplacement",
"rp_ap_cost", "rp_ap_priority", "rp_makeattackplan", "rp_discardplan", "rp_de_cost", "rp_de_priority",
"rp_cashcards", "rp_placearmies", "rp_fortify", "rp_scoreattackplan", "rp_scoremergedplan"};*/
- private String baseDir = "../ai-data/";
+ private String baseDir = "ai-data/";
private Random rand = new Random();
private Vector trainingExamples = new Vector();
private boolean recordTrainingData;
Modified: RiskAI/source/Trainer/src/trainer/Main.java
===================================================================
--- RiskAI/source/Trainer/src/trainer/Main.java 2024-06-04 20:15:11 UTC (rev 2551)
+++ RiskAI/source/Trainer/src/trainer/Main.java 2024-06-05 21:16:40 UTC (rev 2552)
@@ -35,7 +35,7 @@
System.out.println(" technique: The AI technique to convert to. ");
System.out.println(" -Possibilities: \"nn\", \"dt\", \"nb\" or \"nn_wo\"");
System.out.println(" ai-data-dir: The directory location where the directory \"ai-data\" is located. ");
- System.out.println(" -Example: \"../\"");
+ System.out.println(" -Example: \"./\"");
aiDataLoadDirectory = "";
aiType = "";
modulename = "";
Modified: RiskAI/source/Trainer/train_dt_ig_continent
===================================================================
--- RiskAI/source/Trainer/train_dt_ig_continent 2024-06-04 20:15:11 UTC (rev 2551)
+++ RiskAI/source/Trainer/train_dt_ig_continent 2024-06-05 21:16:40 UTC (rev 2552)
@@ -1 +1 @@
-nice /coll/new/bin/java -Xmn8m -Xms16m -Xmx512m -jar Trainer.jar ig_continent dt ../ $1
\ No newline at end of file
+nice /coll/new/bin/java -Xmn8m -Xms16m -Xmx512m -jar Trainer.jar ig_continent dt ./ $1
\ No newline at end of file
Modified: RiskAI/source/Trainer/train_dt_rp_de_cost.bat
===================================================================
--- RiskAI/source/Trainer/train_dt_rp_de_cost.bat 2024-06-04 20:15:11 UTC (rev 2551)
+++ RiskAI/source/Trainer/train_dt_rp_de_cost.bat 2024-06-05 21:16:40 UTC (rev 2552)
@@ -1,2 +1,2 @@
-java -Xmn8m -Xms16m -Xmx512m -jar Trainer.jar rp_de_cost dt ../
+java -Xmn8m -Xms16m -Xmx512m -jar Trainer.jar rp_de_cost dt ./
pause
\ No newline at end of file
Modified: RiskAI/source/Trainer/train_nn_ig_continent.bat
===================================================================
--- RiskAI/source/Trainer/train_nn_ig_continent.bat 2024-06-04 20:15:11 UTC (rev 2551)
+++ RiskAI/source/Trainer/train_nn_ig_continent.bat 2024-06-05 21:16:40 UTC (rev 2552)
@@ -1,2 +1,2 @@
-java -Xmn8m -Xms16m -Xmx512m -jar Trainer.jar ig_continent nn ../
+java -Xmn8m -Xms16m -Xmx512m -jar Trainer.jar ig_continent nn ./
pause
\ No newline at end of file
Modified: RiskAI/source/Trainer/train_nn_mp.bat
===================================================================
--- RiskAI/source/Trainer/train_nn_mp.bat 2024-06-04 20:15:11 UTC (rev 2551)
+++ RiskAI/source/Trainer/train_nn_mp.bat 2024-06-05 21:16:40 UTC (rev 2552)
@@ -1,2 +1,2 @@
-java -Xmn8m -Xms16m -Xmx512m -jar Trainer.jar master_prioritizer nn ../../
+java -Xmn8m -Xms16m -Xmx512m -jar Trainer.jar master_prioritizer nn ./
pause
\ No newline at end of file
Modified: RiskAI/source/TrainingDataConverter/AIPlayerFrameworkSettings.txt
===================================================================
--- RiskAI/source/TrainingDataConverter/AIPlayerFrameworkSettings.txt 2024-06-04 20:15:11 UTC (rev 2551)
+++ RiskAI/source/TrainingDataConverter/AIPlayerFrameworkSettings.txt 2024-06-05 21:16:40 UTC (rev 2552)
@@ -11,4 +11,4 @@
saveTrainingExample=false
saveWinnerFile=false
saveFullGameStats=false
-trainedAIModelsDirectory=../ai-data/trained_models/
+trainedAIModelsDirectory=ai-data/trained_models/
Modified: RiskAI/source/TrainingDataConverter/convert_dt_rp_de_cost.bat
===================================================================
--- RiskAI/source/TrainingDataConverter/convert_dt_rp_de_cost.bat 2024-06-04 20:15:11 UTC (rev 2551)
+++ RiskAI/source/TrainingDataConverter/convert_dt_rp_de_cost.bat 2024-06-05 21:16:40 UTC (rev 2552)
@@ -1,2 +1,2 @@
-java -jar TrainingDataConverter.jar rp_de_cost dt ../
+java -jar TrainingDataConverter.jar rp_de_cost dt ./
pause
\ No newline at end of file
Modified: RiskAI/source/TrainingDataConverter/convert_nn_ig_continent.bat
===================================================================
--- RiskAI/source/TrainingDataConverter/convert_nn_ig_continent.bat 2024-06-04 20:15:11 UTC (rev 2551)
+++ RiskAI/source/TrainingDataConverter/convert_nn_ig_continent.bat 2024-06-05 21:16:40 UTC (rev 2552)
@@ -1,2 +1,2 @@
-java -jar TrainingDataConverter.jar ig_continent nn ../
+java -jar TrainingDataConverter.jar ig_continent nn ./
pause
\ No newline at end of file
Modified: RiskAI/source/TrainingDataConverter/src/trainingdataconverter/Main.java
===================================================================
--- RiskAI/source/TrainingDataConverter/src/trainingdataconverter/Main.java 2024-06-04 20:15:11 UTC (rev 2551)
+++ RiskAI/source/TrainingDataConverter/src/trainingdataconverter/Main.java 2024-06-05 21:16:40 UTC (rev 2552)
@@ -44,7 +44,7 @@
System.out.println(" technique: The AI technique to convert to. ");
System.out.println(" -Possibilities: \"nn\", \"dt\", \"nb\" or \"bn\" (dt and nb does the same)");
System.out.println(" ai-data-dir: The directory location where the directory \"ai-data\" is located. ");
- System.out.println(" -Example: \"../\"");
+ System.out.println(" -Example: \"./\"");
aiDataLoadDirectory = "";
convertType = "";
modulename = "";
|