Refactor isExCellCount to base classes

Author: x-sheep

src/variety-common/Answer.js

@@ -973,6 +973,41 @@ pzpr.classmgr.makeCommon({
 				code
 			);
 		},
+		checkShadeCount: function() {
+			this.checkRowsCols(this.isExCellCount, "exShadeNe");
+		},
+		getRowsColsValue: function(clist) {
+			return clist.filter(function(c) {
+				return c.isShade();
+			}).length;
+		},
+		isExCellCount: function(clist) {
+			var d = clist.getRectSize(),
+				bd = this.board;
+			var count = this.getRowsColsValue(clist);
+
+			var result = true;
+
+			if (d.x1 === d.x2) {
+				var exc = bd.getex(d.x1, -1);
+				if (exc.qnum !== -1 && exc.qnum !== count) {
+					exc.seterr(1);
+					result = false;
+				}
+			}
+			if (d.y1 === d.y2) {
+				var exc = bd.getex(-1, d.y1);
+				if (exc.qnum !== -1 && exc.qnum !== count) {
+					exc.seterr(1);
+					result = false;
+				}
+			}
+
+			if (!result) {
+				clist.seterr(1);
+			}
+			return result;
+		},
 
 		//---------------------------------------------------------------------------
 		// ans.checkBorderCount()  ある交点との周り四方向の境界線の数を判定する(bp==1:黒点が打たれている場合)

src/variety/aquarium.js

@@ -377,40 +377,6 @@
 					clist.seterr(1);
 				}
 			}
-		},
-
-		checkShadeCount: function() {
-			this.checkRowsCols(this.isExCellCount, "exShadeNe");
-		},
-
-		isExCellCount: function(clist) {
-			var d = clist.getRectSize(),
-				bd = this.board;
-			var count = clist.filter(function(c) {
-				return c.isShade();
-			}).length;
-
-			var result = true;
-
-			if (d.x1 === d.x2) {
-				var exc = bd.getex(d.x1, -1);
-				if (exc.qnum !== -1 && exc.qnum !== count) {
-					exc.seterr(1);
-					result = false;
-				}
-			}
-			if (d.y1 === d.y2) {
-				var exc = bd.getex(-1, d.y1);
-				if (exc.qnum !== -1 && exc.qnum !== count) {
-					exc.seterr(1);
-					result = false;
-				}
-			}
-
-			if (!result) {
-				clist.seterr(1);
-			}
-			return result;
 		}
 	}
 });

src/variety/batten.js

@@ -413,40 +413,6 @@
 			var ca = shaded[0];
 			var cb = shaded[1];
 			return ca.bx !== cb.bx && ca.by !== cb.by;
-		},
-
-		checkShadeCount: function() {
-			this.checkRowsCols(this.isExCellCount, "exShadeNe");
-		},
-
-		isExCellCount: function(clist) {
-			var d = clist.getRectSize(),
-				bd = this.board;
-			var count = clist.filter(function(c) {
-				return c.isShade();
-			}).length;
-
-			var result = true;
-
-			if (d.x1 === d.x2) {
-				var exc = bd.getex(d.x1, -1);
-				if (exc.qnum !== -1 && exc.qnum !== count) {
-					exc.seterr(1);
-					result = false;
-				}
-			}
-			if (d.y1 === d.y2) {
-				var exc = bd.getex(-1, d.y1);
-				if (exc.qnum !== -1 && exc.qnum !== count) {
-					exc.seterr(1);
-					result = false;
-				}
-			}
-
-			if (!result) {
-				clist.seterr(1);
-			}
-			return result;
 		}
 	}
 });

src/variety/snake.js

@@ -311,11 +311,6 @@
 				return !cell.isShade() && cell.qnum > 0;
 			}, "circleUnshade");
 		},
-
-		checkShadeCount: function() {
-			this.checkRowsCols(this.isExCellCount, "exShadeNe");
-		},
-
 		checkShadeLoop: function() {
 			var snakes = this.board.sblkmgr.components;
 			for (var r = 0; r < snakes.length; r++) {
@@ -338,36 +333,6 @@
 					}
 				}
 			}
-		},
-
-		isExCellCount: function(clist) {
-			var d = clist.getRectSize(),
-				bd = this.board;
-			var count = clist.filter(function(c) {
-				return c.isShade();
-			}).length;
-
-			var result = true;
-
-			if (d.x1 === d.x2) {
-				var exc = bd.getex(d.x1, -1);
-				if (exc.qnum !== -1 && exc.qnum !== count) {
-					exc.seterr(1);
-					result = false;
-				}
-			}
-			if (d.y1 === d.y2) {
-				var exc = bd.getex(-1, d.y1);
-				if (exc.qnum !== -1 && exc.qnum !== count) {
-					exc.seterr(1);
-					result = false;
-				}
-			}
-
-			if (!result) {
-				clist.seterr(1);
-			}
-			return result;
 		}
 	}
 });

src/variety/statuepark.js

@@ -2225,40 +2225,6 @@
 				}
 				return cell.isShade() && cell.qnum !== cell.getShape();
 			}, "csMismatch");
-		},
-
-		checkShadeCount: function() {
-			this.checkRowsCols(this.isExCellCount, "exShadeNe");
-		},
-
-		isExCellCount: function(clist) {
-			var d = clist.getRectSize(),
-				bd = this.board;
-			var count = clist.filter(function(c) {
-				return c.isShade();
-			}).length;
-
-			var result = true;
-
-			if (d.x1 === d.x2) {
-				var exc = bd.getex(d.x1, -1);
-				if (exc.qnum !== -1 && exc.qnum !== count) {
-					exc.seterr(1);
-					result = false;
-				}
-			}
-			if (d.y1 === d.y2) {
-				var exc = bd.getex(-1, d.y1);
-				if (exc.qnum !== -1 && exc.qnum !== count) {
-					exc.seterr(1);
-					result = false;
-				}
-			}
-
-			if (!result) {
-				clist.seterr(1);
-			}
-			return result;
 		}
 	},
 	"AnsCheck@pentatouch": {

src/variety/tents.js

@@ -651,35 +651,10 @@
 		checkTentCount: function() {
 			this.checkRowsCols(this.isExCellCount, "exTentNe");
 		},
-
-		isExCellCount: function(clist) {
-			var d = clist.getRectSize(),
-				bd = this.board;
-			var count = clist.filter(function(c) {
+		getRowsColsValue: function(clist) {
+			return clist.filter(function(c) {
 				return c.getNum() === 2;
 			}).length;
-
-			var result = true;
-
-			if (d.x1 === d.x2) {
-				var exc = bd.getex(d.x1, -1);
-				if (exc.qnum !== -1 && exc.qnum !== count) {
-					exc.seterr(1);
-					result = false;
-				}
-			}
-			if (d.y1 === d.y2) {
-				var exc = bd.getex(-1, d.y1);
-				if (exc.qnum !== -1 && exc.qnum !== count) {
-					exc.seterr(1);
-					result = false;
-				}
-			}
-
-			if (!result) {
-				clist.seterr(1);
-			}
-			return result;
 		}
 	}
 });