From 4f1d1944873c949b6d474f63e16098804c588a33 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sun, 24 Sep 2017 23:31:57 -0700 Subject: 4006 --- nqueens.mu | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'nqueens.mu') diff --git a/nqueens.mu b/nqueens.mu index 87ce90b6..51495009 100644 --- a/nqueens.mu +++ b/nqueens.mu @@ -36,7 +36,7 @@ def nqueens n:num, queens:&:list:square -> result:num, queens:&:list:square [ { curr-conflicts?:bool <- conflict? curr, queens break-if curr-conflicts? - queens:&:list:square <- push curr, queens + queens <- push curr, queens sub-result:num <- nqueens n, queens result <- add result, sub-result queens <- rest queens @@ -53,10 +53,9 @@ def nqueens n:num, queens:&:list:square -> result:num, queens:&:list:square [ def conflict? curr:square, queens:&:list:square -> result:bool [ local-scope load-ingredients - result1:bool <- conflicting-file? curr, queens - return-if result1, result1 - result2:bool <- conflicting-diagonal? curr, queens - return result2 + result:bool <- conflicting-file? curr, queens + return-if result + result:bool <- conflicting-diagonal? curr, queens ] def conflicting-file? curr:square, queens:&:list:square -> result:bool [ -- cgit 1.4.1-2-gfad0