AIのプロトタイプと対戦環境

Author: winjii

Procon2018/AI.h

@@ -0,0 +1,33 @@
+#pragma once
+#include "Shared/Util.h"
+#include "Shared/Field.h"
+#include <future>
+#include <thread>
+
+namespace Procon2018 {
+
+
+class AI {
+private:
+	std::optional<std::future<PlayerMove>> m_result;
+protected:
+	virtual PlayerMove calcNextMove(std::optional<std::pair<PlayerMove, PlayerMove>> moves) = 0;
+public:
+	virtual void init(const Field &field, PlayerId playerId) = 0;
+	virtual void forward(std::optional<std::pair<PlayerMove, PlayerMove>> moves) {
+		m_result = std::async(std::launch::async, [&, moves](){
+			return calcNextMove(moves);
+		});
+	}
+	virtual std::optional<PlayerMove> getNextMove() {
+		if (m_result && m_result->wait_for(std::chrono::milliseconds(0)) == std::future_status::ready) {
+			auto ret = m_result->get();
+			m_result.reset();
+			return ret;
+		}
+		return std::optional<PlayerMove>();
+	}
+};
+
+
+}

Procon2018/FieldView.cpp

@@ -44,7 +44,7 @@ void FieldView::update() {
 	auto drawAgent = [&](int i) {
 		Point currentPos = m_fld.agentPos((AgentId)i);
 		Point oldPos = m_oldPlayerPos[i];
-		PlayerId team = m_fld.teamOf((AgentId)i);
+		PlayerId team = m_fld.playerOf((AgentId)i);
 		s3d::Color color = team == PlayerId::B ? s3d::Palette::Red : s3d::Palette::Blue;
 		s3d::Vec2 end = gridCenter(currentPos);
 		s3d::Vec2 start = gridCenter(oldPos);

Procon2018/GameLog.cpp

@@ -0,0 +1,8 @@
+#include "stdafx.h"
+#include "GameLog.h"
+
+
+GameLog::GameLog() {}
+
+
+GameLog::~GameLog() {}

Procon2018/GameLog.h

@@ -0,0 +1,7 @@
+#pragma once
+class GameLog {
+public:
+	GameLog();
+	~GameLog();
+};
+

Procon2018/Main.cpp

@@ -3,6 +3,7 @@
 #include "Shared/DnnClient.h"
 #include "Shared/Mcts.h"
 #include "Playground.h"
+#include "WinjAI/WinjAI.h"
 
 
 namespace Procon2018 {
@@ -29,7 +30,7 @@ void TrainDataVisualize() {
 	}
 }
 
-void Battle() {
+void BattleToDnn() {
 	auto toMove = [](const std::string &s) {
 		if (s[0] == 'x') return OptAction();
 		ActionType type = ActionType::Move;
@@ -100,6 +101,15 @@ void HumanPlay() {
 	}
 }
 
+void BattleToWinjAI() {
+	SP<AI> winjAI((AI*)new WinjAI::WinjAI());
+	SP<AI> winjAI2((AI*)new WinjAI::WinjAI());
+	Playground grd(s3d::RectF(0, 0, s3d::Window::Size()), winjAI, nullptr);
+	while (s3d::System::Update()) {
+		grd.update();
+	}
+}
+
 
 }
 
@@ -113,32 +123,7 @@ void Main()
 	Rand::InitializeWithTime();
 
 	//TrainDataVisualize();
-	//Battle();
-	HumanPlay();
-
-	/*
-	using namespace boost::property_tree;
-	std::ifstream ifs("2.json");
-
-	auto toStr = [](OptAction a) {
-		if (!a) return std::string("  ");
-		std::string s = a->type == ActionType::Move ? "m" : "r";
-		return s + std::to_string(a->dir);
-	};
-	ptree pt;
-	read_json(ifs, pt);
-	Field state = Field::FromPTree(pt.get_child("state"));
-	DnnClient dnn("127.0.0.1", 54215);
-	PolicyPair pp;
-	double v = dnn.Evaluate(state, pp);
-	std::cout << "value: " << v << std::endl;
-	for (int i = 0; i < 2; i++) {
-		std::cout << std::endl;
-		for (int j = 0; j < PlayerMove::IntCount(); j++) {
-			PlayerMove m = PlayerMove::FromInt(j);
-			std::cout << j << "(" << toStr(m.a0) << "," << toStr(m.a1) << "): " << pp[i][j] << std::endl;
-		}
-	}
-	std::cout << state.value() << std::endl;
-	*/
+	//BattleToDnn();
+	//HumanPlay();
+	BattleToWinjAI();
 }

Procon2018/Playground.cpp

@@ -8,11 +8,41 @@ namespace Procon2018 {
 Playground::Playground(const s3d::RectF & viewport)
 : FieldView(viewport, Field::RandomState())
 , m_actions()
-, m_dragState() {
+, m_dragState()
+, m_ai() {
+}
+
+Playground::Playground(const s3d::RectF & viewport, SP<AI> ai0, SP<AI> ai1)
+: FieldView(viewport, Field::RandomState())
+, m_actions()
+, m_dragState()
+, m_ai{ai0, ai1} {
+	if (ai0) {
+		ai0->init(m_fld, PlayerId::A);
+		ai0->forward({});
+	}
+	if (ai1) {
+		ai1->init(m_fld, PlayerId::B);
+		ai1->forward({});
+	}
 }
 
 void Playground::update() {
 	FieldView::update();
+	if (m_fld.isEnd()) return;
+
+	bool forwards = s3d::KeyEnter.down();
+	bool validInput[4] = {};
+	for (int i = 0; i < 2; i++) {
+		if (m_ai[i] == nullptr) {
+			validInput[2*i] = validInput[2*i + 1] = true;
+			continue;
+		}
+		auto move = m_ai[i]->getNextMove();
+		if (!move) continue;
+		m_actions[2*i] = move->a0;
+		m_actions[2*i + 1] = move->a1;
+	}
 
 	auto toGridPos = [&](s3d::Vec2 vec) {
 		s3d::Vec2 pos = vec - m_v.tl();
@@ -31,6 +61,7 @@ void Playground::update() {
 	if (s3d::MouseL.down() || s3d::MouseR.down()) {
 		Point p = toGridPos(mousePos);
 		for (int i = 0; i < 4; i++) {
+			if (!validInput[i]) continue;
 			if (p == m_fld.agentPos((AgentId)i)) {
 				DragState s;
 				if (s3d::MouseL.down()) s.type = ActionType::Move;
@@ -79,14 +110,23 @@ void Playground::update() {
 		drawAction(s3d::Line(gridCenter(p), gridCenter(trg)), m_actions[i]->type);
 	}
 
-	if (s3d::KeyEnter.down()) {
+	if (forwards && m_fld.resTurn() > 0) {
 		forward(m_actions[0], m_actions[1], m_actions[2], m_actions[3]);
+		std::cout << "resTurn: " << m_fld.resTurn() << std::endl;
+		auto score = m_fld.calcScore();
+		std::cout << "score: (blue: " << score.first << ", red: " << score.second << ")" << std::endl;
+		
+		if (m_fld.resTurn() > 0) {
+			PlayerMove m0 = PlayerMove(m_actions[0], m_actions[1]);
+			PlayerMove m1 = PlayerMove(m_actions[2], m_actions[3]);
+			std::optional<std::pair<PlayerMove, PlayerMove>> moves = std::make_pair(m0, m1);
+			for (int i = 0; i < 2; i++) {
+				if (m_ai[i]) m_ai[i]->forward(moves);
+			}
+		}
 		for (int i = 0; i < 4; i++) {
 			m_actions[i].reset();
 		}
-		std::cout << "resTurn: " << m_fld.resTurn() << std::endl;
-		auto score = m_fld.calcScore();
-		std::cout << "score: (" << score.first << ", " << score.second << ")" << std::endl;
 	}
 }
 

Procon2018/Playground.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "Shared/Util.h"
 #include "FieldView.h"
+#include "AI.h"
 
 
 namespace Procon2018 {
@@ -19,10 +20,14 @@ class Playground : FieldView {
 
 	std::optional<DragState> m_dragState;
 
+	SP<AI> m_ai[2];
+
 public:
 
 	Playground(const s3d::RectF &viewport);
 
+	Playground(const s3d::RectF &viewport, SP<AI> ai0, SP<AI> ai1);
+
 	void update();
 
 };

Procon2018/Procon2018.vcxproj

@@ -198,6 +198,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="FieldView.cpp" />
+    <ClCompile Include="GameLog.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="Playground.cpp" />
     <ClCompile Include="Shared\DnnClient.cpp" />
@@ -267,7 +268,9 @@
     <Text Include="App\example\test.txt" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="AI.h" />
     <ClInclude Include="FieldView.h" />
+    <ClInclude Include="GameLog.h" />
     <ClInclude Include="Playground.h" />
     <ClInclude Include="Shared\DnnClient.h" />
     <ClInclude Include="Shared\Field.h" />
@@ -277,6 +280,7 @@
     <ClInclude Include="Shared\Util.h" />
     <ClInclude Include="TrainDataVisualizer.h" />
     <ClInclude Include="Visualizer.h" />
+    <ClInclude Include="WinjAI\WinjAI.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Procon2018/Procon2018.vcxproj.filters

@@ -78,6 +78,9 @@
     <ClCompile Include="Playground.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="GameLog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="App\icon.ico">
@@ -244,5 +247,14 @@
     <ClInclude Include="Playground.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="AI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="WinjAI\WinjAI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GameLog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

Procon2018/Shared/Field.cpp

@@ -197,11 +197,19 @@ const Grid& Field::grid(const Point &pos) const {
 	return m_field[pos.y][pos.x];
 }
 
+void Field::setColor(const Point & pos, const std::optional<PlayerId> &color) {
+	m_field[pos.y][pos.x].color = color;
+}
+
+void Field::setPos(AgentId agentId, const Point & pos) {
+	m_agent[(int)agentId] = pos;
+}
+
 const Point& Field::agentPos(AgentId playerId) const {
 	return m_agent[(int)playerId];
 }
 
-PlayerId Field::teamOf(AgentId playerId) const {
+PlayerId Field::playerOf(AgentId playerId) const {
 	return (int)playerId < 2 ? PlayerId::A : PlayerId::B;
 }
 
@@ -262,7 +270,7 @@ bool Field::checkValid(AgentId agentId, const Action & a) const {
 		Point next = m_agent[(int)agentId] + Neighbour8(a.dir);
 		if (outOfField(next)) return false;
 		if (auto &c = m_field[next.y][next.x].color)
-			if (c.value() != teamOf(agentId)) return false;
+			if (c.value() != playerOf(agentId)) return false;
 		return true;
 	}
 	if (a.type == ActionType::Remove) {
@@ -340,7 +348,7 @@ bool Field::forward(const OptAction& a0,
 	// 塗り絵処理
 	for (int i = 0; i < 4; i++) {
 		m_agent[i] = pos[i];
-		m_field[pos[i].y][pos[i].x].color = teamOf((AgentId)i);
+		m_field[pos[i].y][pos[i].x].color = playerOf((AgentId)i);
 	}
 
 	m_resTurn--;
@@ -363,7 +371,7 @@ bool Field::isBad(AgentId agentId, const Action & a) const {
 	Point next = m_agent[(int)agentId] + Neighbour8(a.dir);
 	if (outOfField(next)) return true;
 	if (auto &c = m_field[next.y][next.x].color) {
-		if (c.value() == teamOf(agentId)) return true;
+		if (c.value() == playerOf(agentId)) return true;
 	}
 	else if (m_field[next.y][next.x].score < 0) return true;
 	return false;