add log.cpp

processor/logic/terrain.cpp

@@ -28,59 +28,57 @@ bool ban(VertexType t) {
 	return t == VertexType::Mountain || t == VertexType::Capital;
 }
 
-template <typename T>
+template<typename T>
 void upmin(T& x, const T& y) {
 	if (y < x)
 		x = y;
 }
 
-const int dx[] = {0, 0, -1, 1}, dy[] = {-1, 1, 0, 0};
+bool findCut(pos_t w, pos_t h, vector<vector<VertexType>>& vertex_type) {
+	int idx = 0;
+	vector<vector<int>> dfn(h, vector<int>(w)), low = dfn;
+	function<void(int, int, int, int, bool)> tarjan
+		= [&](int x, int y, int fx, int fy, bool rt) {
+			  dfn[x][y] = low[x][y] = ++idx;
+			  int ch = 0;
+			  for (int i = 0; i < 4; i++) {
+				  const int xx = x + direction_dx[i], yy = y + direction_dy[i];
+				  if (xx < 0 || xx >= h || yy < 0 || yy >= w)
+					  continue;
 
-bool findCut(pos_t w, pos_t h, vector<vector<VertexType>> &vertex_type) {
+				  if (vertex_type[xx][yy] == VertexType::Capital)
-    int idx = 0;
+					  vertex_type[x][y] = VertexType::Cut;
-    vector<vector<int>> dfn(h, vector<int>(w)), low = dfn;
-    function<void(int, int, int, int, bool)> tarjan =
-        [&](int x, int y, int fx, int fy, bool rt) {
-            dfn[x][y] = low[x][y] = ++idx;
-            int ch = 0;
-            for (int i = 0; i < 4; i++) {
-                const int xx = x + dx[i], yy = y + dy[i];
-                if (xx < 0 || xx >= h || yy < 0 || yy >= w)
-                    continue;
 
-                if (vertex_type[xx][yy] == VertexType::Capital)
+				  if (ban(vertex_type[xx][yy]) || (xx == fx && yy == fy))
-                    vertex_type[x][y] = VertexType::Cut;
+					  continue;
 
-                if (ban(vertex_type[xx][yy]) || (xx == fx && yy == fy))
+				  if (!dfn[xx][yy]) {
-                    continue;
+					  ch++;
+					  tarjan(xx, yy, x, y, 0);
+					  upmin(low[x][y], low[xx][yy]);
+					  if (!rt && low[xx][yy] >= dfn[x][y])
+						  vertex_type[x][y] = VertexType::Cut;
+				  } else {
+					  upmin(low[x][y], dfn[xx][yy]);
+				  }
+			  }
 
-                if (!dfn[xx][yy]) {
+			  if (rt && ch >= 2)
-                    ch++;
+				  vertex_type[x][y] = VertexType::Cut;
-                    tarjan(xx, yy, x, y, 0);
+		  };
-                    upmin(low[x][y], low[xx][yy]);
-                    if (!rt && low[xx][yy] >= dfn[x][y])
-                        vertex_type[x][y] = VertexType::Cut;
-                } else {
-                    upmin(low[x][y], dfn[xx][yy]);
-                }
-            }
 
-            if (rt && ch >= 2)
+	bool flag = false;
-                vertex_type[x][y] = VertexType::Cut;
+	for (pos_t i = 0; i < h; i++) {
-        };
+		for (pos_t j = 0; j < w; j++) {
-
+			if (!ban(vertex_type[i][j]) && !dfn[i][j]) {
-    bool flag = false;
+				if (flag)
-    for (pos_t i = 0; i < h; i++) {
+					return false;
-        for (pos_t j = 0; j < w; j++) {
+				flag = 1;
-            if (!ban(vertex_type[i][j]) && !dfn[i][j]) {
+				tarjan(i, j, -1, -1, 1);
-                if (flag)
+			}
-                    return false;
+		}
-                flag = 1;
+	}
-                tarjan(i, j, -1, -1, 1);
+	return true;
-            }
-        }
-    }
-    return true;
 };
 
 pair<bool, vector<Point>> generateCapital(
@@ -88,7 +86,6 @@ pair<bool, vector<Point>> generateCapital(
 	pos_t h,
 	vector<vector<VertexType>>& vertex_type,
 	int r) {
-
 	vector<Point> res(r);
 	for (int i = 0; i <= r; i++) {
 		if (!findCut(w, h, vertex_type))
@@ -168,25 +165,27 @@ GameBoard ImportedTerrain::makeGameBoard(const InitInfo& init_info) {
 	vector<Player> rest2;
 	arrange(rest1, capitals.back(), rest2);
 
-    for (pos_t x = 0; x < h; x++) {
+	for (pos_t x = 0; x < h; x++) {
-        for (pos_t y = 0; y < w; y++) {
+		for (pos_t y = 0; y < w; y++) {
-            if (g.at(x, y).type == TileType::Capital) {
+			if (g.at(x, y).type == TileType::Capital) {
-                for (int i = 0; i < 4; i++) {
+				for (int i = 0; i < 4; i++) {
-                    const int xx = x + dx[i], yy = y + dy[i];
+					const int xx = x + direction_dx[i],
-                    if (xx < 0 || xx >= h || yy < 0 || yy >= w)
+							  yy = y + direction_dy[i];
-                        continue;
+					if (xx < 0 || xx >= h || yy < 0 || yy >= w)
-                    if (g.at(xx, yy).type == TileType::Capital)
+						continue;
-                        throw BadCapitalAssign();
+					if (g.at(xx, yy).type == TileType::Capital)
-                }
+						throw BadCapitalAssign();
-            }
+				}
-        }
+			}
-    }
+		}
+	}
 
 	int T = 5;
 
 	while (T--) {
-		vector<vector<VertexType>> vertex_type(h
+		vector<vector<VertexType>> vertex_type(
-			, vector<VertexType>(w, VertexType::Ordinary));
+			h,
+			vector<VertexType>(w, VertexType::Ordinary));
 		for (pos_t i = 0; i < h; i++) {
 			for (pos_t j = 0; j < w; j++) {
 				if (g.at(i, j).type == TileType::Mountain)
@@ -250,8 +249,9 @@ ImportedTerrain importTerrain(const ImportTerrainConfig& in) {
 		error();
 
 	vector<vector<vector<Point>>> vec(27, vector<vector<Point>>(101));
-    vector<vector<VertexType>> vertex_type(t.h
+	vector<vector<VertexType>> vertex_type(
-        , vector<VertexType>(t.w, VertexType::Ordinary));
+		t.h,
+		vector<VertexType>(t.w, VertexType::Ordinary));
 	for (pos_t i = 0; i < t.h; i++) {
 		for (pos_t j = 0; j < t.w; j++) {
 			auto& p = t.tiles[i][j];
@@ -259,7 +259,7 @@ ImportedTerrain importTerrain(const ImportTerrainConfig& in) {
 				p.type = TileType::Blank;
 			} else if (view('m')) {
 				p.type = TileType::Mountain;
-                vertex_type[i][j] = VertexType::Mountain;
+				vertex_type[i][j] = VertexType::Mountain;
 			} else if (view('n')) {
 				p.type = TileType::Blank;
 				p.unit = read();
@@ -288,8 +288,8 @@ ImportedTerrain importTerrain(const ImportTerrainConfig& in) {
 
 	if (pt != in.value.size())
 		error();
-    if (!findCut(t.w, t.h, vertex_type))
+	if (!findCut(t.w, t.h, vertex_type))
-        error();
+		error();
 	t.capitals.emplace_back();
 
 	for (int i = 0; i <= 26; i++) {

processor/logic/terrain.h

@@ -42,4 +42,3 @@ private:
 ImportedTerrain importTerrain(const ImportTerrainConfig& in);
 
 #endif
-

processor/utility/log.cpp

@@ -0,0 +1,51 @@
+#include "log.h"
+#include <cstdio>
+#include <ctime>
+
+Logger* Logger::getInstance() {
+	return instance_;
+}
+
+void Logger::debug(const std::string& s) const {
+	_log(LogLevel::Debug, s);
+}
+
+void Logger::info(const std::string& s) const {
+	_log(LogLevel::Info, s);
+}
+
+void Logger::warn(const std::string& s) const {
+	_log(LogLevel::Warn, s);
+}
+
+void Logger::error(const std::string& s) const {
+	_log(LogLevel::Error, s);
+}
+
+void Logger::fatal(const std::string& s) const {
+	_log(LogLevel::Fatal, s);
+}
+
+void Logger::setLogLeval(LogLevel v) {
+	filter = v;
+}
+
+Logger::Logger() {
+	filter = LogLevel::Warn;
+}
+
+Logger* const Logger::instance_ = new Logger();
+
+void Logger::_log(LogLevel v, const std::string& s) const {
+	if (v >= filter) {
+		time_t now = time(NULL);
+		static char buff[100];
+		strftime(buff, sizeof(buff), "%Y-%m-%d %H:%M:%S", localtime(&now));
+		const char* mp = "DIWEF";
+		fprintf(stderr, "%s [%c] %s\n", buff, mp[(int)v], s.c_str());
+	}
+}
+
+Logger* Log() {
+	return Logger::getInstance();
+}

processor/utility/log.h

@@ -1,27 +1,30 @@
 #ifndef OG_LOG_H_
 #define OG_LOG_H_
 
+#include "pc/commcode.h"
 #include <cstdio>
 #include <string>
-#include "pc/commcode.h"
 
 class Logger {
 public:
-	Logger *getInstance() const;
+	static Logger* getInstance();
 
-	void debug(const std::string &) const;
+	void debug(const std::string&) const;
-	void info(const std::string &) const;
+	void info(const std::string&) const;
-	void warn(const std::string &) const;
+	void warn(const std::string&) const;
-	void error(const std::string &) const;
+	void error(const std::string&) const;
-	void fatal(const std::string &) const;
+	void fatal(const std::string&) const;
+	void setLogLeval(LogLevel v);
 
 private:
 	Logger();
-	void _log(LogLevel v, const std::string &) const;
+	static Logger* const instance_;
+
+	void _log(LogLevel v, const std::string&) const;
 
 	LogLevel filter;
 };
 
-Logger *Log();
+Logger* Log();
 
 #endif