From 9fc1a0b2b3ca47b8e7af96023ab381ca2f0dc572 Mon Sep 17 00:00:00 2001
From: krahets <krahets@163.com>
Date: Wed, 21 Jun 2023 02:56:28 +0800
Subject: [PATCH] Update n_queens code.

---
 codes/cpp/chapter_backtracking/n_queens.cpp       | 4 ++--
 codes/csharp/chapter_backtracking/n_queens.cs     | 4 ++--
 codes/go/chapter_backtracking/n_queens.go         | 4 ++--
 codes/java/chapter_backtracking/n_queens.java     | 4 ++--
 codes/javascript/chapter_backtracking/n_queens.js | 4 ++--
 codes/python/chapter_backtracking/n_queens.py     | 4 ++--
 codes/swift/chapter_backtracking/n_queens.swift   | 4 ++--
 codes/typescript/chapter_backtracking/n_queens.ts | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/codes/cpp/chapter_backtracking/n_queens.cpp b/codes/cpp/chapter_backtracking/n_queens.cpp
index f89fac96e..afb9e229d 100644
--- a/codes/cpp/chapter_backtracking/n_queens.cpp
+++ b/codes/cpp/chapter_backtracking/n_queens.cpp
@@ -19,8 +19,8 @@ void backtrack(int row, int n, vector<vector<string>> &state, vector<vector<vect
         // 计算该格子对应的主对角线和副对角线
         int diag1 = row - col + n - 1;
         int diag2 = row + col;
-        // 剪枝：不允许该格子所在 (列 或 主对角线 或 副对角线) 包含皇后
-        if (!(cols[col] || diags1[diag1] || diags2[diag2])) {
+        // 剪枝：不允许该格子所在列、主对角线、副对角线存在皇后
+        if (!cols[col] && !diags1[diag1] && !diags2[diag2]) {
             // 尝试：将皇后放置在该格子
             state[row][col] = "Q";
             cols[col] = diags1[diag1] = diags2[diag2] = true;
diff --git a/codes/csharp/chapter_backtracking/n_queens.cs b/codes/csharp/chapter_backtracking/n_queens.cs
index bc0cd9fdc..3a3fb3f6b 100644
--- a/codes/csharp/chapter_backtracking/n_queens.cs
+++ b/codes/csharp/chapter_backtracking/n_queens.cs
@@ -24,8 +24,8 @@ public class n_queens {
             // 计算该格子对应的主对角线和副对角线
             int diag1 = row - col + n - 1;
             int diag2 = row + col;
-            // 剪枝：不允许该格子所在 (列 或 主对角线 或 副对角线) 包含皇后
-            if (!(cols[col] || diags1[diag1] || diags2[diag2])) {
+            // 剪枝：不允许该格子所在列、主对角线、副对角线存在皇后
+            if (!cols[col] && !diags1[diag1] && !diags2[diag2]) {
                 // 尝试：将皇后放置在该格子
                 state[row][col] = "Q";
                 cols[col] = diags1[diag1] = diags2[diag2] = true;
diff --git a/codes/go/chapter_backtracking/n_queens.go b/codes/go/chapter_backtracking/n_queens.go
index 23cc7e94f..a3c288493 100644
--- a/codes/go/chapter_backtracking/n_queens.go
+++ b/codes/go/chapter_backtracking/n_queens.go
@@ -21,8 +21,8 @@ func backtrack(row, n int, state *[][]string, res *[][][]string, cols, diags1, d
 		// 计算该格子对应的主对角线和副对角线
 		diag1 := row - col + n - 1
 		diag2 := row + col
-		// 剪枝：不允许该格子所在 (列 或 主对角线 或 副对角线) 包含皇后
-		if !((*cols)[col] || (*diags1)[diag1] || (*diags2)[diag2]) {
+		// 剪枝：不允许该格子所在列、主对角线、副对角线存在皇后
+		if !(*cols)[col] && !(*diags1)[diag1] && !(*diags2)[diag2] {
 			// 尝试：将皇后放置在该格子
 			(*state)[row][col] = "Q"
 			(*cols)[col], (*diags1)[diag1], (*diags2)[diag2] = true, true, true
diff --git a/codes/java/chapter_backtracking/n_queens.java b/codes/java/chapter_backtracking/n_queens.java
index 6705ebc16..66b8b6da7 100644
--- a/codes/java/chapter_backtracking/n_queens.java
+++ b/codes/java/chapter_backtracking/n_queens.java
@@ -26,8 +26,8 @@ public class n_queens {
             // 计算该格子对应的主对角线和副对角线
             int diag1 = row - col + n - 1;
             int diag2 = row + col;
-            // 剪枝：不允许该格子所在 (列 或 主对角线 或 副对角线) 包含皇后
-            if (!(cols[col] || diags1[diag1] || diags2[diag2])) {
+            // 剪枝：不允许该格子所在列、主对角线、副对角线存在皇后
+            if (!cols[col] && !diags1[diag1] && !diags2[diag2]) {
                 // 尝试：将皇后放置在该格子
                 state.get(row).set(col, "Q");
                 cols[col] = diags1[diag1] = diags2[diag2] = true;
diff --git a/codes/javascript/chapter_backtracking/n_queens.js b/codes/javascript/chapter_backtracking/n_queens.js
index d854d19b0..b56a7dd68 100644
--- a/codes/javascript/chapter_backtracking/n_queens.js
+++ b/codes/javascript/chapter_backtracking/n_queens.js
@@ -16,8 +16,8 @@ function backtrack(row, n, state, res, cols, diags1, diags2) {
         // 计算该格子对应的主对角线和副对角线
         const diag1 = row - col + n - 1;
         const diag2 = row + col;
-        // 剪枝：不允许该格子所在 (列 或 主对角线 或 副对角线) 包含皇后
-        if (!(cols[col] || diags1[diag1] || diags2[diag2])) {
+        // 剪枝：不允许该格子所在列、主对角线、副对角线存在皇后
+        if (!cols[col] && !diags1[diag1] && !diags2[diag2]) {
             // 尝试：将皇后放置在该格子
             state[row][col] = 'Q';
             cols[col] = diags1[diag1] = diags2[diag2] = true;
diff --git a/codes/python/chapter_backtracking/n_queens.py b/codes/python/chapter_backtracking/n_queens.py
index 14a607915..5d7e34d16 100644
--- a/codes/python/chapter_backtracking/n_queens.py
+++ b/codes/python/chapter_backtracking/n_queens.py
@@ -24,8 +24,8 @@ def backtrack(
         # 计算该格子对应的主对角线和副对角线
         diag1 = row - col + n - 1
         diag2 = row + col
-        # 剪枝：不允许该格子所在 (列 或 主对角线 或 副对角线) 包含皇后
-        if not (cols[col] or diags1[diag1] or diags2[diag2]):
+        # 剪枝：不允许该格子所在列、主对角线、副对角线存在皇后
+        if not cols[col] and not diags1[diag1] and not diags2[diag2]:
             # 尝试：将皇后放置在该格子
             state[row][col] = "Q"
             cols[col] = diags1[diag1] = diags2[diag2] = True
diff --git a/codes/swift/chapter_backtracking/n_queens.swift b/codes/swift/chapter_backtracking/n_queens.swift
index e9d07d839..6e79373d0 100644
--- a/codes/swift/chapter_backtracking/n_queens.swift
+++ b/codes/swift/chapter_backtracking/n_queens.swift
@@ -16,8 +16,8 @@ func backtrack(row: Int, n: Int, state: inout [[String]], res: inout [[[String]]
         // 计算该格子对应的主对角线和副对角线
         let diag1 = row - col + n - 1
         let diag2 = row + col
-        // 剪枝：不允许该格子所在 (列 或 主对角线 或 副对角线) 包含皇后
-        if !(cols[col] || diags1[diag1] || diags2[diag2]) {
+        // 剪枝：不允许该格子所在列、主对角线、副对角线存在皇后
+        if !cols[col] && !diags1[diag1] && !diags2[diag2] {
             // 尝试：将皇后放置在该格子
             state[row][col] = "Q"
             cols[col] = true
diff --git a/codes/typescript/chapter_backtracking/n_queens.ts b/codes/typescript/chapter_backtracking/n_queens.ts
index f06d7cbb0..702ce9077 100644
--- a/codes/typescript/chapter_backtracking/n_queens.ts
+++ b/codes/typescript/chapter_backtracking/n_queens.ts
@@ -24,8 +24,8 @@ function backtrack(
         // 计算该格子对应的主对角线和副对角线
         const diag1 = row - col + n - 1;
         const diag2 = row + col;
-        // 剪枝：不允许该格子所在 (列 或 主对角线 或 副对角线) 包含皇后
-        if (!(cols[col] || diags1[diag1] || diags2[diag2])) {
+        // 剪枝：不允许该格子所在列、主对角线、副对角线存在皇后
+        if (!cols[col] && !diags1[diag1] && !diags2[diag2]) {
             // 尝试：将皇后放置在该格子
             state[row][col] = 'Q';
             cols[col] = diags1[diag1] = diags2[diag2] = true;