diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2017-09-24 23:31:57 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2017-09-24 23:31:57 -0700 |
| commit | 4f1d1944873c949b6d474f63e16098804c588a33 (patch) | |
| tree | 5fefd252971a4f7a78ab22e6731f66301b2df916 /nqueens.mu | |
| parent | 947c639ec646b67d1e434759a80eebfffedafe8d (diff) | |
| download | mu-4f1d1944873c949b6d474f63e16098804c588a33.tar.gz | |
4006
Diffstat (limited to 'nqueens.mu')
| -rw-r--r-- | nqueens.mu | 9 |
1 files changed, 4 insertions, 5 deletions
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 [ |