update

limm33 · Mar 10, 2016 · d715ca8 · d715ca8
1 parent 785d51c
commit d715ca8
Show file tree

Hide file tree

Showing 11 changed files with 190 additions and 32 deletions.
diff --git a/dist/bridge.js b/dist/bridge.js
@@ -515,16 +515,16 @@ var typeToScore = require("./type-to-score.js");
  * 表示在当前位置下一个棋子后的分数
  */
 
-var s = function(board, p, role, includeSelf) {
+var s = function(board, p, role) {
   var result = 0;
   var count = 0, block = 0;
 
   var len = board.length;
 
   function reset() {
-    count = includeSelf ? 1 : 0;
+    count = 1;
     block = 0;
-    empty = includeSelf ? 0 : 1;
+    empty = 0;
   }
 
 
@@ -753,6 +753,7 @@ var evaluate = function(board, role, includeSelf) {
 
   var max = - S.FIVE;
   var min = - S.FIVE;
+  role = role || R.com;
 
   for(var i=0;i<board.length;i++) {
     for(var j=0;j<board[i].length;j++) {
@@ -800,8 +801,8 @@ var gen = function(board, deep) {
     for(var j=0;j<board[i].length;j++) {
       if(board[i][j] == R.empty) {
         if(hasNeighbor(board, [i, j], 2, 1)) { //必须是有邻居的才行
-          var scoreHum = scorePoint(board, [i,j], R.hum, true);
-          var scoreCom= scorePoint(board, [i,j], R.com, true);
+          var scoreHum = scorePoint(board, [i,j], R.hum);
+          var scoreCom= scorePoint(board, [i,j], R.com);
 
           if(scoreCom >= S.FIVE) {//先看电脑能不能连成5
             return [[i, j]];
@@ -971,7 +972,7 @@ var max = function(board, deep, alpha, beta, role) {
     }
   }
 
-  var v = evaluate(board, role, false);
+  var v = evaluate(board, role);
   count ++;
   if(deep <= 0 || math.greatOrEqualThan(v, T.FIVE)) {
     return v;

diff --git a/dist/main.js b/dist/main.js
@@ -170,16 +170,16 @@ var typeToScore = require("./type-to-score.js");
  * 表示在当前位置下一个棋子后的分数
  */
 
-var s = function(board, p, role, includeSelf) {
+var s = function(board, p, role) {
   var result = 0;
   var count = 0, block = 0;
 
   var len = board.length;
 
   function reset() {
-    count = includeSelf ? 1 : 0;
+    count = 1;
     block = 0;
-    empty = includeSelf ? 0 : 1;
+    empty = 0;
   }
 
 
@@ -408,6 +408,7 @@ var evaluate = function(board, role, includeSelf) {
 
   var max = - S.FIVE;
   var min = - S.FIVE;
+  role = role || R.com;
 
   for(var i=0;i<board.length;i++) {
     for(var j=0;j<board[i].length;j++) {
@@ -530,6 +531,7 @@ Board.prototype._set = function(x, y, role) {
   this.draw();
   var value = e(this.board, R.com, false);
   var self = this;
+  return;
   if(value >= S.FIVE/2) {
     $.alert("电脑赢了！", function() {
       self.stop();

diff --git a/js/evaluate-point.js b/js/evaluate-point.js
@@ -10,16 +10,16 @@ var typeToScore = require("./type-to-score.js");
  * 表示在当前位置下一个棋子后的分数
  */
 
-var s = function(board, p, role, includeSelf) {
+var s = function(board, p, role) {
   var result = 0;
   var count = 0, block = 0;
 
   var len = board.length;
 
   function reset() {
-    count = includeSelf ? 1 : 0;
+    count = 1;
     block = 0;
-    empty = includeSelf ? 0 : 1;
+    empty = 0;
   }
 
 

diff --git a/js/evaluate.js b/js/evaluate.js
@@ -8,6 +8,7 @@ var evaluate = function(board, role, includeSelf) {
 
   var max = - S.FIVE;
   var min = - S.FIVE;
+  role = role || R.com;
 
   for(var i=0;i<board.length;i++) {
     for(var j=0;j<board[i].length;j++) {

diff --git a/js/gen.js b/js/gen.js
@@ -27,8 +27,8 @@ var gen = function(board, deep) {
     for(var j=0;j<board[i].length;j++) {
       if(board[i][j] == R.empty) {
         if(hasNeighbor(board, [i, j], 2, 1)) { //必须是有邻居的才行
-          var scoreHum = scorePoint(board, [i,j], R.hum, true);
-          var scoreCom= scorePoint(board, [i,j], R.com, true);
+          var scoreHum = scorePoint(board, [i,j], R.hum);
+          var scoreCom= scorePoint(board, [i,j], R.com);
 
           if(scoreCom >= S.FIVE) {//先看电脑能不能连成5
             return [[i, j]];

diff --git a/js/main.js b/js/main.js
@@ -102,6 +102,7 @@ Board.prototype._set = function(x, y, role) {
   this.draw();
   var value = e(this.board, R.com, false);
   var self = this;
+  return;
   if(value >= S.FIVE/2) {
     $.alert("电脑赢了！", function() {
       self.stop();

diff --git a/js/negamax.js b/js/negamax.js
@@ -88,7 +88,7 @@ var max = function(board, deep, alpha, beta, role) {
     }
   }
 
-  var v = evaluate(board, role, false);
+  var v = evaluate(board, role);
   count ++;
   if(deep <= 0 || math.greatOrEqualThan(v, T.FIVE)) {
     return v;

diff --git a/js/win.js b/js/win.js
@@ -0,0 +1,118 @@
+var R = require("./role.js");
+var isFive = function(board, p, role) {
+  var len = board.length;
+  var count = 0;
+
+  var reset = function() {
+    count = 0;
+  }
+
+  for(var i=p[1]+1;true;i++) {
+    if(i>=len) break;
+    var t = board[p[0]][i];
+    if(t !== role) break;
+    count ++;
+  }
+
+
+  for(var i=p[1]-1;true;i--) {
+    if(i<0) break;
+    var t = board[p[0]][i];
+    if(t !== role) break;
+    count ++;
+  }
+
+  if(count >= 5) return true;
+
+  //纵向
+  reset();
+
+  for(var i=p[0]+1;true;i++) {
+    if(i>=len) {
+      break;
+    }
+    var t = board[i][p[1]];
+    if(t !== role) break;
+    count ++;
+  }
+
+  for(var i=p[0]-1;true;i--) {
+    if(i<0) {
+      block ++;
+    }
+    var t = board[i][p[1]];
+    if(t !== role) break;
+    count ++;
+  }
+
+
+  if(count >= 5) return true;
+  // \\
+  reset();
+
+  for(var i=1;true;i++) {
+    var x = p[0]+i, y = p[1]+i;
+    if(x>=len || y>=len) {
+      break;
+    }
+    var t = board[x][y];
+    if(t !== role) break;
+
+    count ++;
+  }
+
+  for(var i=1;true;i++) {
+    var x = p[0]-i, y = p[1]-i;
+    if(x<0||y<0) {
+      break;
+    }
+    var t = board[x][y];
+    if(t !== role) break;
+    count ++;
+  }
+
+  if(count >= 5) return true;
+
+  // \/
+  reset();
+
+  for(var i=1; true;i++) {
+    var x = p[0]+i, y = p[1]-i;
+    if(x<0||y<0||x>=len||y>=len) {
+      break;
+    }
+    var t = board[x][y];
+    if(t !== role) break;
+    count ++;
+  }
+
+  for(var i=1;true;i++) {
+    var x = p[0]-i, y = p[1]+i;
+    if(x<0||y<0||x>=len||y>=len) {
+      break;
+    }
+    var t = board[x][y];
+    if(t !== role) break;
+    count ++;
+  }
+
+  if(count >= 5) return true;
+
+  return false;
+
+}
+
+
+var w = function(board) {
+  for(var i=0;i<board.length;i++) {
+    for(var j=0;j<board[i].length;j++) {
+      var t = board[i][j];
+      if(t !== R.empty) {
+        if(isFive(board, [i, j], t)) return t;
+      }
+    }
+  }
+  return false;
+}
+
+module.exports = w;
diff --git a/package.json b/package.json
@@ -18,7 +18,8 @@
     "test-checkmate": "mocha tests/test-checkmate.js",
     "test-m": "mocha tests/test-max-min.js",
     "test-evaluate-point": "mocha tests/test-evaluate-point.js",
-    "test-zobrist": "mocha tests/test-zobrist.js"
+    "test-zobrist": "mocha tests/test-zobrist.js",
+    "test-win": "mocha tests/test-win.js"
   },
   "author": "Hongxun Lee <[email protected]> (http://light7.org/)",
   "homepage": "http://gobang.light7.cn/",

diff --git a/tests/test-evaluate.js b/tests/test-evaluate.js
@@ -7,25 +7,27 @@ var b
 describe('test evalute', function() {
   it(`test one`, function() {
     b = [
-      [0, 0, 0],
-      [0, 2, 0],
-      [0, 0, 0],
+      [0, 0, 0, 0, 0],
+      [0, 0, 0, 0, 0],
+      [0, 0, 2, 0, 0],
+      [0, 0, 0, 0, 0],
+      [0, 0, 0, 0, 0],
     ];
-    assert.equal(e(b), 4*S.ONE);
+    assert.equal(e(b, 2), 4*S.ONE);
 
     b = [
       [0, 0, 0],
       [0, 1, 0],
       [0, 0, 0],
     ];
-    assert.equal(e(b), 4*S.ONE * -1);
+    assert.equal(e(b, 1), 4*S.ONE * -1);
 
     b = [
       [0, 2, 0],
       [0, 1, 0],
       [0, 0, 0],
     ];
-    assert.equal(e(b), (S.ONE + 2*S.BLOCKED_ONE) - (3*S.ONE + S.BLOCKED_ONE));
+    assert.equal(e(b, 1), (S.ONE + 2*S.BLOCKED_ONE) - (3*S.ONE + S.BLOCKED_ONE));
   });
 
   it(`test two`, function() {
@@ -37,7 +39,7 @@ describe('test evalute', function() {
       [0, 0, 0, 0, 0, 0],
       [0, 0, 0, 0, 0, 0],
     ];
-    assert.equal(e(b), S.TWO + 6*S.BLOCKED_ONE);
+    assert.equal(e(b), S.TWO);
 
     b = [
       [0, 0, 0, 0, 0, 0],
@@ -47,7 +49,7 @@ describe('test evalute', function() {
       [0, 0, 0, 0, 0, 0],
       [0, 0, 0, 0, 0, 0],
     ];
-    assert.equal(e(b), S.TWO + 6*S.ONE);
+    assert.equal(e(b), S.TWO);
   });
 
   it(`test three`, function() {
@@ -59,7 +61,7 @@ describe('test evalute', function() {
       [0, 0, 0, 0, 0, 0],
       [0, 0, 0, 0, 0, 0],
     ];
-    assert.equal(e(b), S.THREE + 9*S.BLOCKED_ONE);
+    assert.equal(e(b), S.THREE);
 
     b = [
       [0, 0, 0, 0, 0, 0],
@@ -69,7 +71,7 @@ describe('test evalute', function() {
       [0, 0, 0, 0, 0, 0],
       [0, 0, 0, 0, 0, 0],
     ];
-    assert.equal(e(b), S.THREE + 9*S.ONE);
+    assert.equal(e(b), S.THREE);
 
     b = [
       [0, 0, 0, 0, 0, 0],
@@ -79,7 +81,7 @@ describe('test evalute', function() {
       [0, 0, 0, 0, 0, 0],
       [0, 0, 0, 0, 0, 0],
     ];
-    assert.equal(e(b), S.THREE + 9*S.ONE);
+    assert.equal(e(b), S.THREE);
 
 
     b = [
@@ -90,7 +92,7 @@ describe('test evalute', function() {
       [0, 0, 0, 0, 2, 0],
       [0, 0, 0, 0, 0, 0],
     ];
-    assert.equal(e(b), S.THREE + 9*S.ONE);
+    assert.equal(e(b), S.THREE);
   });
 
 
@@ -103,7 +105,7 @@ describe('test evalute', function() {
       [0, 0, 0, 0, 0, 0],
       [0, 0, 0, 0, 0, 0],
     ];
-    assert.equal(e(b), S.FOUR + 12*S.BLOCKED_ONE);
+    assert.equal(e(b), S.FOUR);
 
     b = [
       [0, 0, 0, 0, 0, 0],
@@ -113,7 +115,7 @@ describe('test evalute', function() {
       [0, 0, 0, 0, 0, 0],
       [0, 0, 0, 0, 0, 0],
     ];
-    assert.equal(e(b), S.FOUR + 12*S.ONE);
+    assert.equal(e(b), S.FOUR);
   });
 
 
@@ -127,7 +129,7 @@ describe('test evalute', function() {
       [0, 0, 0, 0, 0, 0],
       [0, 0, 0, 0, 0, 0],
     ];
-    assert.equal(e(b), S.FIVE + 14*S.BLOCKED_ONE);
+    assert.equal(e(b), S.FIVE);
 
     b = [
       [0, 0, 0, 0, 0, 0, 0, 0, 0],
@@ -140,7 +142,7 @@ describe('test evalute', function() {
       [0, 0, 0, 0, 0, 0, 0, 0, 0],
       [0, 0, 0, 0, 0, 0, 0, 0, 0]
     ];
-    assert.equal(e(b), S.FIVE + 15*S.ONE);
+    assert.equal(e(b), S.FIVE);
 
   });
 });