GitHub/SwiftChess
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: GitHub/SwiftChess:0.1.1
Branches Tags
GitHub/SwiftChess:master GitHub/SwiftChess:feature/fix-ai-crash GitHub/SwiftChess:feature/spm GitHub/SwiftChess:feature/persistence GitHub/SwiftChess:feature/swift4 GitHub/SwiftChess:features/lessStringyAsciiBoard GitHub/SwiftChess:features/printDebugInfo
GitHub/SwiftChess:1.1.2 GitHub/SwiftChess:1.1.1 GitHub/SwiftChess:1.1 GitHub/SwiftChess:1.0 GitHub/SwiftChess:0.3.0 GitHub/SwiftChess:0.2.0 GitHub/SwiftChess:0.1.1 GitHub/SwiftChess:0.1.0
...
compare: GitHub/SwiftChess:0.3.0
Branches Tags
GitHub/SwiftChess:feature/fix-ai-crash GitHub/SwiftChess:master GitHub/SwiftChess:feature/spm GitHub/SwiftChess:feature/persistence GitHub/SwiftChess:feature/swift4 GitHub/SwiftChess:features/lessStringyAsciiBoard GitHub/SwiftChess:features/printDebugInfo
GitHub/SwiftChess:1.1.2 GitHub/SwiftChess:1.1.1 GitHub/SwiftChess:1.1 GitHub/SwiftChess:1.0 GitHub/SwiftChess:0.3.0 GitHub/SwiftChess:0.2.0 GitHub/SwiftChess:0.1.1 GitHub/SwiftChess:0.1.0

16 Commits
0.1.1 ... 0.3.0

Author SHA1 Message Date
Steve Barnegren 42fd768958 Updated podspec 2017-12-21 17:16:19 +00:00
Steve Barnegren f8e53472bf Merge pull request #2 from sochalewski/master 
Swifty, swifter, the swiftest
 2017-12-21 16:44:16 +00:00
Piotr Sochalewski ac147b5ee8 Swifty, swifter, the swiftest 2017-12-09 12:58:05 +01:00
Steve Barnegren fdf1f73ce9 Merge branch 'development' 
# Conflicts:
#	.swift-version
 2017-11-18 19:22:26 +00:00
Steve Barnegren 0371a5d064 Updated podspec 2017-11-17 21:24:42 +00:00
Steve Barnegren aa31427b5f Added .swift-version 2017-11-17 21:20:27 +00:00
Steve Barnegren 2694a19834 Integrate swift lint 2017-10-24 08:17:36 +01:00
Steve Barnegren 46d9b051ab Integrate swift lint 2017-10-23 08:11:14 +01:00
Steve Barnegren fc5a5ed5ac Updated podspec 2017-10-19 08:38:06 +01:00
Steve Barnegren beed7797b4 Remove unused files from old project setup 2017-10-19 08:36:53 +01:00
Steve Barnegren 5b6255f58f Upgrade to Swift 4 2017-10-19 08:34:31 +01:00
Steve Barnegren e2782cc397 Update to recommended project settings 2017-10-19 08:27:43 +01:00
Steve Barnegren 1c4e3c1973 Fixed warnings in tests 2017-10-19 08:26:26 +01:00
Steve Barnegren 8c138eb699 Fixed some warnings 2017-10-19 08:18:59 +01:00
Steve Barnegren 16c757ff1f Merge branch 'development' 2017-04-02 18:45:29 +01:00
Steve Barnegren 88dda592b9 Added swift version file for cocoa pods 2017-03-16 22:22:19 +00:00
84 changed files with 2930 additions and 5431 deletions
Expand all files Collapse all files
.swift-version
+1
View File
@@ -0,0 +1 @@
4.0
Example/.swiftlint.yml
+8
View File
@@ -0,0 +1,8 @@
disabled_rules:
- trailing_whitespace
- cyclomatic_complexity
- nesting
- type_name
- force_cast
- identifier_name
- unused_closure_parameter
Example/Example.xcodeproj/project.pbxproj
+52 -9
View File
@@ -13,7 +13,6 @@
671989911DFFE8650053EA3D /* BoardRaterCenterDominanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 671989901DFFE8650053EA3D /* BoardRaterCenterDominanceTests.swift */; };
673B95191E4CE5880086CA97 /* BoardRaterThreatenedPiecesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09A4C0281E013ECB000CFBF4 /* BoardRaterThreatenedPiecesTests.swift */; };
676902581E432380007C76D7 /* PerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 676902571E432380007C76D7 /* PerformanceTests.swift */; };
676C911B1E478A3A00985A4F /* SwiftChess.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67A9CA0D1DE64D6500510FB8 /* SwiftChess.framework */; };
676C911C1E478A3A00985A4F /* SwiftChess.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 67A9CA0D1DE64D6500510FB8 /* SwiftChess.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
676EF7C51E15AC1700E275B4 /* BoardRaterKingSurroundingPossession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 676EF7C41E15AC1700E275B4 /* BoardRaterKingSurroundingPossession.swift */; };
67A3EB161E3A926C00F6F01B /* BoardScenarios.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67A3EB121E3A826800F6F01B /* BoardScenarios.swift */; };
@@ -25,7 +24,6 @@
67A9CA391DE64E0900510FB8 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; };
67A9CA3A1DE64E0E00510FB8 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; };
67A9CA3C1DE64E2B00510FB8 /* SwiftChess.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67A9CA0D1DE64D6500510FB8 /* SwiftChess.framework */; };
67A9CA3D1DE64E7100510FB8 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 607FACEA1AFB9204008FA782 /* Info.plist */; };
67B73A9B1E15351900C19176 /* PromotionSelectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67B73A9A1E15351900C19176 /* PromotionSelectionViewController.swift */; };
67B73A9F1E154C1E00C19176 /* AIPlayerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67B73A9E1E154C1E00C19176 /* AIPlayerTests.swift */; };
67D54A5D1DE7682D00C12258 /* BoardTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67D54A511DE7680E00C12258 /* BoardTests.swift */; };
@@ -133,7 +131,6 @@
buildActionMask = 2147483647;
files = (
67A9CA3C1DE64E2B00510FB8 /* SwiftChess.framework in Frameworks */,
676C911B1E478A3A00985A4F /* SwiftChess.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -274,6 +271,7 @@
67A9CA111DE64DAA00510FB8 /* Frameworks */,
67A9CA121DE64DAA00510FB8 /* Resources */,
676C911F1E478A3A00985A4F /* Embed Frameworks */,
677F42131F9DCE4C00BBD071 /* Swift Lint */,
);
buildRules = (
);
@@ -292,6 +290,7 @@
67A9CA231DE64DAA00510FB8 /* Sources */,
67A9CA241DE64DAA00510FB8 /* Frameworks */,
67A9CA251DE64DAA00510FB8 /* Resources */,
677F42111F9DCD9A00BBD071 /* Swift Lint */,
);
buildRules = (
);
@@ -310,16 +309,18 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0800;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 0900;
ORGANIZATIONNAME = CocoaPods;
TargetAttributes = {
67A9CA131DE64DAA00510FB8 = {
CreatedOnToolsVersion = 8.0;
DevelopmentTeam = VAA3W4LPY2;
LastSwiftMigration = 0900;
ProvisioningStyle = Automatic;
};
67A9CA261DE64DAA00510FB8 = {
CreatedOnToolsVersion = 8.0;
LastSwiftMigration = 0900;
ProvisioningStyle = Automatic;
TestTargetID = 67A9CA131DE64DAA00510FB8;
};
@@ -382,12 +383,42 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
67A9CA3D1DE64E7100510FB8 /* Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
677F42111F9DCD9A00BBD071 /* Swift Lint */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Swift Lint";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
};
677F42131F9DCE4C00BBD071 /* Swift Lint */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Swift Lint";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
67A9CA101DE64DAA00510FB8 /* Sources */ = {
isa = PBXSourcesBuildPhase;
@@ -473,14 +504,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -520,14 +557,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -568,7 +611,7 @@
PRODUCT_BUNDLE_IDENTIFIER = SteveBarnegren.SwiftChessExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
@@ -587,7 +630,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = SteveBarnegren.SwiftChessExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
@@ -607,7 +650,7 @@
PRODUCT_BUNDLE_IDENTIFIER = SteveBarnegren.SwiftChessExampleTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftChessExample.app/SwiftChessExample";
};
name = Debug;
@@ -625,7 +668,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = SteveBarnegren.SwiftChessExampleTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftChessExample.app/SwiftChessExample";
};
name = Release;
Example/Example.xcodeproj/xcshareddata/xcschemes/SwiftChess-Example.xcscheme
+3 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
@@ -69,6 +70,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Example/Podfile
-24
View File
@@ -1,24 +0,0 @@
use_frameworks!
target 'SwiftChess_Example' do
pod 'SwiftChess', :path => '../'
# target 'SwiftChess_Tests' do
# inherit! :search_paths
#end
end
target 'SwiftChess_Tests' do
pod 'SwiftChess', :path => '../'
end
post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['SWIFT_VERSION'] = '3.0'
end
end
end
Example/Podfile.lock
-16
View File
@@ -1,16 +0,0 @@
PODS:
- SwiftChess (0.1.0)
DEPENDENCIES:
- SwiftChess (from `../`)
EXTERNAL SOURCES:
SwiftChess:
:path: ../
SPEC CHECKSUMS:
SwiftChess: 7ec2077f755647df70261575a0546c0486930cf3
PODFILE CHECKSUM: 410ba32ae65123335cc9534558e1f605ee0bf56c
COCOAPODS: 1.0.1
Example/Pods/Local Podspecs/SwiftChess.podspec.json
Generated
-22
View File
@@ -1,22 +0,0 @@
{
"name": "SwiftChess",
"version": "0.1.0",
"summary": "A short description of SwiftChess.",
"description": "TODO: Add long description of the pod here.",
"homepage": "https://github.com/<GITHUB_USERNAME>/SwiftChess",
"license": {
"type": "MIT",
"file": "LICENSE"
},
"authors": {
"Steve Barnegren": "steve.barnegren@gmail.com"
},
"source": {
"git": "https://github.com/<GITHUB_USERNAME>/SwiftChess.git",
"tag": "0.1.0"
},
"platforms": {
"ios": "8.0"
},
"source_files": "SwiftChess/Classes/**/*"
}
Example/Pods/Manifest.lock
Generated
-16
View File
@@ -1,16 +0,0 @@
PODS:
- SwiftChess (0.1.0)
DEPENDENCIES:
- SwiftChess (from `../`)
EXTERNAL SOURCES:
SwiftChess:
:path: ../
SPEC CHECKSUMS:
SwiftChess: 7ec2077f755647df70261575a0546c0486930cf3
PODFILE CHECKSUM: 410ba32ae65123335cc9534558e1f605ee0bf56c
COCOAPODS: 1.0.1
Example/Pods/Pods.xcodeproj/project.pbxproj
Generated
-1737
View File
File diff suppressed because it is too large Load Diff
Example/Pods/Target Support Files/Pods-SwiftChess_Example/Info.plist
Generated
-26
View File
@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>${CURRENT_PROJECT_VERSION}</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
Example/Pods/Target Support Files/Pods-SwiftChess_Example/Pods-SwiftChess_Example-acknowledgements.markdown
Generated
-26
View File
@@ -1,26 +0,0 @@
# Acknowledgements
This application makes use of the following third party libraries:
## SwiftChess
Copyright (c) 2016 Steve Barnegren <steve.barnegren@gmail.com>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
Generated by CocoaPods - https://cocoapods.org
Example/Pods/Target Support Files/Pods-SwiftChess_Example/Pods-SwiftChess_Example-acknowledgements.plist
Generated
-56
View File
@@ -1,56 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>PreferenceSpecifiers</key>
<array>
<dict>
<key>FooterText</key>
<string>This application makes use of the following third party libraries:</string>
<key>Title</key>
<string>Acknowledgements</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>FooterText</key>
<string>Copyright (c) 2016 Steve Barnegren &lt;steve.barnegren@gmail.com&gt;
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
</string>
<key>Title</key>
<string>SwiftChess</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>FooterText</key>
<string>Generated by CocoaPods - https://cocoapods.org</string>
<key>Title</key>
<string></string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
</array>
<key>StringsTable</key>
<string>Acknowledgements</string>
<key>Title</key>
<string>Acknowledgements</string>
</dict>
</plist>
Example/Pods/Target Support Files/Pods-SwiftChess_Example/Pods-SwiftChess_Example-dummy.m
Generated
-5
View File
@@ -1,5 +0,0 @@
#import <Foundation/Foundation.h>
@interface PodsDummy_Pods_SwiftChess_Example : NSObject
@end
@implementation PodsDummy_Pods_SwiftChess_Example
@end
Example/Pods/Target Support Files/Pods-SwiftChess_Example/Pods-SwiftChess_Example-frameworks.sh
Generated
-91
View File
@@ -1,91 +0,0 @@
#!/bin/sh
set -e
echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
install_framework()
{
if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
local source="${BUILT_PRODUCTS_DIR}/$1"
elif [ -r "${BUILT_PRODUCTS_DIR}/$(basename "$1")" ]; then
local source="${BUILT_PRODUCTS_DIR}/$(basename "$1")"
elif [ -r "$1" ]; then
local source="$1"
fi
local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
if [ -L "${source}" ]; then
echo "Symlinked..."
source="$(readlink "${source}")"
fi
# use filter instead of exclude so missing patterns dont' throw errors
echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\""
rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}"
local basename
basename="$(basename -s .framework "$1")"
binary="${destination}/${basename}.framework/${basename}"
if ! [ -r "$binary" ]; then
binary="${destination}/${basename}"
fi
# Strip invalid architectures so "fat" simulator / device frameworks work on device
if [[ "$(file "$binary")" == *"dynamically linked shared library"* ]]; then
strip_invalid_archs "$binary"
fi
# Resign the code if required by the build settings to avoid unstable apps
code_sign_if_enabled "${destination}/$(basename "$1")"
# Embed linked Swift runtime libraries. No longer necessary as of Xcode 7.
if [ "${XCODE_VERSION_MAJOR}" -lt 7 ]; then
local swift_runtime_libs
swift_runtime_libs=$(xcrun otool -LX "$binary" | grep --color=never @rpath/libswift | sed -E s/@rpath\\/\(.+dylib\).*/\\1/g | uniq -u && exit ${PIPESTATUS[0]})
for lib in $swift_runtime_libs; do
echo "rsync -auv \"${SWIFT_STDLIB_PATH}/${lib}\" \"${destination}\""
rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
code_sign_if_enabled "${destination}/${lib}"
done
fi
}
# Signs a framework with the provided identity
code_sign_if_enabled() {
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
# Use the current code_sign_identitiy
echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\""
/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1"
fi
}
# Strip invalid architectures
strip_invalid_archs() {
binary="$1"
# Get architectures for current file
archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
stripped=""
for arch in $archs; do
if ! [[ "${VALID_ARCHS}" == *"$arch"* ]]; then
# Strip non-valid architectures in-place
lipo -remove "$arch" -output "$binary" "$binary" || exit 1
stripped="$stripped $arch"
fi
done
if [[ "$stripped" ]]; then
echo "Stripped $binary of architectures:$stripped"
fi
}
if [[ "$CONFIGURATION" == "Debug" ]]; then
install_framework "$BUILT_PRODUCTS_DIR/SwiftChess/SwiftChess.framework"
fi
if [[ "$CONFIGURATION" == "Release" ]]; then
install_framework "$BUILT_PRODUCTS_DIR/SwiftChess/SwiftChess.framework"
fi
Example/Pods/Target Support Files/Pods-SwiftChess_Example/Pods-SwiftChess_Example-resources.sh
Generated
-102
View File
@@ -1,102 +0,0 @@
#!/bin/sh
set -e
mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
> "$RESOURCES_TO_COPY"
XCASSET_FILES=()
case "${TARGETED_DEVICE_FAMILY}" in
1,2)
TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
;;
1)
TARGET_DEVICE_ARGS="--target-device iphone"
;;
2)
TARGET_DEVICE_ARGS="--target-device ipad"
;;
*)
TARGET_DEVICE_ARGS="--target-device mac"
;;
esac
realpath() {
DIRECTORY="$(cd "${1%/*}" && pwd)"
FILENAME="${1##*/}"
echo "$DIRECTORY/$FILENAME"
}
install_resource()
{
if [[ "$1" = /* ]] ; then
RESOURCE_PATH="$1"
else
RESOURCE_PATH="${PODS_ROOT}/$1"
fi
if [[ ! -e "$RESOURCE_PATH" ]] ; then
cat << EOM
error: Resource "$RESOURCE_PATH" not found. Run 'pod install' to update the copy resources script.
EOM
exit 1
fi
case $RESOURCE_PATH in
*.storyboard)
echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}"
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}
;;
*.xib)
echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}"
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}
;;
*.framework)
echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
;;
*.xcdatamodel)
echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\""
xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom"
;;
*.xcdatamodeld)
echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\""
xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd"
;;
*.xcmappingmodel)
echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\""
xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
;;
*.xcassets)
ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
;;
*)
echo "$RESOURCE_PATH"
echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY"
;;
esac
}
mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
fi
rm -f "$RESOURCES_TO_COPY"
if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
then
# Find all other xcassets (this unfortunately includes those of path pods and other targets).
OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
while read line; do
if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
XCASSET_FILES+=("$line")
fi
done <<<"$OTHER_XCASSETS"
printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
fi
Example/Pods/Target Support Files/Pods-SwiftChess_Example/Pods-SwiftChess_Example-umbrella.h
Generated
-6
View File
@@ -1,6 +0,0 @@
#import <UIKit/UIKit.h>
FOUNDATION_EXPORT double Pods_SwiftChess_ExampleVersionNumber;
FOUNDATION_EXPORT const unsigned char Pods_SwiftChess_ExampleVersionString[];
Example/Pods/Target Support Files/Pods-SwiftChess_Example/Pods-SwiftChess_Example.modulemap
Generated
-6
View File
@@ -1,6 +0,0 @@
framework module Pods_SwiftChess_Example {
umbrella header "Pods-SwiftChess_Example-umbrella.h"
export *
module * { export * }
}
Example/Pods/Target Support Files/Pods-SwiftChess_Tests/Info.plist
Generated
-26
View File
@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>${CURRENT_PROJECT_VERSION}</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
Example/Pods/Target Support Files/Pods-SwiftChess_Tests/Pods-SwiftChess_Tests-acknowledgements.markdown
Generated
-26
View File
@@ -1,26 +0,0 @@
# Acknowledgements
This application makes use of the following third party libraries:
## SwiftChess
Copyright (c) 2016 Steve Barnegren <steve.barnegren@gmail.com>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
Generated by CocoaPods - https://cocoapods.org
Example/Pods/Target Support Files/Pods-SwiftChess_Tests/Pods-SwiftChess_Tests-acknowledgements.plist
Generated
-56
View File
@@ -1,56 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>PreferenceSpecifiers</key>
<array>
<dict>
<key>FooterText</key>
<string>This application makes use of the following third party libraries:</string>
<key>Title</key>
<string>Acknowledgements</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>FooterText</key>
<string>Copyright (c) 2016 Steve Barnegren &lt;steve.barnegren@gmail.com&gt;
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
</string>
<key>Title</key>
<string>SwiftChess</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>FooterText</key>
<string>Generated by CocoaPods - https://cocoapods.org</string>
<key>Title</key>
<string></string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
</array>
<key>StringsTable</key>
<string>Acknowledgements</string>
<key>Title</key>
<string>Acknowledgements</string>
</dict>
</plist>
Example/Pods/Target Support Files/Pods-SwiftChess_Tests/Pods-SwiftChess_Tests-dummy.m
Generated
-5
View File
@@ -1,5 +0,0 @@
#import <Foundation/Foundation.h>
@interface PodsDummy_Pods_SwiftChess_Tests : NSObject
@end
@implementation PodsDummy_Pods_SwiftChess_Tests
@end
Example/Pods/Target Support Files/Pods-SwiftChess_Tests/Pods-SwiftChess_Tests-frameworks.sh
Generated
-91
View File
@@ -1,91 +0,0 @@
#!/bin/sh
set -e
echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
install_framework()
{
if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
local source="${BUILT_PRODUCTS_DIR}/$1"
elif [ -r "${BUILT_PRODUCTS_DIR}/$(basename "$1")" ]; then
local source="${BUILT_PRODUCTS_DIR}/$(basename "$1")"
elif [ -r "$1" ]; then
local source="$1"
fi
local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
if [ -L "${source}" ]; then
echo "Symlinked..."
source="$(readlink "${source}")"
fi
# use filter instead of exclude so missing patterns dont' throw errors
echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\""
rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}"
local basename
basename="$(basename -s .framework "$1")"
binary="${destination}/${basename}.framework/${basename}"
if ! [ -r "$binary" ]; then
binary="${destination}/${basename}"
fi
# Strip invalid architectures so "fat" simulator / device frameworks work on device
if [[ "$(file "$binary")" == *"dynamically linked shared library"* ]]; then
strip_invalid_archs "$binary"
fi
# Resign the code if required by the build settings to avoid unstable apps
code_sign_if_enabled "${destination}/$(basename "$1")"
# Embed linked Swift runtime libraries. No longer necessary as of Xcode 7.
if [ "${XCODE_VERSION_MAJOR}" -lt 7 ]; then
local swift_runtime_libs
swift_runtime_libs=$(xcrun otool -LX "$binary" | grep --color=never @rpath/libswift | sed -E s/@rpath\\/\(.+dylib\).*/\\1/g | uniq -u && exit ${PIPESTATUS[0]})
for lib in $swift_runtime_libs; do
echo "rsync -auv \"${SWIFT_STDLIB_PATH}/${lib}\" \"${destination}\""
rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
code_sign_if_enabled "${destination}/${lib}"
done
fi
}
# Signs a framework with the provided identity
code_sign_if_enabled() {
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
# Use the current code_sign_identitiy
echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\""
/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1"
fi
}
# Strip invalid architectures
strip_invalid_archs() {
binary="$1"
# Get architectures for current file
archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
stripped=""
for arch in $archs; do
if ! [[ "${VALID_ARCHS}" == *"$arch"* ]]; then
# Strip non-valid architectures in-place
lipo -remove "$arch" -output "$binary" "$binary" || exit 1
stripped="$stripped $arch"
fi
done
if [[ "$stripped" ]]; then
echo "Stripped $binary of architectures:$stripped"
fi
}
if [[ "$CONFIGURATION" == "Debug" ]]; then
install_framework "$BUILT_PRODUCTS_DIR/SwiftChess/SwiftChess.framework"
fi
if [[ "$CONFIGURATION" == "Release" ]]; then
install_framework "$BUILT_PRODUCTS_DIR/SwiftChess/SwiftChess.framework"
fi
Example/Pods/Target Support Files/Pods-SwiftChess_Tests/Pods-SwiftChess_Tests-resources.sh
Generated
-102
View File
@@ -1,102 +0,0 @@
#!/bin/sh
set -e
mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
> "$RESOURCES_TO_COPY"
XCASSET_FILES=()
case "${TARGETED_DEVICE_FAMILY}" in
1,2)
TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
;;
1)
TARGET_DEVICE_ARGS="--target-device iphone"
;;
2)
TARGET_DEVICE_ARGS="--target-device ipad"
;;
*)
TARGET_DEVICE_ARGS="--target-device mac"
;;
esac
realpath() {
DIRECTORY="$(cd "${1%/*}" && pwd)"
FILENAME="${1##*/}"
echo "$DIRECTORY/$FILENAME"
}
install_resource()
{
if [[ "$1" = /* ]] ; then
RESOURCE_PATH="$1"
else
RESOURCE_PATH="${PODS_ROOT}/$1"
fi
if [[ ! -e "$RESOURCE_PATH" ]] ; then
cat << EOM
error: Resource "$RESOURCE_PATH" not found. Run 'pod install' to update the copy resources script.
EOM
exit 1
fi
case $RESOURCE_PATH in
*.storyboard)
echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}"
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}
;;
*.xib)
echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}"
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}
;;
*.framework)
echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
;;
*.xcdatamodel)
echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\""
xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom"
;;
*.xcdatamodeld)
echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\""
xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd"
;;
*.xcmappingmodel)
echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\""
xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
;;
*.xcassets)
ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
;;
*)
echo "$RESOURCE_PATH"
echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY"
;;
esac
}
mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
fi
rm -f "$RESOURCES_TO_COPY"
if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
then
# Find all other xcassets (this unfortunately includes those of path pods and other targets).
OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
while read line; do
if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
XCASSET_FILES+=("$line")
fi
done <<<"$OTHER_XCASSETS"
printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
fi
Example/Pods/Target Support Files/Pods-SwiftChess_Tests/Pods-SwiftChess_Tests-umbrella.h
Generated
-6
View File
@@ -1,6 +0,0 @@
#import <UIKit/UIKit.h>
FOUNDATION_EXPORT double Pods_SwiftChess_TestsVersionNumber;
FOUNDATION_EXPORT const unsigned char Pods_SwiftChess_TestsVersionString[];
Example/Pods/Target Support Files/Pods-SwiftChess_Tests/Pods-SwiftChess_Tests.modulemap
Generated
-6
View File
@@ -1,6 +0,0 @@
framework module Pods_SwiftChess_Tests {
umbrella header "Pods-SwiftChess_Tests-umbrella.h"
export *
module * { export * }
}
Example/Pods/Target Support Files/SwiftChess/Info.plist
Generated
-26
View File
@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>${CURRENT_PROJECT_VERSION}</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
Example/Pods/Target Support Files/SwiftChess/SwiftChess-dummy.m
Generated
-5
View File
@@ -1,5 +0,0 @@
#import <Foundation/Foundation.h>
@interface PodsDummy_SwiftChess : NSObject
@end
@implementation PodsDummy_SwiftChess
@end
Example/Pods/Target Support Files/SwiftChess/SwiftChess-prefix.pch
Generated
-4
View File
@@ -1,4 +0,0 @@
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#endif
Example/Pods/Target Support Files/SwiftChess/SwiftChess-umbrella.h
Generated
-6
View File
@@ -1,6 +0,0 @@
#import <UIKit/UIKit.h>
FOUNDATION_EXPORT double SwiftChessVersionNumber;
FOUNDATION_EXPORT const unsigned char SwiftChessVersionString[];
Example/Pods/Target Support Files/SwiftChess/SwiftChess.modulemap
Generated
-6
View File
@@ -1,6 +0,0 @@
framework module SwiftChess {
umbrella header "SwiftChess-umbrella.h"
export *
module * { export * }
}
Example/Pods/Target Support Files/SwiftChess/SwiftChess.xcconfig
Generated
-9
View File
@@ -1,9 +0,0 @@
CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/SwiftChess
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
PODS_BUILD_DIR = $BUILD_DIR
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT}
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES
Example/SwiftChess/AppDelegate.swift
+2 -26
View File
@@ -13,34 +13,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
func applicationWillResignActive(_ application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
}
func applicationDidEnterBackground(_ application: UIApplication) {
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
}
func applicationWillEnterForeground(_ application: UIApplication) {
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
}
func applicationDidBecomeActive(_ application: UIApplication) {
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
}
func applicationWillTerminate(_ application: UIApplication) {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}
}
Example/SwiftChess/BoardView.swift
+4 -5
View File
@@ -8,14 +8,14 @@
import UIKit
protocol BoardViewDelegate {
protocol BoardViewDelegate: class {
func touchedSquareAtIndex(_ boardView: BoardView, index: Int)
}
class BoardView: UIView {
// MARK: - Properties
internal var delegate: BoardViewDelegate?
internal weak var delegate: BoardViewDelegate?
// MARK: - init
@@ -29,7 +29,7 @@ class BoardView: UIView {
self.setupBoardView()
}
func setupBoardView(){
func setupBoardView() {
layer.borderColor = UIColor.black.cgColor
layer.borderWidth = 1
}
@@ -94,7 +94,7 @@ class BoardView: UIView {
}
func boardIndexForLocation(_ location: CGPoint) -> Int{
func boardIndexForLocation(_ location: CGPoint) -> Int {
// Flip y (0 at bottom)
var location = location
@@ -110,5 +110,4 @@ class BoardView: UIView {
return gridX + (gridY*8)
}
}
Example/SwiftChess/GameViewController.swift
+43 -51
View File
@@ -6,6 +6,8 @@
// Copyright © 2016 CocoaPods. All rights reserved.
//
//swiftlint:disable file_length
import UIKit
import SwiftChess
@@ -21,7 +23,7 @@ class GameViewController: UIViewController {
var pieceViews = [PieceView]()
var game: Game!
var selectedIndex: Int? {
didSet{
didSet {
updatePieceViewSelectedStates()
}
}
@@ -32,12 +34,13 @@ class GameViewController: UIViewController {
// MARK: - Creation
class func gameViewController(game: Game) -> GameViewController{
class func gameViewController(game: Game) -> GameViewController {
let storyboard = UIStoryboard(name: "Main", bundle: nil)
let className = "GameViewController"
let gameViewController: GameViewController = storyboard.instantiateViewController(withIdentifier: className) as! GameViewController
gameViewController.game = game;
let gameViewController: GameViewController =
storyboard.instantiateViewController(withIdentifier: className) as! GameViewController
gameViewController.game = game
return gameViewController
}
@@ -117,15 +120,7 @@ class GameViewController: UIViewController {
}
func pieceViewWithTag(_ tag: Int) -> PieceView? {
for pieceView in pieceViews {
if pieceView.piece.tag == tag {
return pieceView
}
}
return nil;
return pieceViews.first { $0.piece.tag == tag }
}
// MARK: - Layout
@@ -180,39 +175,35 @@ class GameViewController: UIViewController {
let player = game.currentPlayer
var isHuman = true
if let _ = player as? AIPlayer {
if player is AIPlayer {
isHuman = false
}
// White king side button
if isHuman && player?.color == .white && game.board.canColorCastle(color: .white, side: .kingSide){
if isHuman && player?.color == .white && game.board.canColorCastle(color: .white, side: .kingSide) {
whiteKingSideCastleButton.isHidden = false
}
else{
} else {
whiteKingSideCastleButton.isHidden = true
}
// White queen side button
if isHuman && player?.color == .white && game.board.canColorCastle(color: .white, side: .queenSide){
if isHuman && player?.color == .white && game.board.canColorCastle(color: .white, side: .queenSide) {
whiteQueenSideCastleButton.isHidden = false
}
else{
} else {
whiteQueenSideCastleButton.isHidden = true
}
// Black king side button
if isHuman && player?.color == .black && game.board.canColorCastle(color: .black, side: .kingSide){
if isHuman && player?.color == .black && game.board.canColorCastle(color: .black, side: .kingSide) {
blackKingSideCastleButton.isHidden = false
}
else{
} else {
blackKingSideCastleButton.isHidden = true
}
// Black queen side button
if isHuman && player?.color == .black && game.board.canColorCastle(color: .black, side: .queenSide){
if isHuman && player?.color == .black && game.board.canColorCastle(color: .black, side: .queenSide) {
blackQueenSideCastleButton.isHidden = false
}
else{
} else {
blackQueenSideCastleButton.isHidden = true
}
}
@@ -220,7 +211,7 @@ class GameViewController: UIViewController {
// MARK: - Actions
@IBAction func whiteKingSideCastleButtonPressed(sender: UIButton) {
print("White king side castle button pressed");
print("White king side castle button pressed")
if let player = game.currentPlayer as? Human {
player.performCastleMove(side: .kingSide)
@@ -228,7 +219,7 @@ class GameViewController: UIViewController {
}
@IBAction func whiteQueenSideCastleButtonPressed(sender: UIButton) {
print("White queen side castle button pressed");
print("White queen side castle button pressed")
if let player = game.currentPlayer as? Human {
player.performCastleMove(side: .queenSide)
@@ -236,7 +227,7 @@ class GameViewController: UIViewController {
}
@IBAction func blackKingSideCastleButtonPressed(sender: UIButton) {
print("Black king side castle button pressed");
print("Black king side castle button pressed")
if let player = game.currentPlayer as? Human {
player.performCastleMove(side: .kingSide)
@@ -244,7 +235,7 @@ class GameViewController: UIViewController {
}
@IBAction func blackQueenSideCastleButtonPressed(sender: UIButton) {
print("Black queen side castle button pressed");
print("Black queen side castle button pressed")
if let player = game.currentPlayer as? Human {
player.performCastleMove(side: .queenSide)
@@ -262,7 +253,7 @@ extension GameViewController: BoardViewDelegate {
// Get the player (must be human)
guard let player = game.currentPlayer as? Human else {
return;
return
}
let location = BoardLocation(index: index)
@@ -276,7 +267,7 @@ extension GameViewController: BoardViewDelegate {
}
// Select new piece if possible
if player.occupiesSquareAt(location: location) {
if player.occupiesSquare(at: location) {
selectedIndex = index
}
@@ -284,17 +275,17 @@ extension GameViewController: BoardViewDelegate {
if let selectedIndex = selectedIndex {
do {
try player.movePiece(fromLocation: BoardLocation(index: selectedIndex),
toLocation: location)
try player.movePiece(from: BoardLocation(index: selectedIndex),
to: location)
} catch Player.MoveError.pieceUnableToMoveToLocation {
print("Piece is unable to move to this location")
} catch Player.MoveError.cannotMoveInToCheck{
} catch Player.MoveError.cannotMoveInToCheck {
print("Player cannot move in to check")
showAlert(title: "😜", message: "Player cannot move in to check")
} catch Player.MoveError.playerMustMoveOutOfCheck{
} catch Player.MoveError.playerMustMoveOutOfCheck {
print("Player must move out of check")
showAlert(title: "🙃", message: "Player must move out of check")
@@ -309,7 +300,7 @@ extension GameViewController: BoardViewDelegate {
}
// MARK - GameDelegate
// MARK: - GameDelegate
extension GameViewController: GameDelegate {
@@ -318,7 +309,7 @@ extension GameViewController: GameDelegate {
}
func gameDidAddPiece(game: Game) {
// do nothing
// Do nothing
}
func gameDidMovePiece(game: Game, piece: Piece, toLocation: BoardLocation) {
@@ -329,7 +320,7 @@ extension GameViewController: GameDelegate {
pieceView.location = toLocation
// Animage
// Animate
view.setNeedsLayout()
UIView.animate(withDuration: 0.3, delay: 0, options: .curveEaseInOut, animations: {
@@ -347,8 +338,7 @@ extension GameViewController: GameDelegate {
// Fade out and remove
UIView.animate(withDuration: 0.3, delay: 0, options: .curveEaseOut, animations: {
pieceView.alpha = 0
}, completion: {
(finished: Bool) in
}, completion: { (finished: Bool) in
self.removePieceView(withTag: piece.tag)
})
@@ -369,7 +359,7 @@ extension GameViewController: GameDelegate {
func gameWonByPlayer(game: Game, player: Player) {
let colorName = player.color.toString()
let colorName = player.color.string
let title = "Checkmate!"
let message = "\(colorName.capitalized) wins!"
@@ -384,10 +374,10 @@ extension GameViewController: GameDelegate {
func gameDidChangeCurrentPlayer(game: Game) {
// Deselect selected piece
self.selectedIndex = nil;
self.selectedIndex = nil
// Tell AI to take go
if let _ = game.currentPlayer as? AIPlayer {
if game.currentPlayer is AIPlayer {
perform(#selector(tellAIToTakeGo), with: nil, afterDelay: 1)
}
@@ -395,19 +385,24 @@ extension GameViewController: GameDelegate {
updateCastleButtonsVisibility()
}
func tellAIToTakeGo() {
@objc func tellAIToTakeGo() {
if let player = game.currentPlayer as? AIPlayer {
activityIndicator.startAnimating();
activityIndicator.startAnimating()
player.makeMoveAsync()
}
}
func promotedTypeForPawn(location: BoardLocation, player: Human, possiblePromotions: [Piece.PieceType], callback: @escaping (Piece.PieceType) -> Void) {
func promotedTypeForPawn(location: BoardLocation,
player: Human,
possiblePromotions: [Piece.PieceType],
callback: @escaping (Piece.PieceType) -> Void) {
boardView.isUserInteractionEnabled = false
let viewController = PromotionSelectionViewController.promotionSelectionViewController(pawnLocation: location, possibleTypes: possiblePromotions) {
let viewController =
PromotionSelectionViewController.promotionSelectionViewController(pawnLocation: location,
possibleTypes: possiblePromotions) {
self.promotionSelectionViewController?.view.removeFromSuperview()
self.promotionSelectionViewController?.removeFromParentViewController()
@@ -421,6 +416,3 @@ extension GameViewController: GameDelegate {
}
}
Example/SwiftChess/MenuViewController.swift
+3 -14
View File
@@ -11,19 +11,9 @@ import SwiftChess
class MenuViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
// Do any additional setup after loading the view, typically from a nib.
}
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
}
// MARK: - Actions
@IBAction func playerVsAIButtonPressed(_ sender: UIButton){
@IBAction func playerVsAIButtonPressed(_ sender: UIButton) {
print("Player vs AI button pressed")
let whitePlayer = Human(color: .white)
@@ -33,7 +23,7 @@ class MenuViewController: UIViewController {
startGame(game: game)
}
@IBAction func playerVsPlayerButtonPressed(_ sender: UIButton){
@IBAction func playerVsPlayerButtonPressed(_ sender: UIButton) {
print("Player vs Player button pressed")
let whitePlayer = Human(color: .white)
@@ -43,7 +33,7 @@ class MenuViewController: UIViewController {
startGame(game: game)
}
@IBAction func AIvsAIButtonPressed(_ sender: UIButton){
@IBAction func AIvsAIButtonPressed(_ sender: UIButton) {
print("AI vs AI button pressed")
let whitePlayer = AIPlayer(color: .white, configuration: AIConfiguration(difficulty: .hard))
@@ -60,4 +50,3 @@ class MenuViewController: UIViewController {
}
}
Example/SwiftChess/PieceView.swift
+2 -3
View File
@@ -12,7 +12,7 @@ import SwiftChess
class PieceView: UIView {
public var piece: Piece {
didSet{
didSet {
update()
}
}
@@ -22,7 +22,7 @@ class PieceView: UIView {
let imageView = UIImageView()
var selected = false {
didSet{
didSet {
update()
}
}
@@ -103,7 +103,6 @@ class PieceView: UIView {
backgroundColor = selected ? UIColor.red : UIColor.clear
/*
transform = CGAffineTransform.identity
Example/SwiftChess/PromotionSelectionViewController.swift
+5 -3
View File
@@ -20,7 +20,10 @@ class PromotionSelectionViewController: UIViewController {
var buttons = [UIButton]()
// MARK: - Creation
public static func promotionSelectionViewController(pawnLocation: BoardLocation, possibleTypes: [Piece.PieceType], callback: @escaping (Piece.PieceType) -> Void) -> PromotionSelectionViewController {
public static func promotionSelectionViewController(pawnLocation: BoardLocation,
possibleTypes: [Piece.PieceType],
callback: @escaping (Piece.PieceType) -> Void)
-> PromotionSelectionViewController {
let viewController = PromotionSelectionViewController()
viewController.pawnLocation = pawnLocation
@@ -67,7 +70,7 @@ class PromotionSelectionViewController: UIViewController {
// MARK: - Actions
func buttonPressed(sender: UIButton) {
@objc func buttonPressed(sender: UIButton) {
let index = buttons.index(of: sender)!
print("Button pressed at index: \(index)")
@@ -91,5 +94,4 @@ class PromotionSelectionViewController: UIViewController {
}
}
}
Example/Tests/AIBehaviourTests.swift
+29 -29
View File
@@ -6,6 +6,8 @@
// Copyright © 2017 CocoaPods. All rights reserved.
//
//swiftlint:disable xctfail_message
/*
AI behaviour tests are tests that try to avoid or encourage certain behaviours in the AI.
@@ -60,7 +62,7 @@ class AIBehaviourTests: XCTestCase {
if endBoardPiece != nil && startBoardPiece != nil {
if endBoardPiece!.color != startBoardPiece!.color
&& endBoardPiece!.type != startBoardPiece!.type{
&& endBoardPiece!.type != startBoardPiece!.type {
return location
}
}
@@ -77,21 +79,20 @@ class AIBehaviourTests: XCTestCase {
func test_ScenarioOne_BlackShouldNotGiveAwayBishop() {
// In the following example, the black player can move the bishop at (5,7) to the * location (2,4).
// The can look like a good move because the bishop will then threaten the white queen at (3,3).
// The white queen will also be threatening the black bishop, but because this is a lower value piece black can think that it is in a more preferrable position.
// The white queen will also be threatening the black bishop,
// but because this is a lower value piece black can think that it is in a more preferrable position.
// In reality, because the black bishop is unprotected, the white queen will take it.
let board = ASCIIBoard(pieces: "r - b - q b - r" +
"p p g - - p p p" +
"- - - - - k - -" +
"- - * - - - - -" +
"- - p Q P - - -" +
"- - - - - - - -" +
"P P G - - P P P" +
"R K B - - B K R" )
let board = ASCIIBoard(pieces: "r - b - q b - r" +
"p p g - - p p p" +
"- - - - - k - -" +
"- - * - - - - -" +
"- - p Q P - - -" +
"- - - - - - - -" +
"P P G - - P P P" +
"R K B - - B K R" )
let location = board .locationOfCharacter("*")
@@ -120,14 +121,14 @@ class AIBehaviourTests: XCTestCase {
func testBlackShouldTradePawnForQueen() {
let board = ASCIIBoard(pieces: "g p - - - - - -" +
"p p - - - - - -" +
"- - - - p - - -" +
"- - - - - Q - -" +
"- - - - B - - -" +
"- - - - - - - -" +
"P P - - - - - -" +
"G P - - - - - -" )
let board = ASCIIBoard(pieces: "g p - - - - - -" +
"p p - - - - - -" +
"- - - - p - - -" +
"- - - - - Q - -" +
"- - - - B - - -" +
"- - - - - - - -" +
"P P - - - - - -" +
"G P - - - - - -" )
let queenLocation = board.locationOfCharacter("Q")
let game = makeGameWithBoard(board: board.board, colorToMove: .black)
@@ -144,14 +145,14 @@ class AIBehaviourTests: XCTestCase {
func testBlackShouldTakeWhiteQueenWithPawn() {
let board = ASCIIBoard(pieces: "- - - - - - p g" +
"- - - b - - p p" +
"- - - - q - - -" +
"- B p k P p - -" +
"- - - P Q - - -" +
"- - - - - - - -" +
"P P - - - - - -" +
"G P - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - p g" +
"- - - b - - p p" +
"- - - - q - - -" +
"- B p k P p - -" +
"- - - P Q - - -" +
"- - - - - - - -" +
"P P - - - - - -" +
"G P - - - - - -" )
let queenLocation = board.locationOfCharacter("Q")
let game = makeGameWithBoard(board: board.board, colorToMove: .black)
@@ -166,5 +167,4 @@ class AIBehaviourTests: XCTestCase {
XCTAssertEqual(game.board.getPiece(at: queenLocation)?.type, .pawn)
}
}
Example/Tests/AIConfigurationTests.swift
+100 -103
View File
@@ -25,25 +25,24 @@ class AIConfigurationTests: XCTestCase {
func testBoardRaterCountPiecesWeightingAffectsRating() {
let board = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"P P P P P P P P" +
"R K B Q G B K R" )
let board = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"P P P P P P P P" +
"R K B Q G B K R" )
var lowValueConfig = AIConfiguration()
lowValueConfig.boardRaterCountPiecesWeighting = 1
let lowValueRater = BoardRaterCountPieces(configuration: lowValueConfig)
let lowValueRating = lowValueRater.ratingfor(board: board.board, color: .white)
let lowValueRating = lowValueRater.ratingFor(board: board.board, color: .white)
var highValueConfig = AIConfiguration()
highValueConfig.boardRaterCountPiecesWeighting = 2
let highValueRater = BoardRaterCountPieces(configuration: highValueConfig)
let highValueRating = highValueRater.ratingfor(board: board.board, color: .white)
let highValueRating = highValueRater.ratingFor(board: board.board, color: .white)
XCTAssertGreaterThan(highValueRating, lowValueRating)
}
@@ -52,24 +51,24 @@ class AIConfigurationTests: XCTestCase {
func testBoardDominanceWeightingAffectsRating() {
let board = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- P - - - P P -" +
"R K B Q G B K R" )
let board = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- P - - - P P -" +
"R K B Q G B K R" )
var lowValueConfig = AIConfiguration()
lowValueConfig.boardRaterBoardDominanceWeighting = 1
let lowValueRater = BoardRaterBoardDominance(configuration: lowValueConfig)
let lowValueRating = lowValueRater.ratingfor(board: board.board, color: .white)
let lowValueRating = lowValueRater.ratingFor(board: board.board, color: .white)
var highValueConfig = AIConfiguration()
highValueConfig.boardRaterBoardDominanceWeighting = 2
let highValueRater = BoardRaterBoardDominance(configuration: highValueConfig)
let highValueRating = highValueRater.ratingfor(board: board.board, color: .white)
let highValueRating = highValueRater.ratingFor(board: board.board, color: .white)
XCTAssertGreaterThan(highValueRating, lowValueRating)
}
@@ -78,24 +77,24 @@ class AIConfigurationTests: XCTestCase {
func testCenterOwnershipWeightingAffectsRating() {
let board = ASCIIBoard(pieces: "- - - r g r - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - Q B - - -" +
"- - - K P - - -" +
"- - - - - - - -" +
"- P - - - P P -" +
"R K B Q G B K R" )
let board = ASCIIBoard(pieces: "- - - r g r - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - Q B - - -" +
"- - - K P - - -" +
"- - - - - - - -" +
"- P - - - P P -" +
"R K B Q G B K R" )
var lowValueConfig = AIConfiguration()
lowValueConfig.boardRaterCenterOwnershipWeighting = 1
let lowValueRater = BoardRaterCenterOwnership(configuration: lowValueConfig)
let lowValueRating = lowValueRater.ratingfor(board: board.board, color: .white)
let lowValueRating = lowValueRater.ratingFor(board: board.board, color: .white)
var highValueConfig = AIConfiguration()
highValueConfig.boardRaterCenterOwnershipWeighting = 2
let highValueRater = BoardRaterCenterOwnership(configuration: highValueConfig)
let highValueRating = highValueRater.ratingfor(board: board.board, color: .white)
let highValueRating = highValueRater.ratingFor(board: board.board, color: .white)
XCTAssertGreaterThan(highValueRating, lowValueRating)
}
@@ -104,24 +103,24 @@ class AIConfigurationTests: XCTestCase {
func testCenterDominanceWeightingAffetsRating() {
let board = ASCIIBoard(pieces: "- - - r g r - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - Q B - - -" +
"- - - K P - - -" +
"- - - - - - - -" +
"- P - - - P P -" +
"R K B Q G B K R" )
let board = ASCIIBoard(pieces: "- - - r g r - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - Q B - - -" +
"- - - K P - - -" +
"- - - - - - - -" +
"- P - - - P P -" +
"R K B Q G B K R" )
var lowValueConfig = AIConfiguration()
lowValueConfig.boardRaterCenterDominanceWeighting = 1
let lowValueRater = BoardRaterCenterDominance(configuration: lowValueConfig)
let lowValueRating = lowValueRater.ratingfor(board: board.board, color: .white)
let lowValueRating = lowValueRater.ratingFor(board: board.board, color: .white)
var highValueConfig = AIConfiguration()
highValueConfig.boardRaterCenterDominanceWeighting = 2
let highValueRater = BoardRaterCenterDominance(configuration: highValueConfig)
let highValueRating = highValueRater.ratingfor(board: board.board, color: .white)
let highValueRating = highValueRater.ratingFor(board: board.board, color: .white)
XCTAssertGreaterThan(highValueRating, lowValueRating)
}
@@ -131,24 +130,24 @@ class AIConfigurationTests: XCTestCase {
func testBoardRaterThreatenedPiecesWeightingAffectsRating() {
// White is threatening the black rook with its bishop and knight
let board = ASCIIBoard(pieces: "r - - - g - - -" +
"- - - - - - - -" +
"- K - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - B" )
let board = ASCIIBoard(pieces: "r - - - g - - -" +
"- - - - - - - -" +
"- K - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - B" )
var lowValueConfig = AIConfiguration()
lowValueConfig.boardRaterThreatenedPiecesWeighting = 1
let lowValueRater = BoardRaterThreatenedPieces(configuration: lowValueConfig)
let lowValueRating = lowValueRater.ratingfor(board: board.board, color: .white)
let lowValueRating = lowValueRater.ratingFor(board: board.board, color: .white)
var highValueConfig = AIConfiguration()
highValueConfig.boardRaterThreatenedPiecesWeighting = 2
let highValueRater = BoardRaterThreatenedPieces(configuration: highValueConfig)
let highValueRating = highValueRater.ratingfor(board: board.board, color: .white)
let highValueRating = highValueRater.ratingFor(board: board.board, color: .white)
XCTAssertGreaterThan(highValueRating, lowValueRating)
}
@@ -156,24 +155,24 @@ class AIConfigurationTests: XCTestCase {
func testBoardRaterThreatenedPiecesOwnPiecesMultiplierAffectsRating() {
// White and black rook are threatening each other, so advantage is neutral
let board = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"r - - - - - - R" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
let board = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"r - - - - - - R" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
var lowValueConfig = AIConfiguration()
lowValueConfig.boardRaterThreatenedPiecesOwnPiecesMultiplier = 1
let lowValueRater = BoardRaterThreatenedPieces(configuration: lowValueConfig)
let lowValueRating = lowValueRater.ratingfor(board: board.board, color: .white)
let lowValueRating = lowValueRater.ratingFor(board: board.board, color: .white)
var highValueConfig = AIConfiguration()
highValueConfig.boardRaterThreatenedPiecesOwnPiecesMultiplier = 2
let highValueRater = BoardRaterThreatenedPieces(configuration: highValueConfig)
let highValueRating = highValueRater.ratingfor(board: board.board, color: .white)
let highValueRating = highValueRater.ratingFor(board: board.board, color: .white)
// Result should be more negative for a higher value, as white is under threat
XCTAssertLessThan(highValueRating, lowValueRating)
@@ -183,24 +182,24 @@ class AIConfigurationTests: XCTestCase {
func testPawnProgressionWeightingAffectsRating() {
let board = ASCIIBoard(pieces: "- - - - g - - -" +
"p p p p p p p p" +
"- - - - - - - -" +
"- - - - - - - -" +
"P P P P P P P P" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
let board = ASCIIBoard(pieces: "- - - - g - - -" +
"p p p p p p p p" +
"- - - - - - - -" +
"- - - - - - - -" +
"P P P P P P P P" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
var lowValueConfig = AIConfiguration()
lowValueConfig.boardRaterPawnProgressionWeighting = 1
let lowValueRater = BoardRaterPawnProgression(configuration: lowValueConfig)
let lowValueRating = lowValueRater.ratingfor(board: board.board, color: .white)
let lowValueRating = lowValueRater.ratingFor(board: board.board, color: .white)
var highValueConfig = AIConfiguration()
highValueConfig.boardRaterPawnProgressionWeighting = 2
let highValueRater = BoardRaterPawnProgression(configuration: highValueConfig)
let highValueRating = highValueRater.ratingfor(board: board.board, color: .white)
let highValueRating = highValueRater.ratingFor(board: board.board, color: .white)
XCTAssertGreaterThan(highValueRating, lowValueRating)
}
@@ -209,24 +208,24 @@ class AIConfigurationTests: XCTestCase {
func testKingSurroundingPossessionWeightingAffectsRating() {
let board = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - P P P - -" +
"- - - P G P - -" )
let board = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - P P P - -" +
"- - - P G P - -" )
var lowValueConfig = AIConfiguration()
lowValueConfig.boardRaterKingSurroundingPossessionWeighting = 1
let lowValueRater = BoardRaterKingSurroundingPossession(configuration: lowValueConfig)
let lowValueRating = lowValueRater.ratingfor(board: board.board, color: .white)
let lowValueRating = lowValueRater.ratingFor(board: board.board, color: .white)
var highValueConfig = AIConfiguration()
highValueConfig.boardRaterKingSurroundingPossessionWeighting = 2
let highValueRater = BoardRaterKingSurroundingPossession(configuration: highValueConfig)
let highValueRating = highValueRater.ratingfor(board: board.board, color: .white)
let highValueRating = highValueRater.ratingFor(board: board.board, color: .white)
XCTAssertGreaterThan(highValueRating, lowValueRating)
}
@@ -236,24 +235,24 @@ class AIConfigurationTests: XCTestCase {
func testCheckMateOpportunityWeightingAffectsRating() {
// White can move Rook at (0,0) to (0,7) to check mate black
let board = ASCIIBoard(pieces: "- - - - g p - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - P P P - -" +
"R - - P G P - -" )
let board = ASCIIBoard(pieces: "- - - - g p - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - P P P - -" +
"R - - P G P - -" )
var lowValueConfig = AIConfiguration()
lowValueConfig.boardRaterCheckMateOpportunityWeighting = 1
let lowValueRater = BoardRaterCheckMateOpportunity(configuration: lowValueConfig)
let lowValueRating = lowValueRater.ratingfor(board: board.board, color: .white)
let lowValueRating = lowValueRater.ratingFor(board: board.board, color: .white)
var highValueConfig = AIConfiguration()
highValueConfig.boardRaterCheckMateOpportunityWeighting = 2
let highValueRater = BoardRaterCheckMateOpportunity(configuration: highValueConfig)
let highValueRating = highValueRater.ratingfor(board: board.board, color: .white)
let highValueRating = highValueRater.ratingFor(board: board.board, color: .white)
XCTAssertGreaterThan(highValueRating, lowValueRating)
@@ -263,27 +262,25 @@ class AIConfigurationTests: XCTestCase {
func testCenterFourOccupationWeightingAffectsRating() {
let board = ASCIIBoard(pieces: "- - - p g p - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - K R - - -" +
"- - - Q R - - -" +
"- - - - - - - -" +
"- - - P P P - -" +
"- - - P G P - -" )
let board = ASCIIBoard(pieces: "- - - p g p - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - K R - - -" +
"- - - Q R - - -" +
"- - - - - - - -" +
"- - - P P P - -" +
"- - - P G P - -" )
var lowValueConfig = AIConfiguration()
lowValueConfig.boardRaterCenterFourOccupationWeighting = 1
let lowValueRater = BoardRaterCenterFourOccupation(configuration: lowValueConfig)
let lowValueRating = lowValueRater.ratingfor(board: board.board, color: .white)
let lowValueRating = lowValueRater.ratingFor(board: board.board, color: .white)
var highValueConfig = AIConfiguration()
highValueConfig.boardRaterCenterFourOccupationWeighting = 2
let highValueRater = BoardRaterCenterFourOccupation(configuration: highValueConfig)
let highValueRating = highValueRater.ratingfor(board: board.board, color: .white)
let highValueRating = highValueRater.ratingFor(board: board.board, color: .white)
XCTAssertGreaterThan(highValueRating, lowValueRating)
}
}
Example/Tests/AIPlayerTests.swift
+54 -60
View File
@@ -45,14 +45,14 @@ class AIPlayerTests: XCTestCase {
func testKnightCannotPutOwnKingInToCheck() {
let board = ASCIIBoard(pieces: "r - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - * - - - - -" +
"K - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"G - - - - - - -" )
let board = ASCIIBoard(pieces: "r - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - * - - - - -" +
"K - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"G - - - - - - -" )
let knightLocation = board.locationOfCharacter("K")
let testLocation = board.locationOfCharacter("*")
@@ -63,21 +63,21 @@ class AIPlayerTests: XCTestCase {
fatalError()
}
XCTAssertFalse(player.canAIMovePiece(fromLocation: knightLocation, toLocation: testLocation))
XCTAssertFalse(player.canAIMovePiece(from: knightLocation, to: testLocation))
}
func testKingCannotMoveInToCheck() {
// This is a complex scenario because it was one that I observed from an actual game
let board = ASCIIBoard(pieces: "r k - - q b - r" +
"p p p g k - - p" +
"- - * p b p - -" +
"P P - - p - p P" +
"- - P - P - - -" +
"- B - - Q P - -" +
"- B - P K G P -" +
"R K - - - - - R" )
let board = ASCIIBoard(pieces: "r k - - q b - r" +
"p p p g k - - p" +
"- - * p b p - -" +
"P P - - p - p P" +
"- - P - P - - -" +
"- B - - Q P - -" +
"- B - P K G P -" +
"R K - - - - - R" )
let kingLocation = board.locationOfCharacter("g")
let testLocation = board.locationOfCharacter("*")
@@ -88,19 +88,19 @@ class AIPlayerTests: XCTestCase {
fatalError()
}
XCTAssertFalse(player.canAIMovePiece(fromLocation: kingLocation, toLocation: testLocation))
XCTAssertFalse(player.canAIMovePiece(from: kingLocation, to: testLocation))
}
func testPawnCannotPutOwnKingInToCheck() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - * - - - -" +
"G - - P - - - r" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - * - - - -" +
"G - - P - - - r" +
"- - - - - - - -" )
let pawnLocation = board.locationOfCharacter("P")
let testLocation = board.locationOfCharacter("*")
@@ -111,20 +111,20 @@ class AIPlayerTests: XCTestCase {
fatalError()
}
XCTAssertFalse(player.canAIMovePiece(fromLocation: pawnLocation, toLocation: testLocation))
XCTAssertFalse(player.canAIMovePiece(from: pawnLocation, to: testLocation))
}
func testQueenCannotPutOwnKingInToCheck() {
let board = ASCIIBoard(pieces: "- - - * - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"G - - Q - - - r" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - * - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"G - - Q - - - r" +
"- - - - - - - -" )
let queenLocation = board.locationOfCharacter("Q")
let testLocation = board.locationOfCharacter("*")
@@ -135,19 +135,19 @@ class AIPlayerTests: XCTestCase {
fatalError()
}
XCTAssertFalse(player.canAIMovePiece(fromLocation: queenLocation, toLocation: testLocation))
XCTAssertFalse(player.canAIMovePiece(from: queenLocation, to: testLocation))
}
func testRookCannotPutOwnKingInToCheck() {
let board = ASCIIBoard(pieces: "- - - * - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"G - - R - - - r" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - * - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"G - - R - - - r" +
"- - - - - - - -" )
let rookLocation = board.locationOfCharacter("R")
let testLocation = board.locationOfCharacter("*")
@@ -158,19 +158,19 @@ class AIPlayerTests: XCTestCase {
fatalError()
}
XCTAssertFalse(player.canAIMovePiece(fromLocation: rookLocation, toLocation: testLocation))
XCTAssertFalse(player.canAIMovePiece(from: rookLocation, to: testLocation))
}
func testBishopCannotPutOwnKingInToCheck() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - *" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"G - - B - - - r" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - *" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"G - - B - - - r" +
"- - - - - - - -" )
let bishopLocation = board.locationOfCharacter("B")
let testLocation = board.locationOfCharacter("*")
@@ -181,12 +181,6 @@ class AIPlayerTests: XCTestCase {
fatalError()
}
XCTAssertFalse(player.canAIMovePiece(fromLocation: bishopLocation, toLocation: testLocation))
XCTAssertFalse(player.canAIMovePiece(from: bishopLocation, to: testLocation))
}
}
Example/Tests/BoardLocationTests.swift
+21 -23
View File
@@ -6,6 +6,8 @@
// Copyright © 2017 CocoaPods. All rights reserved.
//
//swiftlint:disable function_body_length
import XCTest
@testable import SwiftChess
@@ -95,10 +97,9 @@ class BoardLocationTests: XCTestCase {
(BoardLocation.GridPosition.e8, 60),
(BoardLocation.GridPosition.f8, 61),
(BoardLocation.GridPosition.g8, 62),
(BoardLocation.GridPosition.h8, 63),
(BoardLocation.GridPosition.h8, 63)
]
for (grid, index) in testCases {
XCTAssertEqual(BoardLocation(gridPosition: grid).index, index)
XCTAssertEqual(BoardLocation(index: index).gridPosition, grid)
@@ -108,14 +109,15 @@ class BoardLocationTests: XCTestCase {
func testMoveLocationsForColorReturnsCorrectLocations() {
class FakeOpening : Opening {
override func moveGridPositions() -> [(fromPosition: BoardLocation.GridPosition, toPosition: BoardLocation.GridPosition)] {
class FakeOpening: Opening {
override func moveGridPositions()
-> [(fromPosition: BoardLocation.GridPosition, toPosition: BoardLocation.GridPosition)] {
let moves: [(BoardLocation.GridPosition, BoardLocation.GridPosition)] = [
(.e2, .e4), // white moves pawn to e4
(.e7, .e5), // black moves pawn to e5
(.g1, .f3), // white moves knight to f3
(.b8, .c6), // black moves knight to c6
(.f1, .b5), // white moves bishop to b5
(.f1, .b5) // white moves bishop to b5
]
return moves
}
@@ -124,20 +126,20 @@ class BoardLocationTests: XCTestCase {
let expectedWhiteLocations: [(fromLocation: BoardLocation, toLocation: BoardLocation)] = [
(BoardLocation(gridPosition: .e2), BoardLocation(gridPosition: .e4)),
(BoardLocation(gridPosition: .g1), BoardLocation(gridPosition: .f3)),
(BoardLocation(gridPosition: .f1), BoardLocation(gridPosition: .b5)),
(BoardLocation(gridPosition: .f1), BoardLocation(gridPosition: .b5))
]
let expectedBlackLocations: [(fromLocation: BoardLocation, toLocation: BoardLocation)] = [
(BoardLocation(gridPosition: .e7), BoardLocation(gridPosition: .e5)),
(BoardLocation(gridPosition: .b8), BoardLocation(gridPosition: .c6)),
(BoardLocation(gridPosition: .b8), BoardLocation(gridPosition: .c6))
]
let opening = FakeOpening()
let whiteMoves = opening.moves(forColor: .white)
let whiteMoves = opening.moves(for: .white)
XCTAssertEqual(whiteMoves.count, expectedWhiteLocations.count)
let blackMoves = opening.moves(forColor: .black)
let blackMoves = opening.moves(for: .black)
XCTAssertEqual(blackMoves.count, expectedBlackLocations.count)
for i in 0..<whiteMoves.count {
@@ -160,29 +162,25 @@ class BoardLocationTests: XCTestCase {
func testIsDarkSquareReturnsExpectedValue() {
let board = ASCIIBoard(colors: "! * ! * ! * ! *" +
"* ! * ! * ! * !" +
"! * ! * ! * ! *" +
"* ! * ! * ! * !" +
"! * ! * ! * ! *" +
"* ! * ! * ! * !" +
"! * ! * ! * ! *" +
"* ! * ! * ! * !" )
let board = ASCIIBoard(colors: "! * ! * ! * ! *" +
"* ! * ! * ! * !" +
"! * ! * ! * ! *" +
"* ! * ! * ! * !" +
"! * ! * ! * ! *" +
"* ! * ! * ! * !" +
"! * ! * ! * ! *" +
"* ! * ! * ! * !" )
let darkLocatons = board.locationsWithCharacter("*")
let lightLocations = board.locationsWithCharacter("!")
darkLocatons.forEach{
darkLocatons.forEach {
XCTAssertTrue($0.isDarkSquare, "Expected \($0) to be dark")
}
lightLocations.forEach{
lightLocations.forEach {
XCTAssertFalse($0.isDarkSquare, "Expected \($0) to be light")
}
}
}
Example/Tests/BoardRaterBoardDominanceTests.swift
+68 -72
View File
@@ -17,7 +17,7 @@ class BoardRaterBoardDominanceTests: XCTestCase {
super.setUp()
// Put setup code here. This method is called before the invocation of each test method in the class.
self.boardRater = BoardRaterBoardDominance(configuration: AIConfiguration(difficulty: .hard));
self.boardRater = BoardRaterBoardDominance(configuration: AIConfiguration(difficulty: .hard))
}
override func tearDown() {
@@ -27,50 +27,50 @@ class BoardRaterBoardDominanceTests: XCTestCase {
func testSingleQueenResultsInHigherValueThanSinglePawn() {
let queenBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - Q - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let queenRating = boardRater.ratingfor(board: queenBoard.board, color: .white)
let pawnBoard = ASCIIBoard(pieces: "- - - - - - - -" +
let queenBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - P - - -" +
"- - - - Q - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let pawnRating = boardRater.ratingfor(board: pawnBoard.board, color: .white)
let queenRating = boardRater.ratingFor(board: queenBoard.board, color: .white)
let pawnBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - P - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let pawnRating = boardRater.ratingFor(board: pawnBoard.board, color: .white)
XCTAssertGreaterThan(queenRating, pawnRating)
}
func testOwnPieceBlockingPathResultsInLowerValue() {
let blockedBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"P - - - - - - -" +
"Q P - - - - - -" )
let blockedRating = boardRater.ratingfor(board: blockedBoard.board, color: .white)
let blockedBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"P - - - - - - -" +
"Q P - - - - - -" )
let blockedRating = boardRater.ratingFor(board: blockedBoard.board, color: .white)
let nonBockedBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"Q - - - - - - -" )
let nonBockedRating = boardRater.ratingfor(board: nonBockedBoard.board, color: .white)
let nonBockedBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"Q - - - - - - -" )
let nonBockedRating = boardRater.ratingFor(board: nonBockedBoard.board, color: .white)
XCTAssertGreaterThan(nonBockedRating, blockedRating)
@@ -78,55 +78,51 @@ class BoardRaterBoardDominanceTests: XCTestCase {
func testOpponantDominanceResultsInLowerValue() {
let whiteDominantBoard = ASCIIBoard(pieces: "R - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - k" +
"- - - - - - - p" +
"Q - - - - - - -" )
let whiteRating = boardRater.ratingfor(board: whiteDominantBoard.board, color: .white)
let whiteDominantBoard = ASCIIBoard(pieces: "R - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - k" +
"- - - - - - - p" +
"Q - - - - - - -" )
let whiteRating = boardRater.ratingFor(board: whiteDominantBoard.board, color: .white)
let blackDominantBoard = ASCIIBoard(pieces: "r - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - K" +
"- - - - - - - P" +
"q - - - - - - -" )
let blackRating = boardRater.ratingfor(board: blackDominantBoard.board, color: .white)
let blackDominantBoard = ASCIIBoard(pieces: "r - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - K" +
"- - - - - - - P" +
"q - - - - - - -" )
let blackRating = boardRater.ratingFor(board: blackDominantBoard.board, color: .white)
XCTAssertGreaterThan(whiteRating, blackRating)
}
func testQueenInCornerResultsInLowerValueThanQueenInCenter() {
let queenInCornerBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"Q - - - - - - -" )
let queenInCornerRating = boardRater.ratingfor(board: queenInCornerBoard.board, color: .white)
let queenInCornerBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"Q - - - - - - -" )
let queenInCornerRating = boardRater.ratingFor(board: queenInCornerBoard.board, color: .white)
let queenInCenterBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - Q - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let queenInCenterRating = boardRater.ratingfor(board: queenInCenterBoard.board, color: .white)
let queenInCenterBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - Q - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let queenInCenterRating = boardRater.ratingFor(board: queenInCenterBoard.board, color: .white)
XCTAssertGreaterThan(queenInCenterRating, queenInCornerRating)
}
}
Example/Tests/BoardRaterCenterDominanceTests.swift
+18 -18
View File
@@ -26,25 +26,25 @@ class BoardRaterCenterDominanceTests: XCTestCase {
func testPiecesWithCenterVisibilityResultsInHigherValueThanPiecesWithoutCenterVisibility() {
let centerVisibleBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - Q" +
"- - - - - - - R" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let centerVisibleRating = boardRater.ratingfor(board: centerVisibleBoard.board, color: .white)
let centerVisibleBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - Q" +
"- - - - - - - R" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let centerVisibleRating = boardRater.ratingFor(board: centerVisibleBoard.board, color: .white)
let centerObstructedBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - P -" +
"- - - - - - - Q" )
let centerObstructedRating = boardRater.ratingfor(board: centerObstructedBoard.board, color: .white)
let centerObstructedBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - P -" +
"- - - - - - - Q" )
let centerObstructedRating = boardRater.ratingFor(board: centerObstructedBoard.board, color: .white)
XCTAssertGreaterThan(centerVisibleRating, centerObstructedRating)
}
Example/Tests/BoardRaterCenterFourOccupationTests.swift
+55 -57
View File
@@ -21,7 +21,6 @@ class BoardRaterCenterFourOccupationTests: XCTestCase {
super.tearDown()
}
func defaultBoardRater() -> BoardRaterCenterFourOccupation {
let configuration = AIConfiguration(difficulty: .hard)
@@ -31,93 +30,92 @@ class BoardRaterCenterFourOccupationTests: XCTestCase {
func testNorthEastCenterSquareResultsInHigherRating() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - P - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - P - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let rating = defaultBoardRater().ratingfor(board: board.board, color: .white)
let rating = defaultBoardRater().ratingFor(board: board.board, color: .white)
XCTAssertGreaterThan(rating, 0)
}
func testSouthEastCenterSquareResultsInHigherRating() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - P - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - P - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let rating = defaultBoardRater().ratingfor(board: board.board, color: .white)
let rating = defaultBoardRater().ratingFor(board: board.board, color: .white)
XCTAssertGreaterThan(rating, 0)
}
func testSouthWestCenterSquareResultsInHigherRating() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - P - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - P - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let rating = defaultBoardRater().ratingfor(board: board.board, color: .white)
let rating = defaultBoardRater().ratingFor(board: board.board, color: .white)
XCTAssertGreaterThan(rating, 0)
}
func testNorthWestCenterSquareResultsInHigherRating() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - P - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - P - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let rating = defaultBoardRater().ratingfor(board: board.board, color: .white)
let rating = defaultBoardRater().ratingFor(board: board.board, color: .white)
XCTAssertGreaterThan(rating, 0)
}
func testNonCenterSquaresResultInZeroRating() {
let board = ASCIIBoard(pieces: "P P P P P P P P" +
"P P P P P P P P" +
"P P P P P P P P" +
"P P P - - P P P" +
"P P P - - P P P" +
"P P P P P P P P" +
"P P P P P P P P" +
"P P P P P P P P" )
let board = ASCIIBoard(pieces: "P P P P P P P P" +
"P P P P P P P P" +
"P P P P P P P P" +
"P P P - - P P P" +
"P P P - - P P P" +
"P P P P P P P P" +
"P P P P P P P P" +
"P P P P P P P P" )
let rating = defaultBoardRater().ratingfor(board: board.board, color: .white)
XCTAssertEqualWithAccuracy(rating, 0, accuracy: 0.01)
let rating = defaultBoardRater().ratingFor(board: board.board, color: .white)
XCTAssertEqual(rating, 0, accuracy: 0.01)
}
func testOpponentOccupationResultsInNegativeRating() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - p p - - -" +
"- - - p p - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - p p - - -" +
"- - - p p - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let rating = defaultBoardRater().ratingfor(board: board.board, color: .white)
let rating = defaultBoardRater().ratingFor(board: board.board, color: .white)
XCTAssertLessThan(rating, 0)
}
}
Example/Tests/BoardRaterCenterOwnershipTests.swift
+19 -19
View File
@@ -26,29 +26,29 @@ class BoardRaterCenterOwnershipTests: XCTestCase {
func testCenterReturnsHigherValueThatSide() {
let centerBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - P - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let centerBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - P - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let centerRating = boardRater.ratingfor(board: centerBoard.board, color: .white);
let centerRating = boardRater.ratingFor(board: centerBoard.board, color: .white)
let sideBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - P -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let sideBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - P -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let sideRating = boardRater.ratingfor(board: sideBoard.board, color: .white);
let sideRating = boardRater.ratingFor(board: sideBoard.board, color: .white)
XCTAssertGreaterThan(centerRating, sideRating);
XCTAssertGreaterThan(centerRating, sideRating)
}
}
Example/Tests/BoardRaterCheckMateOpportunityTests.swift
+32 -33
View File
@@ -27,57 +27,57 @@ class BoardRaterCheckMateOpportunityTests: XCTestCase {
func testBoardWithNoCheckMateOpportuniesResultsInZeroRating() {
let board = Board(state: .newGame)
let whiteRating = boardRater.ratingfor(board: board, color: .white)
let blackRating = boardRater.ratingfor(board: board, color: .black)
let whiteRating = boardRater.ratingFor(board: board, color: .white)
let blackRating = boardRater.ratingFor(board: board, color: .black)
let accuracy = Double(0.1)
XCTAssertEqualWithAccuracy(whiteRating, 0, accuracy: accuracy)
XCTAssertEqualWithAccuracy(blackRating, 0, accuracy: accuracy)
XCTAssertEqual(whiteRating, 0, accuracy: accuracy)
XCTAssertEqual(blackRating, 0, accuracy: accuracy)
}
func testThatOpponentKingCheckMateOpportunityResultsInPositiveRating() {
// White can move the rook at (0, 0) to (0, 7) to put black in check mate
let board = ASCIIBoard(pieces: "- - - - g - - -" +
"- R - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"R - - - G - - -" )
let board = ASCIIBoard(pieces: "- - - - g - - -" +
"- R - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"R - - - G - - -" )
let rating = boardRater.ratingfor(board: board.board, color: .white)
let rating = boardRater.ratingFor(board: board.board, color: .white)
XCTAssertGreaterThan(rating, 0)
}
func testThatOwnKingCheckMateOpportunityResultsInNegativeRating() {
// Black can move the rook at (0, 7) to (0, 0) to put white in check mate
let board = ASCIIBoard(pieces: "r - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- r - - - - - -" +
"- - - - G - - -" )
let board = ASCIIBoard(pieces: "r - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- r - - - - - -" +
"- - - - G - - -" )
let rating = boardRater.ratingfor(board: board.board, color: .white)
let rating = boardRater.ratingFor(board: board.board, color: .white)
XCTAssertLessThan(rating, 0)
}
func testThatMultipleCheckMateOpportunitiesResultInHigherRating() {
// White can move the rook at (0, 0) to (0, 7) to put black in check mate
let singleCheckMateBoard = ASCIIBoard(pieces: "- - - - g - - -" +
"- R - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"R - - - G - - -" )
let singleCheckMateBoard = ASCIIBoard(pieces: "- - - - g - - -" +
"- R - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"R - - - G - - -" )
// White can also move the rook at (7, 0) to (7, 7) to put black in check mate
let multipleCheckMateBoard = ASCIIBoard(pieces: "- - - - g - - -" +
@@ -89,11 +89,10 @@ class BoardRaterCheckMateOpportunityTests: XCTestCase {
"- - - - - - - -" +
"R - - - G - - R" )
let singleRating = boardRater.ratingfor(board: singleCheckMateBoard.board, color: .white)
let multipleRating = boardRater.ratingfor(board: multipleCheckMateBoard.board, color: .white)
let singleRating = boardRater.ratingFor(board: singleCheckMateBoard.board, color: .white)
let multipleRating = boardRater.ratingFor(board: multipleCheckMateBoard.board, color: .white)
XCTAssertGreaterThan(multipleRating, singleRating)
}
}
Example/Tests/BoardRaterCountPiecesTests.swift
+48 -50
View File
@@ -17,7 +17,7 @@ class BoardRaterCountPiecesTests: XCTestCase {
super.setUp()
// Initiailise a new board rater for each test
boardRater = BoardRaterCountPieces(configuration: AIConfiguration(difficulty: .hard));
boardRater = BoardRaterCountPieces(configuration: AIConfiguration(difficulty: .hard))
}
override func tearDown() {
@@ -27,71 +27,71 @@ class BoardRaterCountPiecesTests: XCTestCase {
func testWhiteWinningResultsInPositiveValue() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"P P P P P P P P" +
"R K B Q G B K R" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"P P P P P P P P" +
"R K B Q G B K R" )
let rating = boardRater.ratingfor(board: board.board, color: .white)
let rating = boardRater.ratingFor(board: board.board, color: .white)
XCTAssert(rating > 0, "Expected rating to be positive")
}
func testWhiteLosingResultsInNegativeValue() {
let board = ASCIIBoard(pieces: "r k b q g b k r" +
"p p p p p p p p" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "r k b q g b k r" +
"p p p p p p p p" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let rating = boardRater.ratingfor(board: board.board, color: .white)
let rating = boardRater.ratingFor(board: board.board, color: .white)
XCTAssert(rating < 0, "Expected rating to be negative")
}
func testGreaterNumberOfPiecesResultsInHigherValue() {
let fewerPiecesBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"P P P P P P P P" )
let morePiecesBoard = ASCIIBoard(pieces: "- - - - - - - -" +
let fewerPiecesBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"P P P P P P P P" +
"P P P P P P P P" )
let fewerPiecesRating = boardRater.ratingfor(board: fewerPiecesBoard.board, color: .white)
let morePiecesRating = boardRater.ratingfor(board: morePiecesBoard.board, color: .white)
let morePiecesBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"P P P P P P P P" +
"P P P P P P P P" )
let fewerPiecesRating = boardRater.ratingFor(board: fewerPiecesBoard.board, color: .white)
let morePiecesRating = boardRater.ratingFor(board: morePiecesBoard.board, color: .white)
XCTAssert(morePiecesRating > fewerPiecesRating, "Expected more pieces to produce higher rating")
}
func testHigherValuePiecesResultsInHigherRating() {
let lowerValuePiecesBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"P P P - - - - -" )
let lowerValuePiecesBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"P P P - - - - -" )
let higherValuePiecesBoard = ASCIIBoard(pieces: "- - - - - - - -" +
let higherValuePiecesBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
@@ -100,23 +100,21 @@ class BoardRaterCountPiecesTests: XCTestCase {
"- - - - - - - -" +
"R R R - - - - -" )
let lowerValuePiecesRating = boardRater.ratingfor(board: lowerValuePiecesBoard.board, color: .white)
let higherValuePiecesRating = boardRater.ratingfor(board: higherValuePiecesBoard.board, color: .white)
XCTAssert(higherValuePiecesRating > lowerValuePiecesRating, "Expected higher value pieces to produce higher rating")
let lowerValuePiecesRating = boardRater.ratingFor(board: lowerValuePiecesBoard.board, color: .white)
let higherValuePiecesRating = boardRater.ratingFor(board: higherValuePiecesBoard.board, color: .white)
XCTAssert(higherValuePiecesRating > lowerValuePiecesRating,
"Expected higher value pieces to produce higher rating")
}
// MARK - Perfomance
// MARK: - Perfomance
func testRatingPerformance() {
let board = Board(state: .newGame)
self.measure {
for _ in 0..<1000{
let _ = self.boardRater.ratingfor(board: board, color: .white)
for _ in 0..<1000 {
_ = self.boardRater.ratingFor(board: board, color: .white)
}
}
}
Example/Tests/BoardRaterKingSurroundingPossession.swift
+198 -209
View File
@@ -6,6 +6,9 @@
// Copyright © 2016 CocoaPods. All rights reserved.
//
// swiftlint:disable type_body_length
// swiftlint:disable file_length
import XCTest
@testable import SwiftChess
@@ -32,164 +35,154 @@ class BoardRaterKingSurroundingPossessionTests: XCTestCase {
let surroundingLocations = self.boardRater.locationsSurroundingKing(color: color, board: board.board)
XCTAssertEqual(indexes.count, surroundingLocations.count,
"Expected counts to be the same (\(indexes.count) indexes \(surroundingLocations.count) surrounding locations).")
"Expected same: (\(indexes.count) indexes \(surroundingLocations.count) surrounding locations).")
for index in indexes {
let location = BoardLocation(index: index)
var foundLocation = false
for surroundingLocation in surroundingLocations {
if surroundingLocation == location {
foundLocation = true
}
}
let foundLocation = surroundingLocations.contains { $0 == location }
XCTAssertTrue(foundLocation, "Expected location x: \(location.x) y: \(location.y) to be returned")
}
}
func testWhiteKingSurroundingSpacesReturnsCorrectIndexesInCenter() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - * * * - - -" +
"- - * G * - - -" +
"- - * * * - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - * * * - - -" +
"- - * G * - - -" +
"- - * * * - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
assertSurroundingSpacesAreCorrect(color: .white, board: board)
}
func testWhiteKingSurroundingSpacesReturnsCorrectIndexesInBottomLeft() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"* * - - - - - -" +
"G * - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"* * - - - - - -" +
"G * - - - - - -" )
assertSurroundingSpacesAreCorrect(color: .white, board: board)
}
func testWhiteKingSurroundingSpacesReturnsCorrectIndexesInBottomRight() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - * *" +
"- - - - - - * G" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - * *" +
"- - - - - - * G" )
assertSurroundingSpacesAreCorrect(color: .white, board: board)
}
func testWhiteKingSurroundingSpacesReturnsCorrectIndexesInTopLeft() {
let board = ASCIIBoard(pieces: "G * - - - - - -" +
"* * - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "G * - - - - - -" +
"* * - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
assertSurroundingSpacesAreCorrect(color: .white, board: board)
}
func testWhiteKingSurroundingSpacesReturnsCorrectIndexesInTopRight() {
let board = ASCIIBoard(pieces: "- - - - - - * G" +
"- - - - - - * *" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - * G" +
"- - - - - - * *" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
assertSurroundingSpacesAreCorrect(color: .white, board: board)
}
func testBlackKingSurroundingSpacesReturnsCorrectIndexesInCenter() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - * * * - - -" +
"- - * g * - - -" +
"- - * * * - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - * * * - - -" +
"- - * g * - - -" +
"- - * * * - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
assertSurroundingSpacesAreCorrect(color: .black, board: board)
}
func testBlackKingSurroundingSpacesReturnsCorrectIndexesInBottomLeft() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"* * - - - - - -" +
"g * - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"* * - - - - - -" +
"g * - - - - - -" )
assertSurroundingSpacesAreCorrect(color: .black, board: board)
}
func testBlackKingSurroundingSpacesReturnsCorrectIndexesInBottomRight() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - * *" +
"- - - - - - * g" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - * *" +
"- - - - - - * g" )
assertSurroundingSpacesAreCorrect(color: .black, board: board)
}
func testBlackKingSurroundingSpacesReturnsCorrectIndexesInTopLeft() {
let board = ASCIIBoard(pieces: "g * - - - - - -" +
"* * - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "g * - - - - - -" +
"* * - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
assertSurroundingSpacesAreCorrect(color: .black, board: board)
}
func testBlackKingSurroundingSpacesReturnsCorrectIndexesInTopRight() {
let board = ASCIIBoard(pieces: "- - - - - - * g" +
"- - - - - - * *" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - * g" +
"- - - - - - * *" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
assertSurroundingSpacesAreCorrect(color: .black, board: board)
}
@@ -207,17 +200,17 @@ class BoardRaterKingSurroundingPossessionTests: XCTestCase {
"r - - - - - - -" +
"- - - - G - - -" )
let highRatingBoard = ASCIIBoard(pieces:"- - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"r - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
let highRatingBoard = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"r - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
let lowRating = boardRater.ratingfor(board: lowRatingBoard.board, color: .white)
let highRating = boardRater.ratingfor(board: highRatingBoard.board, color: .white)
let lowRating = boardRater.ratingFor(board: lowRatingBoard.board, color: .white)
let highRating = boardRater.ratingFor(board: highRatingBoard.board, color: .white)
XCTAssertGreaterThan(highRating, lowRating)
}
@@ -233,17 +226,17 @@ class BoardRaterKingSurroundingPossessionTests: XCTestCase {
"- - - - - - - -" +
"- - - - G - - -" )
let highRatingBoard = ASCIIBoard(pieces:"- - - - - - - -" +
"- - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"R - - - - - - -" +
"- - - - G - - -" )
let highRatingBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"R - - - - - - -" +
"- - - - G - - -" )
let lowRating = boardRater.ratingfor(board: lowRatingBoard.board, color: .white)
let highRating = boardRater.ratingfor(board: highRatingBoard.board, color: .white)
let lowRating = boardRater.ratingFor(board: lowRatingBoard.board, color: .white)
let highRating = boardRater.ratingFor(board: highRatingBoard.board, color: .white)
XCTAssertGreaterThan(highRating, lowRating)
}
@@ -259,17 +252,17 @@ class BoardRaterKingSurroundingPossessionTests: XCTestCase {
"- - - - - - - -" +
"- - - - G - - -" )
let highRatingBoard = ASCIIBoard(pieces:"- - - - g - - -" +
"R - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
let highRatingBoard = ASCIIBoard(pieces: "- - - - g - - -" +
"R - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
let lowRating = boardRater.ratingfor(board: lowRatingBoard.board, color: .white)
let highRating = boardRater.ratingfor(board: highRatingBoard.board, color: .white)
let lowRating = boardRater.ratingFor(board: lowRatingBoard.board, color: .white)
let highRating = boardRater.ratingFor(board: highRatingBoard.board, color: .white)
XCTAssertGreaterThan(highRating, lowRating)
}
@@ -285,130 +278,126 @@ class BoardRaterKingSurroundingPossessionTests: XCTestCase {
"- - - - - - - -" +
"- - - - G - - -" )
let highRatingBoard = ASCIIBoard(pieces:"- - - - g - - -" +
"- - - - - - - -" +
"r - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
let highRatingBoard = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - - - - - -" +
"r - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
let lowRating = boardRater.ratingfor(board: lowRatingBoard.board, color: .white)
let highRating = boardRater.ratingfor(board: highRatingBoard.board, color: .white)
let lowRating = boardRater.ratingFor(board: lowRatingBoard.board, color: .white)
let highRating = boardRater.ratingFor(board: highRatingBoard.board, color: .white)
XCTAssertGreaterThan(highRating, lowRating)
}
func testThatBlackandWhiteRatingsAreTheSame() {
let board = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"Q - - - - - - b" +
"R - - - p - - q" +
"- k - - G - K -" )
let board = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"Q - - - - - - b" +
"R - - - p - - q" +
"- k - - G - K -" )
let invertedBoard = ASCIIBoard(pieces: "- - - - G - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"q - - - - - - B" +
"r - - - P - - Q" +
"- K - - g - k -" )
let invertedBoard = ASCIIBoard(pieces: "- - - - G - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"q - - - - - - B" +
"r - - - P - - Q" +
"- K - - g - k -" )
let rating = boardRater.ratingfor(board: board.board, color: .white)
let invertedRating = boardRater.ratingfor(board: invertedBoard.board, color: .black)
let rating = boardRater.ratingFor(board: board.board, color: .white)
let invertedRating = boardRater.ratingFor(board: invertedBoard.board, color: .black)
XCTAssertEqualWithAccuracy(rating, invertedRating, accuracy: 0.01)
XCTAssertEqual(rating, invertedRating, accuracy: 0.01)
}
func testThatPiecesSurroundingOwnKingResultsInPositiveRatingForWhite() {
let board = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - P P P - -" +
"- - - P G P - -" )
let board = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - P P P - -" +
"- - - P G P - -" )
let rating = boardRater.ratingfor(board: board.board, color: .white)
let rating = boardRater.ratingFor(board: board.board, color: .white)
XCTAssertGreaterThan(rating, 0)
}
func testThatPiecesSurroundingOwnKingResultsInPositiveRatingForBlack() {
let board = ASCIIBoard(pieces: "- - - p g p - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
let board = ASCIIBoard(pieces: "- - - p g p - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
let rating = boardRater.ratingfor(board: board.board, color: .black)
let rating = boardRater.ratingFor(board: board.board, color: .black)
XCTAssertGreaterThan(rating, 0)
}
func testThatPiecesSurroundingOpponentKingResultsInMoreNegativeRatingForWhite() {
let openKingBoard = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
let openKingBoard = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
let surroundedKingBoard = ASCIIBoard(pieces: "- - - p g p - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
let surroundedKingBoard = ASCIIBoard(pieces: "- - - p g p - -" +
"- - - p p p - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
let openKingRating = boardRater.ratingfor(board: openKingBoard.board, color: .white)
let surroundedKingRating = boardRater.ratingfor(board: surroundedKingBoard.board, color: .white)
let openKingRating = boardRater.ratingFor(board: openKingBoard.board, color: .white)
let surroundedKingRating = boardRater.ratingFor(board: surroundedKingBoard.board, color: .white)
XCTAssertLessThan(surroundedKingRating, openKingRating)
}
func testThatPiecesSurroundingOpponentKingResultsInMoreNegativeRatingForBlack() {
let openKingBoard = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
let openKingBoard = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - G - - -" )
let surroundedKingBoard = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - P P P - -" +
"- - - P G P - -" )
let surroundedKingBoard = ASCIIBoard(pieces: "- - - - g - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - P P P - -" +
"- - - P G P - -" )
let openKingRating = boardRater.ratingfor(board: openKingBoard.board, color: .black)
let surroundedKingRating = boardRater.ratingfor(board: surroundedKingBoard.board, color: .black)
let openKingRating = boardRater.ratingFor(board: openKingBoard.board, color: .black)
let surroundedKingRating = boardRater.ratingFor(board: surroundedKingBoard.board, color: .black)
XCTAssertLessThan(surroundedKingRating, openKingRating)
}
}
Example/Tests/BoardRaterPawnProgressionTests.swift
+54 -55
View File
@@ -28,14 +28,14 @@ class BoardRaterPawnProgressionTests: XCTestCase {
func testProgressedPawnResultsInHigherRatingForWhitePlayer() {
let progressedBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- P - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let progressedBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- P - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let lessProgressedBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
@@ -46,8 +46,8 @@ class BoardRaterPawnProgressionTests: XCTestCase {
"- - - - - - - -" +
"- - - - - - - -" )
let progressedRating = boardRater.ratingfor(board: progressedBoard.board, color: .white)
let lessProgressedRating = boardRater.ratingfor(board: lessProgressedBoard.board, color: .white)
let progressedRating = boardRater.ratingFor(board: progressedBoard.board, color: .white)
let lessProgressedRating = boardRater.ratingFor(board: lessProgressedBoard.board, color: .white)
XCTAssert(progressedRating > lessProgressedRating)
}
@@ -72,77 +72,76 @@ class BoardRaterPawnProgressionTests: XCTestCase {
"- - - - - - - -" +
"- - - - - - - -" )
let progressedRating = boardRater.ratingfor(board: progressedBoard.board, color: .black)
let lessProgressedRating = boardRater.ratingfor(board: lessProgressedBoard.board, color: .black)
let progressedRating = boardRater.ratingFor(board: progressedBoard.board, color: .black)
let lessProgressedRating = boardRater.ratingFor(board: lessProgressedBoard.board, color: .black)
XCTAssert(progressedRating > lessProgressedRating)
}
func testWhitePawnsOnStartingRowResultInZeroRating() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- P - P - - P -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- P - P - - P -" +
"- - - - - - - -" )
let rating = boardRater.ratingfor(board: board.board, color: .white)
let rating = boardRater.ratingFor(board: board.board, color: .white)
XCTAssertEqualWithAccuracy(rating, 0, accuracy: 0.0001)
XCTAssertEqual(rating, 0, accuracy: 0.0001)
}
func testBlackPawnsOnStartingRowResultInZeroRating() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- p - p - - p -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- p - p - - p -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let rating = boardRater.ratingfor(board: board.board, color: .black)
let rating = boardRater.ratingFor(board: board.board, color: .black)
XCTAssertEqualWithAccuracy(rating, 0, accuracy: 0.0001)
XCTAssertEqual(rating, 0, accuracy: 0.0001)
}
func testWhiteAndBlackPawnRelativeSquaresResultInTheSameValue() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - p" +
"P - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - p" +
"P - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let whiteRating = boardRater.ratingfor(board: board.board, color: .white)
let blackRating = boardRater.ratingfor(board: board.board, color: .black)
let whiteRating = boardRater.ratingFor(board: board.board, color: .white)
let blackRating = boardRater.ratingFor(board: board.board, color: .black)
XCTAssertEqualWithAccuracy(whiteRating, blackRating, accuracy: 0.0001)
XCTAssertEqual(whiteRating, blackRating, accuracy: 0.0001)
}
func testTotalWhiteAndBlackRowsValueAreEqual() {
let board = ASCIIBoard(pieces: "P - - - - - - p" +
"P - - - - - - p" +
"P - - - - - - p" +
"P - - - - - - p" +
"P - - - - - - p" +
"P - - - - - - p" +
"P - - - - - - p" +
"P - - - - - - p" )
let board = ASCIIBoard(pieces: "P - - - - - - p" +
"P - - - - - - p" +
"P - - - - - - p" +
"P - - - - - - p" +
"P - - - - - - p" +
"P - - - - - - p" +
"P - - - - - - p" +
"P - - - - - - p" )
let whiteRating = boardRater.ratingfor(board: board.board, color: .white)
let blackRating = boardRater.ratingfor(board: board.board, color: .black)
let whiteRating = boardRater.ratingFor(board: board.board, color: .white)
let blackRating = boardRater.ratingFor(board: board.board, color: .black)
XCTAssertEqualWithAccuracy(whiteRating, blackRating, accuracy: 0.0001)
XCTAssertEqual(whiteRating, blackRating, accuracy: 0.0001)
}
}
Example/Tests/BoardRaterThreatenedPiecesTests.swift
+127 -207
View File
@@ -6,6 +6,8 @@
// Copyright © 2016 CocoaPods. All rights reserved.
//
// swiftlint:disable type_body_length
import XCTest
@testable import SwiftChess
@@ -27,153 +29,75 @@ class BoardRaterThreatenedPiecesTests: XCTestCase {
func testBoardRaterThreatededPiecesReturnsNoThreatIfNoOtherPieces() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - Q - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - Q - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let rating = boardRater.ratingfor(board: board.board, color: .white)
let rating = boardRater.ratingFor(board: board.board, color: .white)
XCTAssertEqualWithAccuracy(rating, 0, accuracy: 0.01)
XCTAssertEqual(rating, 0, accuracy: 0.01)
}
func testBoardRaterThreatenedPiecesReturnsNegativeValueIfThreatened() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"q - - - - - K -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"q - - - - - K -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let rating = boardRater.ratingfor(board: board.board, color: .white)
let rating = boardRater.ratingFor(board: board.board, color: .white)
XCTAssertLessThan(rating, 0)
}
func testBoardRaterThreatenedPiecesReturnsPositiveValueIfThreateningOpponant() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"Q - - - - - k -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"Q - - - - - k -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let rating = boardRater.ratingfor(board: board.board, color: .white)
let rating = boardRater.ratingFor(board: board.board, color: .white)
XCTAssertGreaterThan(rating, 0)
}
func testBoardRaterThreatenedPiecesReturnsHigherThreatValueForHigherValuePieces() {
/*
let queenBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"q - - - - - Q -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let queenIndex = queenBoard.indexOfCharacter("Q")
let queenLocation = BoardLocation(index: queenIndex)
let queenRating = boardRater.threatRatingForPiece(at: queenLocation,
board: queenBoard.board,
color: .white)
let knightBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"q - - - - - K -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let knightIndex = knightBoard.indexOfCharacter("K")
let knightLocation = BoardLocation(index: knightIndex)
let knightRating = boardRater.threatRatingForPiece(at: knightLocation,
board: knightBoard.board,
color: .white)
XCTAssert(queenRating > knightRating);
*/
}
func testBoardRaterThreatenedPiecesReturnsMoreNegativeThreatValueForFavourableTrade() {
/*
// Good trade (White rook can be taken by the black queen, but the white pawn will then take the queen)
let goodTradeBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - R - - -" +
"- - - P - - - -" +
"- - - - - - - -" +
"- - - - - - - q" +
"- - - - - - - -" )
// Bad trade (White rook can be taken by the black pawn, then the white pawn will take the black pawn)
let badTradeBoard = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - p - -" +
"- - - - R - - -" +
"- - - P - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let rookLocation = BoardLocation(index: goodTradeBoard.indexOfCharacter("R"))
let goodTradeRating = boardRater.threatRatingForPiece(at: rookLocation, board: goodTradeBoard.board, color: .white)
let badTradeRating = boardRater.threatRatingForPiece(at: rookLocation, board: badTradeBoard.board, color: .white)
XCTAssert(goodTradeRating < badTradeRating);
*/
}
// MARK - Get protected pieces tests
// MARK: - Get protected pieces tests
func testGetProtectingPiecesReturnsProtectingPieces() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - K - -" +
"- - - - - - - -" +
"- - - - - - Q -" +
"- - - - - - - -" +
"- - - - - - R -" +
"- - - B - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - K - -" +
"- - - - - - - -" +
"- - - - - - Q -" +
"- - - - - - - -" +
"- - - - - - R -" +
"- - - B - - - -" )
let expectedIndexes = [
board.indexOfCharacter("K"),
board.indexOfCharacter("R"),
board.indexOfCharacter("B"),
board.indexOfCharacter("B")
]
let queenLocation = BoardLocation(index: board.indexOfCharacter("Q"))
let gameBoard = board.board
let protectingLocations = boardRater.getPieces(protecting: gameBoard.getPiece(at: queenLocation)!,
onBoard: board.board).map{ $0.location }
on: board.board).map { $0.location }
// Check all of the expected locations appeared in the protecting locations array
for expectedIndex in expectedIndexes {
@@ -198,26 +122,26 @@ class BoardRaterThreatenedPiecesTests: XCTestCase {
}
}
XCTAssertTrue(wasExpected, "Found unexpected protecting location \(location)");
XCTAssertTrue(wasExpected, "Found unexpected protecting location \(location)")
}
}
func testGetProtectingPiecesDoesntReturnNonProtectingPiecesOfSameColor() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - K - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - Q -" +
"- - - - - - - -" +
"R - - - - - - -" +
"- B - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - K - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - Q -" +
"- - - - - - - -" +
"R - - - - - - -" +
"- B - - - - - -" )
let queenLocation = BoardLocation(index: board.indexOfCharacter("Q"))
let gameBoard = board.board
let protectingPieces = boardRater.getPieces(protecting: gameBoard.getPiece(at: queenLocation)!,
onBoard: gameBoard)
on: gameBoard)
// None of the pieces are protecting the queen, so expect count to be zero
XCTAssertTrue(protectingPieces.count == 0)
@@ -225,20 +149,20 @@ class BoardRaterThreatenedPiecesTests: XCTestCase {
func testGetProtectingPiecesDoesntReturnThreateningPiecesOfOppositeColor() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - k - -" +
"- - - - - - - -" +
"- - - - - - Q -" +
"- - - - - - - -" +
"- - - - - - r -" +
"- - - b - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - k - -" +
"- - - - - - - -" +
"- - - - - - Q -" +
"- - - - - - - -" +
"- - - - - - r -" +
"- - - b - - - -" )
let queenLocation = BoardLocation(index: board.indexOfCharacter("Q"))
let gameBoard = board.board
let protectingPieces = boardRater.getPieces(protecting: gameBoard.getPiece(at: queenLocation)!,
onBoard: gameBoard)
on: gameBoard)
// The black pieces cannot protect the white queen, so expect count to be zero
XCTAssertTrue(protectingPieces.count == 0)
@@ -246,20 +170,20 @@ class BoardRaterThreatenedPiecesTests: XCTestCase {
func testGetProtectingPiecesDoesntReturnPawnsMovingStraightAhead() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - Q -" +
"- - - - - - P -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - Q -" +
"- - - - - - P -" +
"- - - - - - - -" +
"- - - - - - - -" )
let queenLocation = BoardLocation(index: board.indexOfCharacter("Q"))
let gameBoard = board.board
let protectingPieces = boardRater.getPieces(protecting: gameBoard.getPiece(at: queenLocation)!,
onBoard: gameBoard)
on: gameBoard)
XCTAssertTrue(protectingPieces.count == 0)
@@ -267,50 +191,48 @@ class BoardRaterThreatenedPiecesTests: XCTestCase {
func testGetProtectingPiecesReturnsPawnsMovingDiagonally() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - Q -" +
"- - - - - P - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - Q -" +
"- - - - - P - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let queenLocation = BoardLocation(index: board.indexOfCharacter("Q"))
let gameBoard = board.board
let protectingPieces = boardRater.getPieces(protecting: gameBoard.getPiece(at: queenLocation)!,
onBoard: gameBoard)
on: gameBoard)
XCTAssertTrue(protectingPieces.count == 1)
}
// MARK - Get threatening pieces tests
// MARK: - Get threatening pieces tests
func testGetThreateningPiecesReturnsThreateningPieces() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - k - -" +
"- - - - - - - -" +
"- - - - - - Q -" +
"- - - - - - - -" +
"- - - - - - r -" +
"- - - b - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - k - -" +
"- - - - - - - -" +
"- - - - - - Q -" +
"- - - - - - - -" +
"- - - - - - r -" +
"- - - b - - - -" )
let expectedIndexes = [
board.indexOfCharacter("k"),
board.indexOfCharacter("r"),
board.indexOfCharacter("b"),
board.indexOfCharacter("b")
]
let queenLocation = BoardLocation(index: board.indexOfCharacter("Q"))
let gameBoard = board.board
let threateningLocations = boardRater.getPieces(threatening: gameBoard.getPiece(at: queenLocation)!,
onBoard: gameBoard).map{ $0.location }
on: gameBoard).map { $0.location }
// Check all of the expected locations appeared in the protecting locations array
for expectedIndex in expectedIndexes {
@@ -335,26 +257,26 @@ class BoardRaterThreatenedPiecesTests: XCTestCase {
}
}
XCTAssertTrue(wasExpected, "Found unexpected threatening location \(location)");
XCTAssertTrue(wasExpected, "Found unexpected threatening location \(location)")
}
}
func testGetThreateningPiecesDoesntReturnNonThreateningPiecesOfOppositeColor() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - k - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - Q -" +
"- - - - - - - -" +
"r - - - - - - -" +
"- b - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - k - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - Q -" +
"- - - - - - - -" +
"r - - - - - - -" +
"- b - - - - - -" )
let queenLocation = BoardLocation(index: board.indexOfCharacter("Q"))
let gameBoard = board.board
let threateningPieces = boardRater.getPieces(threatening: gameBoard.getPiece(at: queenLocation)!,
onBoard: gameBoard)
on: gameBoard)
// None of the pieces are threatening the queen, so expect count to be zero
XCTAssertTrue(threateningPieces.count == 0)
@@ -362,20 +284,20 @@ class BoardRaterThreatenedPiecesTests: XCTestCase {
func testGetThreateningPiecesDoesntReturnProtectingPiecesOfSameColor() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - K - -" +
"- - - - - - - -" +
"- - - - - - Q -" +
"- - - - - - - -" +
"- - - - - - R -" +
"- - - B - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - K - -" +
"- - - - - - - -" +
"- - - - - - Q -" +
"- - - - - - - -" +
"- - - - - - R -" +
"- - - B - - - -" )
let queenLocation = BoardLocation(index: board.indexOfCharacter("Q"))
let gameBoard = board.board
let threateningPieces = boardRater.getPieces(threatening: gameBoard.getPiece(at: queenLocation)!,
onBoard: gameBoard)
on: gameBoard)
// The white pieces cannot threaten the white queen, so expect count to be zero
XCTAssertTrue(threateningPieces.count == 0)
@@ -383,44 +305,42 @@ class BoardRaterThreatenedPiecesTests: XCTestCase {
func testGetThreateningPiecesDoesntReturnPawnsMovingStraightAhead() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - q -" +
"- - - - - - P -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - q -" +
"- - - - - - P -" +
"- - - - - - - -" +
"- - - - - - - -" )
let queenLocation = BoardLocation(index: board.indexOfCharacter("q"))
let gameBoard = board.board
let threateningPieces = boardRater.getPieces(threatening: gameBoard.getPiece(at: queenLocation)!,
onBoard: gameBoard)
on: gameBoard)
XCTAssertTrue(threateningPieces.count == 0)
}
func testGetThreateningPiecesReturnsPawnsMovingDiagonally() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - q -" +
"- - - - - P - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - q -" +
"- - - - - P - -" +
"- - - - - - - -" +
"- - - - - - - -" )
let queenLocation = BoardLocation(index: board.indexOfCharacter("q"))
let gameBoard = board.board
let threateningPieces = boardRater.getPieces(threatening: gameBoard.getPiece(at: queenLocation)!,
onBoard: gameBoard)
on: gameBoard)
XCTAssertTrue(threateningPieces.count == 1)
}
}
Example/Tests/BoardScenarios.swift
+32 -34
View File
@@ -13,52 +13,50 @@ extension Board {
public static func whiteInStaleMateScenario() -> Board {
return ASCIIBoard(pieces: "- - r - r - - g" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"q - - - - - - -" +
"- - - G - - - -" ).board
return ASCIIBoard(pieces: "- - r - r - - g" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"q - - - - - - -" +
"- - - G - - - -" ).board
}
public static func blackInStaleMateScenario() -> Board {
return ASCIIBoard(pieces: "- - R - R - - G" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"Q - - - - - - -" +
"- - - g - - - -" ).board
return ASCIIBoard(pieces: "- - R - R - - G" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"Q - - - - - - -" +
"- - - g - - - -" ).board
}
public static func whiteInCheckMateScenario() -> Board {
return ASCIIBoard(pieces: "- p g - - - - K" +
"- - - - - P - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"r - - - - - - -" +
"r - - G - - - -" ).board
return ASCIIBoard(pieces: "- p g - - - - K" +
"- - - - - P - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"r - - - - - - -" +
"r - - G - - - -" ).board
}
public static func blackInCheckMateScenario() -> Board {
return ASCIIBoard(pieces: "- - - g - - - R" +
"- - - - - - - R" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- G - - - - - -" ).board
return ASCIIBoard(pieces: "- - - g - - - R" +
"- - - - - - - R" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- G - - - - - -" ).board
}
}
Example/Tests/BoardTests.swift
+375 -369
View File
File diff suppressed because it is too large Load Diff
Example/Tests/GameTests.swift
+6 -6
View File
@@ -64,19 +64,19 @@ class GameTests: XCTestCase {
// White player moves pawn
do {
try whitePlayer.movePiece(fromLocation: BoardLocation(x: 0, y: 1),
toLocation: BoardLocation(x: 0, y: 2))
try whitePlayer.movePiece(from: BoardLocation(x: 0, y: 1),
to: BoardLocation(x: 0, y: 2))
} catch {
XCTFail()
XCTFail("Expected to be able to move piece")
return
}
// Black player moves pawn
do {
try blackPlayer.movePiece(fromLocation: BoardLocation(x: 7, y: 6),
toLocation: BoardLocation(x: 7, y: 5))
try blackPlayer.movePiece(from: BoardLocation(x: 7, y: 6),
to: BoardLocation(x: 7, y: 5))
} catch {
XCTFail()
XCTFail("Expected to be able to move piece")
return
}
Example/Tests/OpeningsTests.swift
+4 -5
View File
@@ -30,7 +30,7 @@ class OpeningsTests: XCTestCase {
print("Testing \(opening)")
var board = Board(state: .newGame)
for (source, target) in opening.moveLocations(){
for (source, target) in opening.moveLocations() {
// Assert that the piece exists
guard let piece = board.getPiece(at: source) else {
@@ -39,10 +39,9 @@ class OpeningsTests: XCTestCase {
}
// Assert the piece can move
if piece.movement.canPieceMove(fromLocation: source, toLocation: target, board: board) {
board.movePiece(fromLocation: source, toLocation: target)
}
else{
if piece.movement.canPieceMove(from: source, to: target, board: board) {
board.movePiece(from: source, to: target)
} else {
XCTFail("Cannot move piece from \(source) to \(target)")
}
}
Example/Tests/PerformanceTests.swift
+34 -42
View File
@@ -10,13 +10,6 @@ import XCTest
@testable import SwiftChess
class PerformanceTests: XCTestCase {
override func setUp() {
super.setUp()
}
override func tearDown() {
// Put teardown code here. This method is called after the invocation of each test method in the class.
@@ -29,7 +22,7 @@ class PerformanceTests: XCTestCase {
let pawnLocation = BoardLocation(x: 0, y: 1)
guard let pawn = board.getPiece(at: pawnLocation) else {
XCTFail()
XCTFail("Expected to be able to get piece")
return
}
@@ -37,10 +30,10 @@ class PerformanceTests: XCTestCase {
self.measure {
BoardLocation.all.forEach{
pawn.movement.canPieceMove(fromLocation: pawnLocation,
toLocation: $0,
board: board)
BoardLocation.all.forEach {
_ = pawn.movement.canPieceMove(from: pawnLocation,
to: $0,
board: board)
}
}
}
@@ -60,7 +53,7 @@ class PerformanceTests: XCTestCase {
let board = asciiBoard.board
guard let queen = board.getPiece(at: queenLocation) else {
XCTFail()
XCTFail("Expected to be able to get piece")
return
}
@@ -68,10 +61,10 @@ class PerformanceTests: XCTestCase {
self.measure {
BoardLocation.all.forEach{
queen.movement.canPieceMove(fromLocation: queenLocation,
toLocation: $0,
board: board)
BoardLocation.all.forEach {
_ = queen.movement.canPieceMove(from: queenLocation,
to: $0,
board: board)
}
}
}
@@ -91,7 +84,7 @@ class PerformanceTests: XCTestCase {
let board = asciiBoard.board
guard let king = board.getPiece(at: kingLocation) else {
XCTFail()
XCTFail("Expected to be able tp get piece")
return
}
@@ -99,10 +92,10 @@ class PerformanceTests: XCTestCase {
self.measure {
BoardLocation.all.forEach{
king.movement.canPieceMove(fromLocation: kingLocation,
toLocation: $0,
board: board)
BoardLocation.all.forEach {
_ = king.movement.canPieceMove(from: kingLocation,
to: $0,
board: board)
}
}
}
@@ -122,7 +115,7 @@ class PerformanceTests: XCTestCase {
let board = asciiBoard.board
guard let knight = board.getPiece(at: knightLocation) else {
XCTFail()
XCTFail("Exected to be able to get piece")
return
}
@@ -130,10 +123,10 @@ class PerformanceTests: XCTestCase {
self.measure {
BoardLocation.all.forEach{
knight.movement.canPieceMove(fromLocation: knightLocation,
toLocation: $0,
board: board)
BoardLocation.all.forEach {
_ = knight.movement.canPieceMove(from: knightLocation,
to: $0,
board: board)
}
}
}
@@ -153,7 +146,7 @@ class PerformanceTests: XCTestCase {
let board = asciiBoard.board
guard let bishop = board.getPiece(at: bishopLocation) else {
XCTFail()
XCTFail("Expected to be able to get piece")
return
}
@@ -161,10 +154,10 @@ class PerformanceTests: XCTestCase {
self.measure {
BoardLocation.all.forEach{
bishop.movement.canPieceMove(fromLocation: bishopLocation,
toLocation: $0,
board: board)
BoardLocation.all.forEach {
_ = bishop.movement.canPieceMove(from: bishopLocation,
to: $0,
board: board)
}
}
}
@@ -184,7 +177,7 @@ class PerformanceTests: XCTestCase {
let board = asciiBoard.board
guard let rook = board.getPiece(at: rookLocation) else {
XCTFail()
XCTFail("Expected to be able to get piece")
return
}
@@ -192,10 +185,10 @@ class PerformanceTests: XCTestCase {
self.measure {
BoardLocation.all.forEach{
rook.movement.canPieceMove(fromLocation: rookLocation,
toLocation: $0,
board: board)
BoardLocation.all.forEach {
_ = rook.movement.canPieceMove(from: rookLocation,
to: $0,
board: board)
}
}
}
@@ -211,16 +204,15 @@ class PerformanceTests: XCTestCase {
"P P P - - P P -" +
"R - B Q G B K R" )
let board = asciiBoard.board;
let board = asciiBoard.board
self.measure {
BoardLocation.all.forEach{
board.canColorMoveAnyPieceToLocation(color: .white, location: $0)
board.canColorMoveAnyPieceToLocation(color: .black, location: $0)
BoardLocation.all.forEach {
_ = board.canColorMoveAnyPieceToLocation(color: .white, location: $0)
_ = board.canColorMoveAnyPieceToLocation(color: .black, location: $0)
}
}
}
}
Example/Tests/PieceMovementTests.swift
+851 -821
View File
File diff suppressed because it is too large Load Diff
Example/Tests/PieceTests.swift
+1 -1
View File
@@ -30,7 +30,7 @@ class PieceTests: XCTestCase {
for square in board.squares {
guard let piece = square.piece else {
continue;
continue
}
XCTAssertFalse(foundTags.contains(piece.tag), "Expected all pieces to have unique tags")
Example/Tests/PlayerTests.swift
+97 -58
View File
@@ -33,26 +33,35 @@ class PlayerTests: XCTestCase {
func testOccupliesSquareAtLocationReturnsTrueWhenOccupiedByPlayerPiece() {
let location = BoardLocation(index: 0) // <-- should be occupied by white
XCTAssert(game.whitePlayer.occupiesSquareAt(location: location), "Expected square to be occupied by player color")
XCTAssert(game.whitePlayer.occupiesSquare(at: location),
"Expected square to be occupied by player color")
}
func testOccupliesSquareAtLocationReturnsFalseWhenSquareEmpty() {
let location = BoardLocation(x: 0, y: 2) // <-- should be empty
XCTAssert(game.whitePlayer.occupiesSquareAt(location: location) == false, "Expected square to not be occupied by player color")
XCTAssert(game.whitePlayer.occupiesSquare(at: location) == false,
"Expected square to not be occupied by player color")
}
func testOccupliesSquareAtLocationReturnsFalseWhenOccupiedByOppositeColor() {
let location = BoardLocation(x: 0, y: 7) // <-- should be occupied by black
XCTAssert(game.whitePlayer.occupiesSquareAt(location: location) == false, "Expected square to not be occupied by player color")
XCTAssert(game.whitePlayer.occupiesSquare(at: location) == false,
"Expected square to not be occupied by player color")
}
// Piece move tests
func testPlayerCannotMovePieceToSameLocation() {
let location = BoardLocation(index: 0)
XCTAssert(game.whitePlayer.canMovePiece(fromLocation: location, toLocation: location) == false)
do {
let canMove = try game.whitePlayer.canMovePiece(from: location, to: location)
XCTAssertNil(canMove)
} catch let error {
XCTAssert(error as! Player.MoveError == .movingToSameLocation)
}
}
// MARK: - Move Errors
@@ -69,14 +78,14 @@ class PlayerTests: XCTestCase {
func testMoveInToCheckErrorIsThrownByMovingQueen() {
let board = ASCIIBoard(pieces: "- - - - * - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"G - - - Q - - r" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - * - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"G - - - Q - - r" +
"- - - - - - - -" )
let queenLocation = board.locationOfCharacter("Q")
let targetLocation = board.locationOfCharacter("*")
@@ -88,19 +97,24 @@ class PlayerTests: XCTestCase {
}
// Assert that the correct error is thrown
XCTAssertTrue(player.canMovePieceWithError(fromLocation: queenLocation, toLocation: targetLocation).error == .cannotMoveInToCheck)
do {
let canMove = try player.canMovePiece(from: queenLocation, to: targetLocation)
XCTAssertNil(canMove)
} catch let error {
XCTAssert(error as! Player.MoveError == .cannotMoveInToCheck)
}
}
func testMoveInToCheckErrorIsThrownByMovingPawn() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - * - - -" +
"G - - - P - - r" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - * - - -" +
"G - - - P - - r" +
"- - - - - - - -" )
let pieceLocation = board.locationOfCharacter("P")
let targetLocation = board.locationOfCharacter("*")
@@ -112,19 +126,24 @@ class PlayerTests: XCTestCase {
}
// Assert that the correct error is thrown
XCTAssertTrue(player.canMovePieceWithError(fromLocation: pieceLocation, toLocation: targetLocation).error == .cannotMoveInToCheck)
do {
let canMove = try player.canMovePiece(from: pieceLocation, to: targetLocation)
XCTAssertNil(canMove)
} catch let error {
XCTAssert(error as! Player.MoveError == .cannotMoveInToCheck)
}
}
func testMoveInToCheckErrorIsThrownByMovingKnight() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - * - - - -" +
"- - - - - - - -" +
"G - - - K - - r" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - * - - - -" +
"- - - - - - - -" +
"G - - - K - - r" +
"- - - - - - - -" )
let pieceLocation = board.locationOfCharacter("K")
let targetLocation = board.locationOfCharacter("*")
@@ -136,19 +155,24 @@ class PlayerTests: XCTestCase {
}
// Assert that the correct error is thrown
XCTAssertTrue(player.canMovePieceWithError(fromLocation: pieceLocation, toLocation: targetLocation).error == .cannotMoveInToCheck)
do {
let canMove = try player.canMovePiece(from: pieceLocation, to: targetLocation)
XCTAssertNil(canMove)
} catch let error {
XCTAssert(error as! Player.MoveError == .cannotMoveInToCheck)
}
}
func testMoveInToCheckErrorIsThrownByMovingBishop() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - * - - - - -" +
"- - - - - - - -" +
"G - - - B - - r" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - * - - - - -" +
"- - - - - - - -" +
"G - - - B - - r" +
"- - - - - - - -" )
let pieceLocation = board.locationOfCharacter("B")
let targetLocation = board.locationOfCharacter("*")
@@ -160,19 +184,24 @@ class PlayerTests: XCTestCase {
}
// Assert that the correct error is thrown
XCTAssertTrue(player.canMovePieceWithError(fromLocation: pieceLocation, toLocation: targetLocation).error == .cannotMoveInToCheck)
do {
let canMove = try player.canMovePiece(from: pieceLocation, to: targetLocation)
XCTAssertNil(canMove)
} catch let error {
XCTAssert(error as! Player.MoveError == .cannotMoveInToCheck)
}
}
func testMoveInToCheckErrorIsThrownByMovingRook() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - * - - -" +
"- - - - - - - -" +
"G - - - R - - r" +
"- - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - * - - -" +
"- - - - - - - -" +
"G - - - R - - r" +
"- - - - - - - -" )
let pieceLocation = board.locationOfCharacter("R")
let targetLocation = board.locationOfCharacter("*")
@@ -184,19 +213,24 @@ class PlayerTests: XCTestCase {
}
// Assert that the correct error is thrown
XCTAssertTrue(player.canMovePieceWithError(fromLocation: pieceLocation, toLocation: targetLocation).error == .cannotMoveInToCheck)
do {
let canMove = try player.canMovePiece(from: pieceLocation, to: targetLocation)
XCTAssertNil(canMove)
} catch let error {
XCTAssert(error as! Player.MoveError == .cannotMoveInToCheck)
}
}
func testMoveInToCheckErrorIsThrownByMovingKing() {
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"* - - - - - - r" +
"G - - - - - - -" )
let board = ASCIIBoard(pieces: "- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"- - - - - - - -" +
"* - - - - - - r" +
"G - - - - - - -" )
let pieceLocation = board.locationOfCharacter("G")
let targetLocation = board.locationOfCharacter("*")
@@ -208,7 +242,12 @@ class PlayerTests: XCTestCase {
}
// Assert that the correct error is thrown
XCTAssertTrue(player.canMovePieceWithError(fromLocation: pieceLocation, toLocation: targetLocation).error == .cannotMoveInToCheck)
do {
let canMove = try player.canMovePiece(from: pieceLocation, to: targetLocation)
XCTAssertNil(canMove)
} catch let error {
XCTAssert(error as! Player.MoveError == .cannotMoveInToCheck)
}
}
}
Example/Tests/Tests.swift
-7
View File
@@ -19,11 +19,4 @@ class Tests: XCTestCase {
XCTAssert(true, "Pass")
}
func testPerformanceExample() {
// This is an example of a performance test case.
self.measure() {
// Put the code you want to measure the time of here.
}
}
}
README.md
+3 -3
View File
@@ -46,12 +46,12 @@ let game = Game(firstPlayer: whitePlayer, secondPlayer: blackPlayer)
```
if let player = game.currentPlayer as? Human {
let currentLocation = BoardLocation(x: 4, y: 1)
let newLocation = BoardLocation(x: 4, y: 2)
try! player.movePiece(fromLocation: currentLocation,
toLocation: newLocation)
try! player.movePiece(from: currentLocation,
to: newLocation)
}
```
SwiftChess.podspec
+2 -2
View File
@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = 'SwiftChess'
s.version = '0.1.1'
s.version = '0.3.0'
s.summary = 'Chess engine written in Swift'
# This description is used to generate tags and improve search results.
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
# * Finally, don't worry about the indent, CocoaPods strips it!
s.description = <<-DESC
Chess engine written in Swift
Chess engine written in Swift, support player vs player, and player vs AI games.
DESC
s.homepage = 'https://github.com/SteveBarnegren/SwiftChess'
SwiftChess/.swiftlint.yml
+7
View File
@@ -0,0 +1,7 @@
disabled_rules:
- trailing_whitespace
- cyclomatic_complexity
- nesting
- type_name
- force_cast
- identifier_name
SwiftChess/Source/AIPlayer.swift
+44 -57
View File
@@ -6,16 +6,16 @@
//
//
// swiftlint:disable for_where
import Foundation
open class AIPlayer : Player {
open class AIPlayer: Player {
let boardRaters: [BoardRater]!
public var configuration: AIConfiguration!
public let configuration: AIConfiguration!
var openingMoves = [OpeningMove]()
public init(color: Color, configuration: AIConfiguration){
public init(color: Color, configuration: AIConfiguration) {
self.configuration = configuration
@@ -31,7 +31,7 @@ open class AIPlayer : Player {
BoardRaterCenterFourOccupation(configuration: configuration)
]
openingMoves = Opening.allOpeningMoves(forColor: color)
openingMoves = Opening.allOpeningMoves(for: color)
super.init()
self.color = color
@@ -58,13 +58,13 @@ open class AIPlayer : Player {
var move: Move!
// Get an opening move
if let openingMove = openingMoveForBoard(board){
if let openingMove = openingMove(for: board) {
//print("Playing opening move")
move = openingMove
}
// Or, get the Highest rated move
else{
move = highestRatedMoveOnBoard(board)
else {
move = highestRatedMove(on: board)
}
// Make move
@@ -72,52 +72,49 @@ open class AIPlayer : Player {
switch move.type {
case .singlePiece(let sourceLocation, let targetLocation):
operations = game.board.movePiece(fromLocation: sourceLocation, toLocation: targetLocation)
//print("Chose move (\(sourceLocation.x),\(sourceLocation.y)) -> (\(targetLocation.x),\(targetLocation.y))");
operations = game.board.movePiece(from: sourceLocation, to: targetLocation)
case .castle(let color, let side):
operations = game.board.performCastle(color: color, side: side)
//print("Chose Castling move");
}
// Promote pawns
let pawnsToPromoteLocations = game.board.getLocationsOfPromotablePawns(color: color)
assert(pawnsToPromoteLocations.count < 2, "There should only ever be one pawn to promote at any time")
if pawnsToPromoteLocations.count > 0 {
game.board = promotePawnsOnBoard(game.board)
game.board = promotePawns(on: game.board)
let location = pawnsToPromoteLocations.first!
let transformOperation = BoardOperation(type: .transformPiece, piece: game.board.getPiece(at: location)!, location: location)
let transformOperation = BoardOperation(type: .transformPiece,
piece: game.board.getPiece(at: location)!,
location: location)
operations.append(transformOperation)
}
let strongGame = self.game!
DispatchQueue.main.async {
strongGame.playerDidMakeMove(player: self, boardOperations: operations)
}
}
func openingMoveForBoard(_ board: Board) -> Move? {
func openingMove(for board: Board) -> Move? {
let possibleMoves = openingMoves.filter{
let possibleMoves = openingMoves.filter {
$0.board == board
}
//print("Num opening moves`; \(possibleMoves.count)")
guard possibleMoves.count > 0 else{
guard possibleMoves.count > 0 else {
return nil
}
let index = Int(arc4random_uniform(UInt32(possibleMoves.count)))
let openingMove = possibleMoves[index]
return Move(type: .singlePiece(sourceLocation: openingMove.fromLocation,
targetLocation: openingMove.toLocation),
return Move(type: .singlePiece(from: openingMove.fromLocation,
to: openingMove.toLocation),
rating: 0)
}
func highestRatedMoveOnBoard(_ board: Board) -> Move {
func highestRatedMove(on board: Board) -> Move {
var possibleMoves = [Move]()
@@ -133,30 +130,30 @@ open class AIPlayer : Player {
for targetLocation in BoardLocation.all {
guard canAIMovePiece(fromLocation: sourceLocation, toLocation: targetLocation) else {
guard canAIMovePiece(from: sourceLocation, to: targetLocation) else {
continue
}
// Make move
var resultBoard = board
resultBoard.movePiece(fromLocation: sourceLocation, toLocation: targetLocation)
resultBoard.movePiece(from: sourceLocation, to: targetLocation)
// Promote pawns
let pawnsToPromoteLocations = resultBoard.getLocationsOfPromotablePawns(color: color)
assert(pawnsToPromoteLocations.count < 2, "There should only ever be one pawn to promote at any time")
if pawnsToPromoteLocations.count > 0 {
resultBoard = promotePawnsOnBoard(resultBoard)
resultBoard = promotePawns(on: resultBoard)
}
// Rate
var rating = ratingForBoard(resultBoard)
// reduce rating if suicide
if resultBoard.canColorMoveAnyPieceToLocation(color: color.opposite(), location: targetLocation) {
rating -= (abs(rating) * configuration.suicideMultipler.value);
if resultBoard.canColorMoveAnyPieceToLocation(color: color.opposite, location: targetLocation) {
rating -= (abs(rating) * configuration.suicideMultipler.value)
}
let move = Move(type: .singlePiece(sourceLocation: sourceLocation, targetLocation: targetLocation),
let move = Move(type: .singlePiece(from: sourceLocation, to: targetLocation),
rating: rating)
possibleMoves.append(move)
// print("Rating: \(rating)")
@@ -185,7 +182,7 @@ open class AIPlayer : Player {
// If there are no possible moves, we must be in stale mate
if possibleMoves.count == 0 {
print("There are no possible moves!!!!");
print("There are no possible moves!!!!")
}
// Choose move with highest rating
@@ -196,35 +193,33 @@ open class AIPlayer : Player {
if move.rating > highestRating {
highestRating = move.rating
highestRatedMove = move;
highestRatedMove = move
}
//print("rating: \(move.rating)")
}
return highestRatedMove;
return highestRatedMove
}
func canAIMovePiece(fromLocation: BoardLocation, toLocation: BoardLocation) -> Bool {
func canAIMovePiece(from fromLocation: BoardLocation, to toLocation: BoardLocation) -> Bool {
// This is a stricter version of the canMove function, used by the AI, that returns false for errors
let canMove = canMovePieceWithError(fromLocation: fromLocation, toLocation: toLocation)
if canMove.error != nil {
do {
return try canMovePiece(from: fromLocation, to: toLocation)
} catch {
return false
}
return canMove.result
}
func ratingForBoard(_ board: Board) -> Double {
var rating: Double = 0;
var rating: Double = 0
for boardRater in boardRaters {
let result = boardRater.ratingfor(board: board, color: color)
let result = boardRater.ratingFor(board: board, color: color)
//let className = "\(boardRater)"
//print("\t\(className): \(result)")
@@ -232,15 +227,14 @@ open class AIPlayer : Player {
}
// If opponent is in check mate, set the maximum rating
if board.isColorInCheckMate(color: color.opposite()) {
if board.isColorInCheckMate(color: color.opposite) {
rating = Double.greatestFiniteMagnitude
}
return rating
}
func promotePawnsOnBoard(_ board: Board) -> Board {
func promotePawns(on board: Board) -> Board {
let pawnsToPromoteLocations = board.getLocationsOfPromotablePawns(color: color)
@@ -252,21 +246,19 @@ open class AIPlayer : Player {
let location = pawnsToPromoteLocations.first!
guard let piece = board.getPiece(at: location) else {
guard board.getPiece(at: location) != nil else {
return board
}
// Get the ratings
var bestType = Piece.PieceType.possiblePawnPromotionResultingTypes().first
var bestRating = -Double.greatestFiniteMagnitude
var highestRating = -Double.greatestFiniteMagnitude
var promotedBoard: Board!
for pieceType in Piece.PieceType.possiblePawnPromotionResultingTypes() {
var newBoard = board
guard let piece = newBoard.getPiece(at: location) else {
guard newBoard.getPiece(at: location) != nil else {
return board
}
@@ -275,9 +267,8 @@ open class AIPlayer : Player {
let rating = ratingForBoard(newBoard)
if rating > bestRating {
bestRating = rating
bestType = pieceType
if rating > highestRating {
highestRating = rating
promotedBoard = newBoard
}
@@ -290,7 +281,7 @@ open class AIPlayer : Player {
struct Move {
enum MoveType {
case singlePiece(sourceLocation: BoardLocation, targetLocation: BoardLocation)
case singlePiece(from: BoardLocation, to: BoardLocation)
case castle(color: Color, side: CastleSide)
}
@@ -298,7 +289,7 @@ struct Move {
let rating: Double
}
// MARK - BoardRater
// MARK: - BoardRater
internal class BoardRater {
@@ -308,11 +299,7 @@ internal class BoardRater {
self.configuration = configuration
}
func ratingfor(board: Board, color: Color) -> Double{
func ratingFor(board: Board, color: Color) -> Double {
fatalError("Override ratingFor method in subclasses")
return 0
}
}
SwiftChess/Source/ASCIIBoard.swift
+30 -15
View File
@@ -7,19 +7,18 @@
//
import Foundation
import SwiftChess
func transformASCIIBoardInput(_ input: String) -> String{
func transformASCIIBoardInput(_ input: String) -> String {
let boardArt = input.replacingOccurrences(of: " ", with: "")
var transformedArt = String()
for y in (0...7).reversed(){
for y in (0...7).reversed() {
for x in 0...7 {
let index = y*8 + x
transformedArt.append(boardArt[boardArt.characters.index(boardArt.startIndex, offsetBy: index)])
transformedArt.append(boardArt[boardArt.index(boardArt.startIndex, offsetBy: index)])
}
}
@@ -40,7 +39,11 @@ public struct ASCIIBoard {
artString = transformASCIIBoardInput(artString)
// Check string format
#if swift(>=3.2)
assert(artString.count == 64, "ASCII board art must be 128 characters long")
#else
assert(artString.characters.count == 64, "ASCII board art must be 128 characters long")
#endif
self.artString = artString
self.stringContainsColors = false
@@ -66,15 +69,18 @@ public struct ASCIIBoard {
var board = Board(state: .empty)
// Clear all pieces on the board
BoardLocation.all.forEach{
board.removePiece(atLocation: $0)
BoardLocation.all.forEach {
board.removePiece(at: $0)
}
// Setup pieces from ascii art
(0..<64).forEach{
(0..<64).forEach {
#if swift(>=3.2)
let character = boardArt[boardArt.index(boardArt.startIndex, offsetBy: $0)]
#else
let character = boardArt[boardArt.characters.index(boardArt.startIndex, offsetBy: $0)]
if let piece = pieceFromCharacter(character) {
#endif
if let piece = piece(from: character) {
board.setPiece(piece, at: BoardLocation(index: $0))
}
}
@@ -82,8 +88,7 @@ public struct ASCIIBoard {
return board
}
func pieceFromCharacter(_ character: Character) -> Piece? {
func piece(from character: Character) -> Piece? {
var piece: Piece?
@@ -119,13 +124,19 @@ public struct ASCIIBoard {
return piece
}
public func indexOfCharacter(_ character: Character) -> Int{
public func indexOfCharacter(_ character: Character) -> Int {
var index: Int?
#if swift(>=3.2)
if let idx = artString.index(of: character) {
index = artString.distance(from: artString.startIndex, to: idx)
}
#else
if let idx = artString.characters.index(of: character) {
index = artString.characters.distance(from: artString.startIndex, to: idx)
}
#endif
assert(index != nil, "Unable to find index of character: \(character)")
return index!
@@ -137,12 +148,16 @@ public struct ASCIIBoard {
return BoardLocation(index: index)
}
public func indexesWithCharacter(_ character: Character) -> [Int]{
public func indexesWithCharacter(_ character: Character) -> [Int] {
var indexes = [Int]()
(0..<64).forEach{
(0..<64).forEach {
#if swift(>=3.2)
let aCharacter = artString[artString.index(artString.startIndex, offsetBy: $0)]
#else
let aCharacter = artString[artString.characters.index(artString.startIndex, offsetBy: $0)]
#endif
if character == aCharacter {
indexes.append($0)
}
@@ -157,7 +172,7 @@ public struct ASCIIBoard {
var locations = [BoardLocation]()
indexes.forEach{
indexes.forEach {
let location = BoardLocation(index: $0)
locations.append(location)
}
SwiftChess/Source/Board.swift
+70 -79
View File
@@ -6,6 +6,9 @@
//
//
// swiftlint:disable file_length
// swiftlint:disable type_body_length
import Foundation
public enum CastleSide {
@@ -15,29 +18,27 @@ public enum CastleSide {
// MARK: - ****** Square ******
public struct Square : Equatable {
public struct Square: Equatable {
public var piece: Piece?
}
public func ==(lhs: Square, rhs: Square) -> Bool {
public func == (lhs: Square, rhs: Square) -> Bool {
switch (lhs.piece, rhs.piece) {
case (.none, .none):
return true
case (.some, .none):
return false
case (.none, .some):
return false
case (.some(let rp), .some(let lp)):
return rp == lp
default:
return false
}
}
// MARK: - ****** Board ******
public struct Board : Equatable {
public struct Board: Equatable {
public enum InitialState {
case empty
@@ -63,38 +64,26 @@ public struct Board : Equatable {
mutating func setupForNewGame() {
func setPieceAtIndex(_ piece: Piece, _ index: Int){
setPiece(piece, at: BoardLocation(index: index))
}
let pieces: [Piece.PieceType] = [.rook, .knight, .bishop, .queen, .king, .bishop, .knight, .rook]
// Setup white bottom row
setPieceAtIndex(Piece(type: .rook, color: .white), 0)
setPieceAtIndex(Piece(type: .knight, color: .white), 1)
setPieceAtIndex(Piece(type: .bishop, color: .white), 2)
setPieceAtIndex(Piece(type: .queen, color: .white), 3)
setPieceAtIndex(Piece(type: .king, color: .white), 4)
setPieceAtIndex(Piece(type: .bishop, color: .white), 5)
setPieceAtIndex(Piece(type: .knight, color: .white), 6)
setPieceAtIndex(Piece(type: .rook, color: .white), 7)
for i in 0...7 {
setPiece(Piece(type: pieces[i], color: .white), at: BoardLocation(index: i))
}
// Setup white pawn row
for i in 8...15 {
setPieceAtIndex(Piece(type: .pawn, color: .white), i)
setPiece(Piece(type: .pawn, color: .white), at: BoardLocation(index: i))
}
// Setup black bottom row
setPieceAtIndex(Piece(type: .rook, color: .black), 63)
setPieceAtIndex(Piece(type: .knight, color: .black), 62)
setPieceAtIndex(Piece(type: .bishop, color: .black), 61)
setPieceAtIndex(Piece(type: .king, color: .black), 60)
setPieceAtIndex(Piece(type: .queen, color: .black), 59)
setPieceAtIndex(Piece(type: .bishop, color: .black), 58)
setPieceAtIndex(Piece(type: .knight, color: .black), 57)
setPieceAtIndex(Piece(type: .rook, color: .black), 56)
for i in 56...63 {
setPiece(Piece(type: pieces[i-56], color: .black), at: BoardLocation(index: i))
}
// Setup black pawn row
for i in 48...55 {
setPieceAtIndex(Piece(type: .pawn, color: .black), i)
setPiece(Piece(type: .pawn, color: .black), at: BoardLocation(index: i))
}
}
@@ -109,11 +98,12 @@ public struct Board : Equatable {
return squares[location.index].piece
}
public mutating func removePiece(atLocation location: BoardLocation) {
public mutating func removePiece(at location: BoardLocation) {
squares[location.index].piece = nil
}
@discardableResult internal mutating func movePiece(fromLocation: BoardLocation, toLocation: BoardLocation) -> [BoardOperation] {
@discardableResult internal mutating func movePiece(from fromLocation: BoardLocation,
to toLocation: BoardLocation) -> [BoardOperation] {
if toLocation == fromLocation {
return []
@@ -134,7 +124,7 @@ public struct Board : Equatable {
}
squares[toLocation.index].piece = self.squares[fromLocation.index].piece
squares[toLocation.index].piece?.location = toLocation;
squares[toLocation.index].piece?.location = toLocation
squares[toLocation.index].piece?.hasMoved = true
squares[fromLocation.index].piece = nil
@@ -143,14 +133,14 @@ public struct Board : Equatable {
let stride = fromLocation.strideTo(location: toLocation)
let enPassentStride = BoardStride(x: stride.x, y: 0)
let enPassentLocation = fromLocation.incrementedBy(stride: enPassentStride)
let enPassentLocation = fromLocation.incremented(by: enPassentStride)
guard let enPassentPiece = getPiece(at: enPassentLocation) else {
break IF_EN_PASSANT
}
if enPassentPiece.canBeTakenByEnPassant && enPassentPiece.color == movingPiece.color.opposite() {
squares[enPassentLocation.index].piece = nil;
if enPassentPiece.canBeTakenByEnPassant && enPassentPiece.color == movingPiece.color.opposite {
squares[enPassentLocation.index].piece = nil
let operation = BoardOperation(type: .removePiece, piece: enPassentPiece, location: enPassentLocation)
operations.append(operation)
}
@@ -188,7 +178,7 @@ public struct Board : Equatable {
for square in squares {
guard let piece = square.piece else{
guard let piece = square.piece else {
continue
}
@@ -198,7 +188,8 @@ public struct Board : Equatable {
}
}
// We'll implicitly unwrap this, because there should always be a king for each color on the board. If there isn't, it's an error
// We'll implicitly unwrap this, because there should always be a king for each color on the board.
// If there isn't, it's an error
return king!
}
@@ -206,7 +197,7 @@ public struct Board : Equatable {
for (index, square) in squares.enumerated() {
guard let piece = square.piece else{
guard let piece = square.piece else {
continue
}
@@ -218,7 +209,7 @@ public struct Board : Equatable {
fatalError("Couldn't find \(color) king. Kings should always exist")
}
public func getLocationsOfColor(_ color: Color) -> [BoardLocation] {
public func getLocations(of color: Color) -> [BoardLocation] {
var locations = [BoardLocation]()
@@ -242,7 +233,7 @@ public struct Board : Equatable {
for square in squares {
guard let piece = square.piece else{
guard let piece = square.piece else {
continue
}
@@ -301,7 +292,7 @@ public struct Board : Equatable {
}
// Work out if we're in check
let oppositionLocations = getLocationsOfColor( color.opposite() )
let oppositionLocations = getLocations(of: color.opposite)
// Pieces will not move to take the king, so change it for a pawn of the same color
var noKingBoard = self
@@ -313,7 +304,7 @@ public struct Board : Equatable {
continue
}
if piece.movement.canPieceMove(fromLocation: location, toLocation: kingLocation!, board: noKingBoard) {
if piece.movement.canPieceMove(from: location, to: kingLocation!, board: noKingBoard) {
return true
}
}
@@ -327,7 +318,7 @@ public struct Board : Equatable {
return false
}
for pieceLocation in getLocationsOfColor( color ) {
for pieceLocation in getLocations(of: color) {
guard let piece = getPiece(at: pieceLocation) else {
continue
@@ -335,13 +326,11 @@ public struct Board : Equatable {
for targetLocation in BoardLocation.all {
let canMove = piece.movement.canPieceMove(fromLocation: pieceLocation,
toLocation: targetLocation,
board: self)
let canMove = piece.movement.canPieceMove(from: pieceLocation, to: targetLocation, board: self)
if canMove {
var resultBoard = self
resultBoard.movePiece(fromLocation: pieceLocation, toLocation: targetLocation)
resultBoard.movePiece(from: pieceLocation, to: targetLocation)
if resultBoard.isColorInCheck(color: color) == false {
return false
}
@@ -356,15 +345,14 @@ public struct Board : Equatable {
if !isColorAbleToMove(color: color) && !isColorInCheckMate(color: color) {
return true
}
else{
} else {
return false
}
}
func isColorAbleToMove(color: Color) -> Bool {
for pieceLocation in getLocationsOfColor(color) {
for pieceLocation in getLocations(of: color) {
guard let piece = getPiece(at: pieceLocation) else {
continue
@@ -372,16 +360,14 @@ public struct Board : Equatable {
for targetLocation in BoardLocation.all {
let canMove = piece.movement.canPieceMove(fromLocation: pieceLocation,
toLocation: targetLocation,
board: self)
let canMove = piece.movement.canPieceMove(from: pieceLocation, to: targetLocation, board: self)
guard canMove == true else {
continue
}
var resultBoard = self
resultBoard.movePiece(fromLocation: pieceLocation, toLocation: targetLocation)
resultBoard.movePiece(from: pieceLocation, to: targetLocation)
if resultBoard.isColorInCheck(color: color) == false {
return true
}
@@ -405,7 +391,7 @@ public struct Board : Equatable {
continue
}
if piece.movement.canPieceMove(fromLocation: BoardLocation(index: index), toLocation: location, board: self) {
if piece.movement.canPieceMove(from: BoardLocation(index: index), to: location, board: self) {
return true
}
}
@@ -424,14 +410,14 @@ public struct Board : Equatable {
public func possibleMoveLocationsForPiece(atLocation location: BoardLocation) -> [BoardLocation] {
guard let piece = squares[location.index].piece else{
guard let piece = squares[location.index].piece else {
return []
}
var locations = [BoardLocation]()
BoardLocation.all.forEach{
if piece.movement.canPieceMove(fromLocation: location, toLocation: $0, board: self){
BoardLocation.all.forEach {
if piece.movement.canPieceMove(from: location, to: $0, board: self) {
locations.append($0)
}
}
@@ -441,7 +427,7 @@ public struct Board : Equatable {
// MARK: - Castling
struct CastleMove{
struct CastleMove {
let yPos: Int
let kingStartXPos: Int
let rookStartXPos: Int
@@ -524,7 +510,9 @@ public struct Board : Equatable {
}
// Check that there are no pieces between the king and the rook
for xPos in min(castleMove.kingStartXPos, castleMove.rookStartXPos)..<max(castleMove.kingStartXPos, castleMove.rookStartXPos) {
let rStart = min(castleMove.kingStartXPos, castleMove.rookStartXPos)
let rEnd = max(castleMove.kingStartXPos, castleMove.rookStartXPos)
for xPos in rStart..<rEnd {
if xPos == castleMove.kingStartXPos || xPos == castleMove.rookStartXPos {
continue
@@ -532,7 +520,7 @@ public struct Board : Equatable {
let location = BoardLocation(x: xPos, y: castleMove.yPos)
if let piece = getPiece(at: location) {
if getPiece(at: location) != nil {
return false
}
@@ -544,7 +532,9 @@ public struct Board : Equatable {
}
// Check that the king will not end up in, or move through check
for xPos in min(castleMove.kingEndXPos, castleMove.kingStartXPos)...max(castleMove.kingEndXPos, castleMove.kingStartXPos) {
let kStart = min(castleMove.kingEndXPos, castleMove.kingStartXPos)
let kEnd = max(castleMove.kingEndXPos, castleMove.kingStartXPos)
for xPos in kStart...kEnd {
if xPos == castleMove.kingStartXPos {
continue
@@ -552,7 +542,7 @@ public struct Board : Equatable {
var newBoard = self
let newLocation = BoardLocation(x: xPos, y: castleMove.yPos)
newBoard.movePiece(fromLocation: castleMove.kingStartLocation, toLocation: newLocation)
newBoard.movePiece(from: castleMove.kingStartLocation, to: newLocation)
if newBoard.isColorInCheck(color: color) {
return false
}
@@ -563,12 +553,15 @@ public struct Board : Equatable {
@discardableResult internal mutating func performCastle(color: Color, side: CastleSide) -> [BoardOperation] {
assert(canColorCastle(color: color, side: side) == true, "\(color) is unable to castle on side \(side). Call canColorCastle(color: side:) first")
assert(canColorCastle(color: color, side: side) == true,
"\(color) is unable to castle on side \(side). Call canColorCastle(color: side:) first")
let castleMove = CastleMove(color: color, side: side)
let moveKingOperations = self.movePiece(fromLocation: castleMove.kingStartLocation, toLocation: castleMove.kingEndLocation)
let moveRookOperations = self.movePiece(fromLocation: castleMove.rookStartLocation, toLocation: castleMove.rookEndLocation)
let moveKingOperations = self.movePiece(from: castleMove.kingStartLocation,
to: castleMove.kingEndLocation)
let moveRookOperations = self.movePiece(from: castleMove.rookStartLocation,
to: castleMove.rookEndLocation)
return moveKingOperations + moveRookOperations
}
@@ -578,10 +571,10 @@ public struct Board : Equatable {
public func printBoardColors() {
printBoard { (square: Square) -> Character? in
if let piece = square.piece{
if let piece = square.piece {
return piece.color == .white ? "W" : "B"
}
return nil;
return nil
}
}
@@ -590,9 +583,9 @@ public struct Board : Equatable {
var character: Character?
if let piece = square.piece{
if let piece = square.piece {
switch (piece.type){
switch piece.type {
case .rook:
character = "R"
case .knight:
@@ -608,7 +601,7 @@ public struct Board : Equatable {
}
}
return character;
return character
}
}
@@ -617,9 +610,9 @@ public struct Board : Equatable {
var character: Character?
if let piece = square.piece{
if let piece = square.piece {
switch (piece.type){
switch piece.type {
case .rook:
character = piece.color == .white ? "R" : "r"
case .knight:
@@ -635,17 +628,15 @@ public struct Board : Equatable {
}
}
return character;
return character
}
}
func printBoard( _ squarePrinter: (Square) -> Character? ){
func printBoard( _ squarePrinter: (Square) -> Character? ) {
var printString = String()
for y in (0...7).reversed(){
for y in (0...7).reversed() {
for x in 0...7 {
let index = y*8 + x
@@ -660,6 +651,6 @@ public struct Board : Equatable {
}
}
public func ==(lhs: Board, rhs: Board) -> Bool {
public func == (lhs: Board, rhs: Board) -> Bool {
return lhs.squares == rhs.squares
}
SwiftChess/Source/BoardLocation.swift
+25 -24
View File
@@ -8,17 +8,17 @@
import Foundation
public struct BoardLocation : Equatable {
public struct BoardLocation: Equatable {
public enum GridPosition : Int{
case a1; case b1; case c1; case d1; case e1; case f1; case g1; case h1;
case a2; case b2; case c2; case d2; case e2; case f2; case g2; case h2;
case a3; case b3; case c3; case d3; case e3; case f3; case g3; case h3;
case a4; case b4; case c4; case d4; case e4; case f4; case g4; case h4;
case a5; case b5; case c5; case d5; case e5; case f5; case g5; case h5;
case a6; case b6; case c6; case d6; case e6; case f6; case g6; case h6;
case a7; case b7; case c7; case d7; case e7; case f7; case g7; case h7;
case a8; case b8; case c8; case d8; case e8; case f8; case g8; case h8;
public enum GridPosition: Int {
case a1; case b1; case c1; case d1; case e1; case f1; case g1; case h1
case a2; case b2; case c2; case d2; case e2; case f2; case g2; case h2
case a3; case b3; case c3; case d3; case e3; case f3; case g3; case h3
case a4; case b4; case c4; case d4; case e4; case f4; case g4; case h4
case a5; case b5; case c5; case d5; case e5; case f5; case g5; case h5
case a6; case b6; case c6; case d6; case e6; case f6; case g6; case h6
case a7; case b7; case c7; case d7; case e7; case f7; case g7; case h7
case a8; case b8; case c8; case d8; case e8; case f8; case g8; case h8
}
public var index: Int
@@ -28,11 +28,10 @@ public struct BoardLocation : Equatable {
if let all = allLocationsBacking {
return all
}
else{
} else {
var locations = [BoardLocation]()
(0..<64).forEach{
(0..<64).forEach {
locations.append(BoardLocation(index: $0))
}
@@ -65,7 +64,7 @@ public struct BoardLocation : Equatable {
self.index = x + (y*8)
}
public init(gridPosition: GridPosition){
public init(gridPosition: GridPosition) {
self.index = gridPosition.rawValue
}
@@ -81,36 +80,38 @@ public struct BoardLocation : Equatable {
return self + BoardLocation(x: x, y: y)
}
func incrementedBy(stride: BoardStride) -> BoardLocation {
func incremented(by stride: BoardStride) -> BoardLocation {
// TODO: for performance, we should probably only check this if we're in debug mode
if !canIncrementBy(stride: stride) {
// TODO: Only call this in debug mode to increace performance!
if !canIncrement(by: stride) {
// swiftlint:disable line_length
print("WARNING! BoardLocation is being incremented by a stride that will result in wrapping! call canIncrementBy(stride: BoardStride) first")
// swiftlint:enable line_length
}
return BoardLocation(x: x + stride.x,
y: y + stride.y)
}
func canIncrementBy(stride: BoardStride) -> Bool {
func canIncrement(by stride: BoardStride) -> Bool {
// Check will not wrap to right
if x + stride.x > 7 {
if x + stride.x > 7 {
return false
}
// Check will not wrap to left
if x + stride.x < 0 {
if x + stride.x < 0 {
return false
}
// Check will not wrap top
if y + stride.y > 7 {
if y + stride.y > 7 {
return false
}
// Check will not wrap bottom
if y + stride.y < 0 {
if y + stride.y < 0 {
return false
}
@@ -130,10 +131,10 @@ public struct BoardLocation : Equatable {
}
}
public func ==(lhs: BoardLocation, rhs: BoardLocation) -> Bool {
public func == (lhs: BoardLocation, rhs: BoardLocation) -> Bool {
return lhs.index == rhs.index
}
public func +(left: BoardLocation, right: BoardLocation) -> BoardLocation {
public func + (left: BoardLocation, right: BoardLocation) -> BoardLocation {
return BoardLocation(index: left.index + right.index)
}
SwiftChess/Source/BoardRaterBoardDominance.swift
+8 -8
View File
@@ -8,30 +8,30 @@
import Foundation
class BoardRaterBoardDominance : BoardRater {
class BoardRaterBoardDominance: BoardRater {
override func ratingfor(board: Board, color: Color) -> Double {
override func ratingFor(board: Board, color: Color) -> Double {
let squareValue = Double(1);
let squareValue = Double(1)
var rating = Double(0)
// Check this color pieces
for sourcelocation in BoardLocation.all {
guard let piece = board.getPiece(at: sourcelocation) else{
continue;
guard let piece = board.getPiece(at: sourcelocation) else {
continue
}
for targetLocation in BoardLocation.all {
if piece.movement.canPieceMove(fromLocation: sourcelocation, toLocation: targetLocation, board: board) {
rating += (piece.color == color) ? squareValue : -squareValue;
if piece.movement.canPieceMove(from: sourcelocation, to: targetLocation, board: board) {
rating += (piece.color == color) ? squareValue : -squareValue
}
}
}
return rating * configuration.boardRaterBoardDominanceWeighting.value;
return rating * configuration.boardRaterBoardDominanceWeighting.value
}
}
SwiftChess/Source/BoardRaterCenterDominance.swift
+8 -5
View File
@@ -12,9 +12,9 @@ import Foundation
Rates the board according to which player's pieces are able to move to the squares at the center of the board
*/
class BoardRaterCenterDominance : BoardRater {
class BoardRaterCenterDominance: BoardRater {
override func ratingfor(board: Board, color: Color) -> Double {
override func ratingFor(board: Board, color: Color) -> Double {
var rating = Double(0)
@@ -26,7 +26,11 @@ class BoardRaterCenterDominance : BoardRater {
for targetLocation in BoardLocation.all {
if sourceLocation == targetLocation || piece.movement.canPieceMove(fromLocation: sourceLocation, toLocation: targetLocation, board: board) {
if sourceLocation == targetLocation ||
piece.movement.canPieceMove(from: sourceLocation,
to: targetLocation,
board: board) {
let value = dominanceValueFor(location: targetLocation)
rating += (piece.color == color) ? value : -value
}
@@ -39,7 +43,7 @@ class BoardRaterCenterDominance : BoardRater {
func dominanceValueFor(location: BoardLocation) -> Double {
let axisMiddle = 3.5;
let axisMiddle = 3.5
let x = Double(location.x)
let y = Double(location.y)
@@ -51,5 +55,4 @@ class BoardRaterCenterDominance : BoardRater {
return axisMiddle - distance
}
}
SwiftChess/Source/BoardRaterCenterFourOccupation.swift
+3 -4
View File
@@ -10,17 +10,16 @@ import Foundation
class BoardRaterCenterFourOccupation: BoardRater {
override func ratingfor(board: Board, color: Color) -> Double {
override func ratingFor(board: Board, color: Color) -> Double {
let value = Double(1);
let value = Double(1)
var rating = Double(0)
BoardLocation(x: 3, y: 3)
let locations = [
BoardLocation(x: 4, y: 4), // NE
BoardLocation(x: 4, y: 3), // SE
BoardLocation(x: 3, y: 3), // SW
BoardLocation(x: 3, y: 4), // NW
BoardLocation(x: 3, y: 4) // NW
]
for location in locations {
SwiftChess/Source/BoardRaterCenterOwnership.swift
+3 -3
View File
@@ -12,9 +12,9 @@ import Foundation
Rates the board according to which player's pieces are occupying the center of the board
*/
class BoardRaterCenterOwnership : BoardRater {
class BoardRaterCenterOwnership: BoardRater {
override func ratingfor(board: Board, color: Color) -> Double {
override func ratingFor(board: Board, color: Color) -> Double {
var rating = Double(0)
@@ -35,7 +35,7 @@ class BoardRaterCenterOwnership : BoardRater {
func dominanceValueFor(location: BoardLocation) -> Double {
let axisMiddle = 3.5;
let axisMiddle = 3.5
let x = Double(location.x)
let y = Double(location.y)
SwiftChess/Source/BoardRaterCheckMateOpportunity.swift
+7 -8
View File
@@ -14,16 +14,16 @@ import Foundation
Iterates over all possible moves, makes them, and checks if the resulting state is check mate
*/
class BoardRaterCheckMateOpportunity : BoardRater {
class BoardRaterCheckMateOpportunity: BoardRater {
override func ratingfor(board: Board, color: Color) -> Double {
override func ratingFor(board: Board, color: Color) -> Double {
let value = Double(1)
var rating = Double(0)
for (index, square) in board.squares.enumerated() {
guard let piece = square.piece else{
guard let piece = square.piece else {
continue
}
@@ -31,15 +31,14 @@ class BoardRaterCheckMateOpportunity : BoardRater {
let sourceLocation = BoardLocation(index: index)
if piece.movement.canPieceMove(fromLocation: sourceLocation, toLocation: location, board: board) {
if piece.movement.canPieceMove(from: sourceLocation, to: location, board: board) {
var movedBoard = board
movedBoard.movePiece(fromLocation: sourceLocation, toLocation: location)
movedBoard.movePiece(from: sourceLocation, to: location)
if piece.color == color && movedBoard.isColorInCheckMate(color: color.opposite()){
if piece.color == color && movedBoard.isColorInCheckMate(color: color.opposite) {
rating += value
}
else if piece.color == color.opposite() && movedBoard.isColorInCheckMate(color: color){
} else if piece.color == color.opposite && movedBoard.isColorInCheckMate(color: color) {
rating -= value
}
}
SwiftChess/Source/BoardRaterCountPieces.swift
+4 -4
View File
@@ -8,11 +8,11 @@
import Foundation
class BoardRaterCountPieces : BoardRater {
class BoardRaterCountPieces: BoardRater {
override func ratingfor(board: Board, color: Color) -> Double {
override func ratingFor(board: Board, color: Color) -> Double {
var rating : Double = 0
var rating: Double = 0
for square in board.squares {
@@ -20,7 +20,7 @@ class BoardRaterCountPieces : BoardRater {
continue
}
rating += piece.color == color ? piece.value() : -piece.value()
rating += piece.color == color ? piece.value : -piece.value
}
return rating * configuration.boardRaterCountPiecesWeighting.value
SwiftChess/Source/BoardRaterKingSurroundingPossession.swift
+20 -24
View File
@@ -8,20 +8,20 @@
import Foundation
class BoardRaterKingSurroundingPossession : BoardRater {
class BoardRaterKingSurroundingPossession: BoardRater {
override func ratingfor(board: Board, color: Color) -> Double {
override func ratingFor(board: Board, color: Color) -> Double {
let squareValue = Double(1)
var rating = Double(0)
let ownKingLocations = locationsSurroundingKing(color: color, board: board)
let opponentKingLocations = locationsSurroundingKing(color: color.opposite(), board: board)
let opponentKingLocations = locationsSurroundingKing(color: color.opposite, board: board)
// The kings will be able to move to their surrounding locations, so remove them from the board
var noKingsBoard = board
noKingsBoard.removePiece(atLocation: noKingsBoard.getKingLocation(color: .white))
noKingsBoard.removePiece(atLocation: noKingsBoard.getKingLocation(color: .black))
noKingsBoard.removePiece(at: noKingsBoard.getKingLocation(color: .white))
noKingsBoard.removePiece(at: noKingsBoard.getKingLocation(color: .black))
// we don't want to encourage the king to move out in to the open
rating += Double(8 - ownKingLocations.count) * squareValue * 3
@@ -30,19 +30,17 @@ class BoardRaterKingSurroundingPossession : BoardRater {
if noKingsBoard.doesColorOccupyLocation(color: color, location: location) {
rating += squareValue
continue;
continue
}
if noKingsBoard.doesColorOccupyLocation(color: color.opposite(), location: location) {
if noKingsBoard.doesColorOccupyLocation(color: color.opposite, location: location) {
rating -= squareValue
continue
}
if noKingsBoard.canColorMoveAnyPieceToLocation(color: color, location: location) {
rating += squareValue
}
else if noKingsBoard.canColorMoveAnyPieceToLocation(color: color.opposite(), location: location) {
} else if noKingsBoard.canColorMoveAnyPieceToLocation(color: color.opposite, location: location) {
rating -= squareValue
}
@@ -52,19 +50,17 @@ class BoardRaterKingSurroundingPossession : BoardRater {
if noKingsBoard.doesColorOccupyLocation(color: color, location: location) {
rating += squareValue
continue;
continue
}
if noKingsBoard.doesColorOccupyLocation(color: color.opposite(), location: location) {
if noKingsBoard.doesColorOccupyLocation(color: color.opposite, location: location) {
rating -= squareValue
continue
}
if noKingsBoard.canColorMoveAnyPieceToLocation(color: color, location: location) {
rating += squareValue
}
else if noKingsBoard.canColorMoveAnyPieceToLocation(color: color.opposite(), location: location) {
} else if noKingsBoard.canColorMoveAnyPieceToLocation(color: color.opposite, location: location) {
rating -= squareValue
}
}
@@ -77,22 +73,22 @@ class BoardRaterKingSurroundingPossession : BoardRater {
let kingLocation = board.getKingLocation(color: color)
let strides = [
BoardStride(x: 0, y: 1), // N
BoardStride(x: 1, y: 1), // NE
BoardStride(x: 1, y: 0), // E
BoardStride(x: 1, y: -1), // SE
BoardStride(x: 0, y: -1), // S
BoardStride(x: 0, y: 1), // N
BoardStride(x: 1, y: 1), // NE
BoardStride(x: 1, y: 0), // E
BoardStride(x: 1, y: -1), // SE
BoardStride(x: 0, y: -1), // S
BoardStride(x: -1, y: -1), // SW
BoardStride(x: -1, y: 0), // W
BoardStride(x: -1, y: 1), // NW
BoardStride(x: -1, y: 0), // W
BoardStride(x: -1, y: 1) // NW
]
var surroundingLocations = [BoardLocation]()
for stride in strides {
if kingLocation.canIncrementBy(stride: stride) {
let location = kingLocation.incrementedBy(stride: stride)
if kingLocation.canIncrement(by: stride) {
let location = kingLocation.incremented(by: stride)
surroundingLocations.append(location)
}
}
SwiftChess/Source/BoardRaterPawnProgression.swift
+5 -6
View File
@@ -8,9 +8,9 @@
import Foundation
class BoardRaterPawnProgression : BoardRater {
class BoardRaterPawnProgression: BoardRater {
override func ratingfor(board: Board, color: Color) -> Double {
override func ratingFor(board: Board, color: Color) -> Double {
var rating = Double(0)
@@ -38,12 +38,11 @@ class BoardRaterPawnProgression : BoardRater {
if color == .white {
if location.y < 2 {
return 0;
return 0
}
squaresAdvanced = location.y - 2
}
else{
} else {
if location.y > 5 {
return 0
@@ -52,7 +51,7 @@ class BoardRaterPawnProgression : BoardRater {
squaresAdvanced = 7 - (location.y + 2)
}
return Double(squaresAdvanced) * configuration.boardRaterPawnProgressionWeighting.value // <- should probably add some sort of curve
return Double(squaresAdvanced) * configuration.boardRaterPawnProgressionWeighting.value
}
}
SwiftChess/Source/BoardRaterThreatenedPieces.swift
+65 -95
View File
@@ -10,99 +10,52 @@ import Foundation
// Tendancy to protect own pieces
class BoardRaterThreatenedPieces : BoardRater {
class BoardRaterThreatenedPieces: BoardRater {
/*
override func ratingfor(board: Board, color: Color) -> Double {
var rating = Double(0)
let allPieces = board.squares.flatMap{
$0.piece
}
for piece in allPieces {
var value = Double(0)
let threatenedByPieces = getPieces(threatening: piece, onBoard: board)
let protectedByPieces = getPieces(protecting: piece, onBoard: board)
let isThreatened = threatenedByPieces.count > 0
let isProtected = protectedByPieces.count > 0
switch (isThreatened, isProtected) {
case (false, true):
value = piece.value()
case (true, false):
value = -piece.value()
case (true, true):
let lowestValueThreat = threatenedByPieces.dropFirst().reduce(threatenedByPieces[0].value(), { (value: Double, piece) -> Double in
return min(value, piece.value())
})
if lowestValueThreat < piece.value() {
value = -piece.value()
}
case (false, false):
break
}
if piece.color == color.opposite() {
value = -value
}
rating += value
}
return rating * configuration.boardRaterThreatenedPiecesWeighting
}
*/
override func ratingfor(board: Board, color: Color) -> Double {
override func ratingFor(board: Board, color: Color) -> Double {
let rating = board.getPieces(color: color)
.map{ threatValue(forPiece: $0, onBoard: board) }
.reduce(0,+)
.map { threatValue(forPiece: $0, on: board) }
.reduce(0, +)
* configuration.boardRaterThreatenedPiecesWeighting.value
return rating
}
func threatValue(forPiece piece: Piece, onBoard board: Board) -> Double {
func threatValue(forPiece piece: Piece, on board: Board) -> Double {
let threatenedByPieces = getPieces(threatening: piece, onBoard: board)
let protectedByPieces = getPieces(protecting: piece, onBoard: board)
let threatenedByPieces = getPieces(threatening: piece, on: board)
let protectedByPieces = getPieces(protecting: piece, on: board)
let isThreatened = threatenedByPieces.count > 0
let isProtected = protectedByPieces.count > 0
// Threatened but not protected
if isThreatened && !isProtected {
return -piece.value() * 3
return -piece.value * 3
}
// Threatened, but protected (only return if the trade is not preferable)
if isThreatened && isProtected {
let lowestValueThreat = threatenedByPieces.lowestPieceValue()
let lowestValueThreat = threatenedByPieces.lowestPieceValue
if lowestValueThreat < piece.value() {
return -piece.value()
if lowestValueThreat < piece.value {
return -piece.value
}
// Here we could bump the value to encourage a good trade?
}
let targetPieces = getPieces(threatenedBy: piece, onBoard: board)
let targetPieces = getPieces(threatenedBy: piece, on: board)
for targetPiece in targetPieces {
let isTargetProtected = isPieceProtected(targetPiece, onBoard: board)
let isTargetProtected = isPieceProtected(targetPiece, on: board)
// If it's protected, is it a good trade
if isTargetProtected && targetPiece.value() < piece.value() {
if isTargetProtected && targetPiece.value < piece.value {
return 0
}
else{
return targetPiece.value()
} else {
return targetPiece.value
}
}
@@ -112,27 +65,33 @@ class BoardRaterThreatenedPieces : BoardRater {
// MARK: - Helpers
func getPieces(protecting piece: Piece, onBoard board: Board) -> [Piece] {
func getPieces(protecting piece: Piece, on board: Board) -> [Piece] {
var alteredBoard = board
alteredBoard.setPiece(piece.withOppositeColor(), at: piece.location)
alteredBoard.setPiece(piece.withOppositeColor, at: piece.location)
return alteredBoard.getPieces(color: piece.color).filter{
$0.movement.canPieceMove(fromLocation: $0.location, toLocation: piece.location, board: alteredBoard, accountForCheckState: true)
return alteredBoard.getPieces(color: piece.color).filter {
$0.movement.canPieceMove(from: $0.location,
to: piece.location,
board: alteredBoard,
accountForCheckState: true)
}
}
func getPieces(protectedBy piece: Piece, onBoard board: Board) -> [Piece] {
func getPieces(protectedBy piece: Piece, on board: Board) -> [Piece] {
return board.getPieces(color: piece.color).filter{
piece.movement.canPieceMove(fromLocation: piece.location, toLocation: $0.location, board: board, accountForCheckState: true)
return board.getPieces(color: piece.color).filter {
piece.movement.canPieceMove(from: piece.location,
to: $0.location,
board: board,
accountForCheckState: true)
}
}
func isPieceProtected(_ piece: Piece, onBoard board: Board) -> Bool {
func isPieceProtected(_ piece: Piece, on board: Board) -> Bool {
var alteredBoard = board
alteredBoard.setPiece(piece.withOppositeColor(), at: piece.location)
alteredBoard.setPiece(piece.withOppositeColor, at: piece.location)
for square in alteredBoard.squares {
@@ -144,8 +103,8 @@ class BoardRaterThreatenedPieces : BoardRater {
continue
}
if squarePiece.movement.canPieceMove(fromLocation: squarePiece.location,
toLocation: piece.location,
if squarePiece.movement.canPieceMove(from: squarePiece.location,
to: piece.location,
board: alteredBoard,
accountForCheckState: true) {
return true
@@ -155,7 +114,7 @@ class BoardRaterThreatenedPieces : BoardRater {
return false
}
func isPieceThreatened(_ piece: Piece, onBoard board: Board) -> Bool {
func isPieceThreatened(_ piece: Piece, on board: Board) -> Bool {
for square in board.squares {
@@ -163,11 +122,14 @@ class BoardRaterThreatenedPieces : BoardRater {
continue
}
guard squarePiece.color == piece.color.opposite() else {
guard squarePiece.color == piece.color.opposite else {
continue
}
if squarePiece.movement.canPieceMove(fromLocation: squarePiece.location, toLocation: piece.location, board: board, accountForCheckState: true) {
if squarePiece.movement.canPieceMove(from: squarePiece.location,
to: piece.location,
board: board,
accountForCheckState: true) {
return true
}
}
@@ -175,31 +137,39 @@ class BoardRaterThreatenedPieces : BoardRater {
return false
}
func getPieces(threatening piece: Piece, onBoard board: Board) -> [Piece] {
func getPieces(threatening piece: Piece, on board: Board) -> [Piece] {
return board.getPieces(color: piece.color.opposite()).filter{
$0.movement.canPieceMove(fromLocation: $0.location, toLocation: piece.location, board: board, accountForCheckState: true)
return board.getPieces(color: piece.color.opposite).filter {
$0.movement.canPieceMove(from: $0.location,
to: piece.location,
board: board,
accountForCheckState: true)
}
}
func getPieces(threatenedBy piece: Piece, onBoard board: Board) -> [Piece] {
func getPieces(threatenedBy piece: Piece, on board: Board) -> [Piece] {
return board.getPieces(color: piece.color.opposite()).filter{
piece.movement.canPieceMove(fromLocation: piece.location, toLocation: $0.location, board: board, accountForCheckState: true)
return board.getPieces(color: piece.color.opposite).filter {
piece.movement.canPieceMove(from: piece.location,
to: $0.location,
board: board,
accountForCheckState: true)
}
}
func canPieceMoveToSafety(_ piece: Piece, onBoard board: Board) -> Bool {
func canPieceMoveToSafety(_ piece: Piece, on board: Board) -> Bool {
for location in BoardLocation.all {
if piece.movement.canPieceMove(fromLocation: piece.location, toLocation: location, board: board, accountForCheckState: true) {
if piece.movement.canPieceMove(from: piece.location,
to: location,
board: board,
accountForCheckState: true) {
var boardCopy = board
boardCopy.movePiece(fromLocation: piece.location, toLocation: location)
boardCopy.movePiece(from: piece.location, to: location)
let movedPiece = boardCopy.getPiece(at: location)!
if !isPieceThreatened(movedPiece, onBoard: boardCopy) {
if !isPieceThreatened(movedPiece, on: boardCopy) {
return true
}
}
@@ -209,19 +179,19 @@ class BoardRaterThreatenedPieces : BoardRater {
}
}
extension Collection where Iterator.Element == Piece{
extension Collection where Iterator.Element == Piece {
func lowestPieceValue() -> Double {
var lowestPieceValue: Double {
if self.count == 0 {
return 0
}
var result = self.first!.value()
var result = self.first!.value
for piece in self {
let pieceValue = piece.value()
let pieceValue = piece.value
if pieceValue < result {
result = pieceValue
@@ -231,17 +201,17 @@ extension Collection where Iterator.Element == Piece{
return result
}
func highestPieceValue() -> Double {
var highestPieceValue: Double {
if self.count == 0 {
return 0
}
var result = self.first!.value()
var result = self.first!.value
for piece in self {
let pieceValue = piece.value()
let pieceValue = piece.value
if pieceValue > result {
result = pieceValue
SwiftChess/Source/BoardStride.swift
+5 -6
View File
@@ -10,12 +10,11 @@ import Foundation
public struct BoardStride {
public var x: Int;
public var y: Int;
public var x: Int
public var y: Int
public init(x: Int, y: Int){
self.x = x;
self.y = y;
public init(x: Int, y: Int) {
self.x = x
self.y = y
}
}
SwiftChess/Source/Game.swift
+41 -24
View File
@@ -16,7 +16,7 @@ open class Game {
case staleMate(color: Color)
case won(color: Color)
public static func ==(lhs: State, rhs: State) -> Bool {
public static func == (lhs: State, rhs: State) -> Bool {
switch (lhs, rhs) {
case (.inProgress, .inProgress):
return true
@@ -37,11 +37,11 @@ open class Game {
}
// MARK: Properties
open var board = Board(state: .newGame)
open var whitePlayer: Player!
open var blackPlayer: Player!
open var currentPlayer: Player!
open var state = Game.State.inProgress
open internal(set) var board: Board
open let whitePlayer: Player!
open let blackPlayer: Player!
open internal(set) var currentPlayer: Player!
open internal(set) var state = Game.State.inProgress
open weak var delegate: GameDelegate?
public var gameType: GameType {
@@ -57,7 +57,10 @@ open class Game {
}
// MARK: Init
public init(firstPlayer: Player, secondPlayer: Player, board: Board = Board(state: .newGame), colorToMove: Color = .white){
public init(firstPlayer: Player,
secondPlayer: Player,
board: Board = Board(state: .newGame),
colorToMove: Color = .white) {
self.board = board
@@ -77,11 +80,10 @@ open class Game {
self.currentPlayer = (colorToMove == .white ? self.whitePlayer : self.blackPlayer)
}
}
// MARK: - Game : PlayerDelegate
extension Game : PlayerDelegate {
extension Game: PlayerDelegate {
func playerDidMakeMove(player: Player, boardOperations: [BoardOperation]) {
@@ -97,15 +99,15 @@ extension Game : PlayerDelegate {
processBoardOperations(boardOperations: boardOperations)
// Check for game ended
if board.isColorInCheckMate(color: currentPlayer.color.opposite()) {
if board.isColorInCheckMate(color: currentPlayer.color.opposite) {
state = .won(color: currentPlayer.color)
delegate?.gameWonByPlayer(game: self, player: currentPlayer)
return
}
// Check for stalemate
if board.isColorInStalemate(color: currentPlayer.color.opposite()) {
state = .staleMate(color: currentPlayer.color.opposite())
if board.isColorInStalemate(color: currentPlayer.color.opposite) {
state = .staleMate(color: currentPlayer.color.opposite)
delegate?.gameEndedInStaleMate(game: self)
return
}
@@ -116,8 +118,7 @@ extension Game : PlayerDelegate {
// Switch to the other player
if player === whitePlayer {
currentPlayer = blackPlayer
}
else{
} else {
currentPlayer = whitePlayer
}
@@ -131,11 +132,17 @@ extension Game : PlayerDelegate {
switch boardOperation.type! {
case .movePiece:
self.delegate?.gameDidMovePiece(game: self, piece: boardOperation.piece, toLocation: boardOperation.location)
self.delegate?.gameDidMovePiece(game: self,
piece: boardOperation.piece,
toLocation: boardOperation.location)
case .removePiece:
self.delegate?.gameDidRemovePiece(game: self, piece: boardOperation.piece, location: boardOperation.location)
self.delegate?.gameDidRemovePiece(game: self,
piece: boardOperation.piece,
location: boardOperation.location)
case .transformPiece:
self.delegate?.gameDidTransformPiece(game: self, piece: boardOperation.piece, location: boardOperation.location)
self.delegate?.gameDidTransformPiece(game: self,
piece: boardOperation.piece,
location: boardOperation.location)
}
}
@@ -153,13 +160,23 @@ public protocol GameDelegate: class {
func gameEndedInStaleMate(game: Game)
// Piece adding / removing / modifying
func gameWillBeginUpdates(game: Game) // Updates will begin
func gameDidAddPiece(game: Game) // A new piece was added to the board (do we actually need to include this functionality?)
func gameDidRemovePiece(game: Game, piece: Piece, location: BoardLocation) // A piece was removed from the board
func gameDidMovePiece(game: Game, piece: Piece, toLocation: BoardLocation) // A piece was moved on the board
func gameDidTransformPiece(game: Game, piece: Piece, location: BoardLocation) // A piece was transformed (eg. pawn was promoted to another piece)
func gameDidEndUpdates(game: Game) // Updates will end
// Updates will begin
func gameWillBeginUpdates(game: Game)
// A new piece was added to the board
func gameDidAddPiece(game: Game)
// A piece was removed from the board
func gameDidRemovePiece(game: Game, piece: Piece, location: BoardLocation)
// A piece was moved on the board
func gameDidMovePiece(game: Game, piece: Piece, toLocation: BoardLocation)
// A piece was transformed (eg. pawn was promoted to another piece)
func gameDidTransformPiece(game: Game, piece: Piece, location: BoardLocation)
// Updates will end)
func gameDidEndUpdates(game: Game)
// Callbacks from player
func promotedTypeForPawn(location: BoardLocation, player: Human, possiblePromotions: [Piece.PieceType], callback: @escaping (Piece.PieceType) -> Void )
func promotedTypeForPawn(location: BoardLocation,
player: Human,
possiblePromotions: [Piece.PieceType],
callback: @escaping (Piece.PieceType) -> Void )
}
SwiftChess/Source/Human.swift
+11 -11
View File
@@ -6,18 +6,20 @@
//
//
//swiftlint:disable line_length
import Foundation
open class Human : Player {
open class Human: Player {
public init(color: Color){
public init(color: Color) {
super.init()
self.color = color
}
// MARK: - Public
public func movePiece(fromLocation: BoardLocation, toLocation: BoardLocation) throws {
public func movePiece(from fromLocation: BoardLocation, to toLocation: BoardLocation) throws {
// Check that the game is in progress
guard game.state == .inProgress else {
@@ -30,13 +32,14 @@ open class Human : Player {
}
// Check if move is allowed
let canMove = canMovePieceWithError(fromLocation: fromLocation, toLocation: toLocation)
if let error = canMove.error {
do {
_ = try canMovePiece(from: fromLocation, to: toLocation)
} catch let error {
throw error
}
// Move the piece
var operations = game.board.movePiece(fromLocation: fromLocation, toLocation: toLocation)
var operations = game.board.movePiece(from: fromLocation, to: toLocation)
// Make pawn promotions
let promotablePawnLocations = game.board.getLocationsOfPromotablePawns(color: color)
@@ -49,7 +52,7 @@ open class Human : Player {
player: self,
possiblePromotions: Piece.PieceType.possiblePawnPromotionResultingTypes(),
callback: {
// Change the piece
let newPiece = self.game.board.squares[pawnLocation.index].piece?.byChangingType(newType: $0)
self.game.board.setPiece(newPiece!, at: pawnLocation)
@@ -63,7 +66,7 @@ open class Human : Player {
})
}
// ... Or if no pawn promotions, end move
else{
else {
// Inform the delegate that we made a move
delegate?.playerDidMakeMove(player: self, boardOperations: operations)
@@ -90,7 +93,4 @@ open class Human : Player {
delegate?.playerDidMakeMove(player: self, boardOperations: operations)
}
}
SwiftChess/Source/Opening.swift
+33 -27
View File
@@ -12,6 +12,12 @@ struct OpeningMove {
let board: Board
let fromLocation: BoardLocation
let toLocation: BoardLocation
init(board: Board, from fromLocation: BoardLocation, to toLocation: BoardLocation) {
self.board = board
self.fromLocation = fromLocation
self.toLocation = toLocation
}
}
class Opening {
@@ -22,47 +28,46 @@ class Opening {
ItalianGame(),
SicilianDefense(),
QueensGambit(),
KingsGambit(),
KingsGambit()
]
}
static func allOpeningMoves(forColor color: Color) -> [OpeningMove] {
static func allOpeningMoves(for color: Color) -> [OpeningMove] {
var openingMoves = [OpeningMove]()
allOpenings().forEach{
openingMoves += $0.moves(forColor: color)
allOpenings().forEach {
openingMoves += $0.moves(for: color)
}
return openingMoves
}
public func moves(forColor color: Color) -> [OpeningMove] {
public func moves(for color: Color) -> [OpeningMove] {
var moves = [OpeningMove]()
var board = Board(state: .newGame)
for locations in moveLocations(){
for locations in moveLocations() {
let move = OpeningMove(board: board,
fromLocation: locations.fromLocation,
toLocation: locations.toLocation)
from: locations.fromLocation,
to: locations.toLocation)
moves.append(move)
board.movePiece(fromLocation: locations.fromLocation,
toLocation: locations.toLocation)
board.movePiece(from: locations.fromLocation, to: locations.toLocation)
//move.board.printBoardPieces()
}
// Filter for color
return moves.enumerated().flatMap{ (index, value) in
return moves.enumerated().flatMap { (index, value) in
index % 2 == (color == .white ? 0 : 1) ? value : nil
}
}
/*
public func moveLocations(forColor color: Color) -> [(fromLocation: BoardLocation, toLocation: BoardLocation)] {
public func moveLocations(for color: Color) -> [(from fromLocation: BoardLocation, to toLocation: BoardLocation)] {
return moveLocations().enumerated().flatMap{ (index, value) in
index % 2 == (color == .white ? 0 : 1) ? value : nil
@@ -71,7 +76,7 @@ class Opening {
*/
func moveLocations() -> [(fromLocation: BoardLocation, toLocation: BoardLocation)] {
return moveGridPositions().map{
return moveGridPositions().map {
(BoardLocation(gridPosition: $0), BoardLocation(gridPosition: $1))
}
}
@@ -86,14 +91,15 @@ class Opening {
class RuyLopez: Opening {
override func moveGridPositions() -> [(fromPosition: BoardLocation.GridPosition, toPosition: BoardLocation.GridPosition)] {
override func moveGridPositions() ->
[(fromPosition: BoardLocation.GridPosition, toPosition: BoardLocation.GridPosition)] {
let moves: [(BoardLocation.GridPosition, BoardLocation.GridPosition)] = [
(.e2, .e4), // white moves pawn to e4
(.e7, .e5), // black moves pawn to e5
(.g1, .f3), // white moves knight to f3
(.b8, .c6), // black moves knight to c6
(.f1, .b5), // white moves bishop to b5
(.f1, .b5) // white moves bishop to b5
]
return moves
@@ -104,14 +110,15 @@ class RuyLopez: Opening {
class ItalianGame: Opening {
override func moveGridPositions() -> [(fromPosition: BoardLocation.GridPosition, toPosition: BoardLocation.GridPosition)] {
override func moveGridPositions() ->
[(fromPosition: BoardLocation.GridPosition, toPosition: BoardLocation.GridPosition)] {
let moves: [(BoardLocation.GridPosition, BoardLocation.GridPosition)] = [
(.e2, .e4), // white moves pawn to e4
(.e7, .e5), // black moves pawn to e5
(.g1, .f3), // white moves knight to f3
(.b8, .c6), // black moves knight to c6
(.f1, .c4), // white moves bishop to c4
(.f1, .c4) // white moves bishop to c4
]
return moves
@@ -122,11 +129,12 @@ class ItalianGame: Opening {
class SicilianDefense: Opening {
override func moveGridPositions() -> [(fromPosition: BoardLocation.GridPosition, toPosition: BoardLocation.GridPosition)] {
override func moveGridPositions() ->
[(fromPosition: BoardLocation.GridPosition, toPosition: BoardLocation.GridPosition)] {
let moves: [(BoardLocation.GridPosition, BoardLocation.GridPosition)] = [
(.e2, .e4), // white moves pawn to e4
(.c7, .c5), // black moves pawn to c5
(.c7, .c5) // black moves pawn to c5
]
return moves
@@ -137,12 +145,13 @@ class SicilianDefense: Opening {
class QueensGambit: Opening {
override func moveGridPositions() -> [(fromPosition: BoardLocation.GridPosition, toPosition: BoardLocation.GridPosition)] {
override func moveGridPositions() ->
[(fromPosition: BoardLocation.GridPosition, toPosition: BoardLocation.GridPosition)] {
let moves: [(BoardLocation.GridPosition, BoardLocation.GridPosition)] = [
(.d2, .d4), // white moves pawn to d4
(.d7, .d5), // black moves pawn to d5
(.c2, .c4), // white moves pawn to c4
(.c2, .c4) // white moves pawn to c4
]
return moves
@@ -153,18 +162,15 @@ class QueensGambit: Opening {
class KingsGambit: Opening {
override func moveGridPositions() -> [(fromPosition: BoardLocation.GridPosition, toPosition: BoardLocation.GridPosition)] {
override func moveGridPositions() ->
[(fromPosition: BoardLocation.GridPosition, toPosition: BoardLocation.GridPosition)] {
let moves: [(BoardLocation.GridPosition, BoardLocation.GridPosition)] = [
(.e2, .e4), // white moves pawn to e4
(.e7, .e5), // black moves pawn to e5
(.f2, .f4), // white moves pawn to f4
(.f2, .f4) // white moves pawn to f4
]
return moves
}
}
SwiftChess/Source/Piece.swift
+36 -34
View File
@@ -8,24 +8,24 @@
import Foundation
public enum Color: Int {
case white
case black
public enum Color: String {
case white = "White"
case black = "Black"
public func opposite() -> Color {
public var opposite: Color {
return (self == .white) ? .black : .white
}
public func toString() -> String {
return (self == .white) ? "white" : "black"
public var string: String {
return rawValue.lowercased()
}
public func toStringWithCapital() -> String {
return (self == .white) ? "White" : "Black"
public var stringWithCapital: String {
return rawValue
}
}
public struct Piece : Equatable {
public struct Piece: Equatable {
static private var lastAssignedTag = 0
@@ -37,6 +37,17 @@ public struct Piece : Equatable {
case queen
case king
var value: Double {
switch self {
case .pawn: return 1
case .rook: return 5
case .knight: return 3
case .bishop: return 3
case .queen: return 9
case .king: return 0 // King is always treated as a unique case
}
}
static func possiblePawnPromotionResultingTypes() -> [PieceType] {
return [.queen, .knight, .rook, .bishop]
}
@@ -44,16 +55,24 @@ public struct Piece : Equatable {
public let type: PieceType
public let color: Color
public var tag: Int!
public var hasMoved = false
public var canBeTakenByEnPassant = false
public internal(set) var tag: Int!
public internal(set) var hasMoved = false
public internal(set) var canBeTakenByEnPassant = false
public internal(set) var location = BoardLocation(index: 0)
var movement : PieceMovement! {
return PieceMovement.pieceMovementForPieceType(pieceType: self.type)
var movement: PieceMovement! {
return PieceMovement.pieceMovement(for: self.type)
}
var withOppositeColor: Piece {
return Piece(type: type, color: color.opposite)
}
var value: Double {
return type.value
}
public init(type: PieceType, color: Color){
public init(type: PieceType, color: Color) {
self.type = type
self.color = color
@@ -62,41 +81,24 @@ public struct Piece : Equatable {
self.tag = Piece.lastAssignedTag
}
public init(type: PieceType, color: Color, tag: Int){
public init(type: PieceType, color: Color, tag: Int) {
self.type = type
self.color = color
self.tag = tag
}
func value() -> Double {
switch type {
case .pawn: return 1
case .rook: return 5
case .knight: return 3
case .bishop: return 3
case .queen: return 9
case .king: return 0 // King is always treated as a unique case
}
}
func byChangingType(newType: PieceType) -> Piece {
let piece = Piece(type: newType, color: color, tag: tag)
return piece
}
func withOppositeColor() -> Piece {
return Piece(type: type, color: color.opposite())
}
}
public func == (left: Piece, right: Piece) -> Bool {
if left.type == right.type && left.color == right.color {
return true
}
else{
} else {
return false
}
}
SwiftChess/Source/PieceMovement.swift
+94 -69
View File
@@ -6,6 +6,8 @@
//
//
//swiftlint:disable file_length
import Foundation
// MARK: - PieceMovement (Base Class)
@@ -19,7 +21,7 @@ let kingMovement = PieceMovementKing()
open class PieceMovement {
public class func pieceMovementForPieceType(pieceType: Piece.PieceType) -> PieceMovement {
public class func pieceMovement(for pieceType: Piece.PieceType) -> PieceMovement {
switch pieceType {
case .pawn:
@@ -37,38 +39,43 @@ open class PieceMovement {
}
}
public init(){
public init() {
}
func canPieceMove(fromLocation: BoardLocation, toLocation: BoardLocation, board: Board, accountForCheckState: Bool = false) -> Bool {
func canPieceMove(from fromLocation: BoardLocation,
to toLocation: BoardLocation,
board: Board,
accountForCheckState: Bool = false) -> Bool {
if fromLocation == toLocation {
return false
}
let canMove = isMovementPossible(fromLocation: fromLocation, toLocation: toLocation, board: board)
let canMove = isMovementPossible(from: fromLocation, to: toLocation, board: board)
if canMove && accountForCheckState {
let color = board.getPiece(at: fromLocation)!.color
var boardCopy = board
boardCopy.movePiece(fromLocation: fromLocation, toLocation: toLocation)
boardCopy.movePiece(from: fromLocation, to: toLocation)
return boardCopy.isColorInCheck(color: color) ? false : true
}
else{
} else {
return canMove
}
}
func isMovementPossible(fromLocation: BoardLocation, toLocation: BoardLocation, board: Board) -> Bool {
func isMovementPossible(from fromLocation: BoardLocation, to toLocation: BoardLocation, board: Board) -> Bool {
return false
}
func canPieceMove(fromLocation: BoardLocation, toLocation: BoardLocation, board: Board, stride: BoardStride) -> Bool {
// swiftlint:disable function_body_length
func canPieceMove(from fromLocation: BoardLocation,
to toLocation: BoardLocation,
board: Board,
stride: BoardStride) -> Bool {
enum Direction: Int{
enum Direction: Int {
case increasing
case decresing
case none
@@ -112,10 +119,10 @@ open class PieceMovement {
}
// Increment by stride
if !fromLocation.canIncrementBy(stride: stride) {
if !fromLocation.canIncrement(by: stride) {
return false
}
var testLocation = fromLocation.incrementedBy(stride: stride)
var testLocation = fromLocation.incremented(by: stride)
while testLocation.isInBounds() {
@@ -126,11 +133,11 @@ open class PieceMovement {
return false
}
if piece.color == movingPiece.color.opposite() && testLocation == toLocation {
if piece.color == movingPiece.color.opposite && testLocation == toLocation {
return true
}
if piece.color == movingPiece.color.opposite() && testLocation != toLocation {
if piece.color == movingPiece.color.opposite && testLocation != toLocation {
return false
}
}
@@ -140,22 +147,22 @@ open class PieceMovement {
}
// Increment by stride
if !testLocation.canIncrementBy(stride: stride) {
if !testLocation.canIncrement(by: stride) {
return false
}
testLocation = testLocation.incrementedBy(stride: stride)
testLocation = testLocation.incremented(by: stride)
}
return false
}
func canPieceOccupySquare(pieceLocation: BoardLocation, xOffset: Int, yOffset: Int, board: Board) -> Bool{
func canPieceOccupySquare(pieceLocation: BoardLocation, xOffset: Int, yOffset: Int, board: Board) -> Bool {
let targetLocation = pieceLocation.incrementedBy(x: xOffset, y: yOffset)
// Check if in bounds
guard targetLocation.isInBounds() else{
guard targetLocation.isInBounds() else {
return false
}
@@ -193,7 +200,9 @@ open class PieceMovementStraightLine: PieceMovement {
BoardStride(x: 1, y: 0 ) // Right
]
override func isMovementPossible(fromLocation: BoardLocation, toLocation: BoardLocation, board: Board) -> Bool {
override func isMovementPossible(from fromLocation: BoardLocation,
to toLocation: BoardLocation,
board: Board) -> Bool {
let sameX = fromLocation.x == toLocation.x
let sameY = fromLocation.y == toLocation.y
@@ -203,7 +212,7 @@ open class PieceMovementStraightLine: PieceMovement {
}
for stride in strides {
if canPieceMove(fromLocation: fromLocation, toLocation: toLocation, board: board, stride: stride) {
if canPieceMove(from: fromLocation, to: toLocation, board: board, stride: stride) {
return true
}
}
@@ -224,14 +233,16 @@ open class PieceMovementDiagonal: PieceMovement {
BoardStride(x: -1, y: 1 ) // North West
]
override func isMovementPossible(fromLocation: BoardLocation, toLocation: BoardLocation, board: Board) -> Bool {
override func isMovementPossible(from fromLocation: BoardLocation,
to toLocation: BoardLocation,
board: Board) -> Bool {
if fromLocation.isDarkSquare != toLocation.isDarkSquare {
return false
}
for stride in strides {
if canPieceMove(fromLocation: fromLocation, toLocation: toLocation, board: board, stride: stride) {
if canPieceMove(from: fromLocation, to: toLocation, board: board, stride: stride) {
return true
}
}
@@ -246,13 +257,15 @@ open class PieceMovementDiagonal: PieceMovement {
open class PieceMovementQueen: PieceMovement {
let movements : [PieceMovement] = [PieceMovementStraightLine(), PieceMovementDiagonal()]
let movements: [PieceMovement] = [PieceMovementStraightLine(), PieceMovementDiagonal()]
override func isMovementPossible(fromLocation: BoardLocation, toLocation: BoardLocation, board: Board) -> Bool {
override func isMovementPossible(from fromLocation: BoardLocation,
to toLocation: BoardLocation,
board: Board) -> Bool {
for pieceMovement in movements {
if pieceMovement.canPieceMove(fromLocation: fromLocation, toLocation: toLocation, board: board) {
if pieceMovement.canPieceMove(from: fromLocation, to: toLocation, board: board) {
return true
}
}
@@ -268,9 +281,11 @@ open class PieceMovementRook: PieceMovement {
let straightLineMovement = PieceMovementStraightLine()
override func isMovementPossible(fromLocation: BoardLocation, toLocation: BoardLocation, board: Board) -> Bool {
override func isMovementPossible(from fromLocation: BoardLocation,
to toLocation: BoardLocation,
board: Board) -> Bool {
return straightLineMovement.canPieceMove(fromLocation: fromLocation, toLocation: toLocation, board: board)
return straightLineMovement.canPieceMove(from: fromLocation, to: toLocation, board: board)
}
}
@@ -280,9 +295,11 @@ open class PieceMovementBishop: PieceMovement {
let diagonalMovement = PieceMovementDiagonal()
override func isMovementPossible(fromLocation: BoardLocation, toLocation: BoardLocation, board: Board) -> Bool {
override func isMovementPossible(from fromLocation: BoardLocation,
to toLocation: BoardLocation,
board: Board) -> Bool {
return diagonalMovement.canPieceMove(fromLocation: fromLocation, toLocation: toLocation, board: board)
return diagonalMovement.canPieceMove(from: fromLocation, to: toLocation, board: board)
}
}
@@ -291,17 +308,19 @@ open class PieceMovementBishop: PieceMovement {
open class PieceMovementKnight: PieceMovement {
let offsets: [(x: Int, y: Int)] = [
(1,2),
(2,1),
(2,-1),
(-2,1),
(-1,-2),
(-2,-1),
(1,-2),
(-1,2)
(1, 2),
(2, 1),
(2, -1),
(-2, 1),
(-1, -2),
(-2, -1),
(1, -2),
(-1, 2)
]
override func isMovementPossible(fromLocation: BoardLocation, toLocation: BoardLocation, board: Board) -> Bool {
override func isMovementPossible(from fromLocation: BoardLocation,
to toLocation: BoardLocation,
board: Board) -> Bool {
// Make sure cannot take king
if let piece = board.getPiece(at: toLocation) {
@@ -315,7 +334,10 @@ open class PieceMovementKnight: PieceMovement {
let offsetLocation = fromLocation.incrementedBy(x: offset.x, y: offset.y)
if toLocation == offsetLocation
&& canPieceOccupySquare(pieceLocation: fromLocation, xOffset: offset.x, yOffset: offset.y, board: board) {
&& canPieceOccupySquare(pieceLocation: fromLocation,
xOffset: offset.x,
yOffset: offset.y,
board: board) {
return true
}
}
@@ -327,12 +349,15 @@ open class PieceMovementKnight: PieceMovement {
// MARK: - PieceMovementPawn
// swiftlint:disable function_body_length
open class PieceMovementPawn: PieceMovement {
override func isMovementPossible(fromLocation: BoardLocation, toLocation: BoardLocation, board: Board) -> Bool {
override func isMovementPossible(from fromLocation: BoardLocation,
to toLocation: BoardLocation,
board: Board) -> Bool {
// Get the moving piece
guard let movingPiece = board.getPiece(at: fromLocation) else{
guard let movingPiece = board.getPiece(at: fromLocation) else {
return false
}
@@ -354,17 +379,16 @@ open class PieceMovementPawn: PieceMovement {
let color = movingPiece.color
// ****** Test forward locations ******
var forwardStrides = [BoardStride]()
// Test one ahead offset
let oneAheadStride = (color == .white ? BoardStride(x: 0, y: 1) : BoardStride(x: 0, y: -1))
var canMoveOneAhead = true
ONE_AHEAD: if fromLocation.canIncrementBy(stride: oneAheadStride) {
ONE_AHEAD: if fromLocation.canIncrement(by: oneAheadStride) {
let location = fromLocation.incrementedBy(stride: oneAheadStride)
let location = fromLocation.incremented(by: oneAheadStride)
if let _ = board.getPiece(at: location) {
if board.getPiece(at: location) != nil {
canMoveOneAhead = false
break ONE_AHEAD
}
@@ -374,7 +398,6 @@ open class PieceMovementPawn: PieceMovement {
}
}
// Test two ahead offset
if canMoveOneAhead {
@@ -382,14 +405,13 @@ open class PieceMovementPawn: PieceMovement {
if color == .white && fromLocation.y == 1 {
twoAheadStride = BoardStride(x: 0, y: 2)
}
else if color == .black && fromLocation.y == 6 {
} else if color == .black && fromLocation.y == 6 {
twoAheadStride = BoardStride(x: 0, y: -2)
}
TWO_AHEAD: if let twoAheadStride = twoAheadStride {
let twoAheadLocation = fromLocation.incrementedBy(stride: twoAheadStride)
let twoAheadLocation = fromLocation.incremented(by: twoAheadStride)
if toLocation != twoAheadLocation {
break TWO_AHEAD
@@ -407,19 +429,18 @@ open class PieceMovementPawn: PieceMovement {
if color == .white {
diagonalStrides.append( BoardStride(x: -1, y: 1) )
diagonalStrides.append( BoardStride(x: 1, y: 1) )
}
else{
} else {
diagonalStrides.append( BoardStride(x: -1, y: -1) )
diagonalStrides.append( BoardStride(x: 1, y: -1) )
}
for stride in diagonalStrides {
guard fromLocation.canIncrementBy(stride: stride) else {
guard fromLocation.canIncrement(by: stride) else {
continue
}
let location = fromLocation.incrementedBy(stride: stride)
let location = fromLocation.incremented(by: stride)
if location != toLocation {
continue
@@ -427,7 +448,7 @@ open class PieceMovementPawn: PieceMovement {
// If the target square has an opponent piece
if let piece = board.getPiece(at: location) {
if piece.color == color.opposite() {
if piece.color == color.opposite {
return true
}
}
@@ -435,17 +456,17 @@ open class PieceMovementPawn: PieceMovement {
// If can make en passent move
let enPassentStride = BoardStride(x: stride.x, y: 0)
guard fromLocation.canIncrementBy(stride: enPassentStride) else {
guard fromLocation.canIncrement(by: enPassentStride) else {
break
}
let enPassentLocation = fromLocation.incrementedBy(stride: enPassentStride)
let enPassentLocation = fromLocation.incremented(by: enPassentStride)
guard let passingPiece = board.getPiece(at: enPassentLocation) else {
break
}
if passingPiece.canBeTakenByEnPassant && passingPiece.color == color.opposite() {
if passingPiece.canBeTakenByEnPassant && passingPiece.color == color.opposite {
return true
}
@@ -456,23 +477,24 @@ open class PieceMovementPawn: PieceMovement {
}
}
// MARK: - PieceMovementKing
open class PieceMovementKing: PieceMovement {
let offsets: [(x: Int, y: Int)] = [
(0,1), // North
(1,1), // North-East
(1,0), // East
(1,-1), // South-East
(0,-1), // South
(-1,-1), // South-West
(-1,0), // West
(-1,1) // North- West
(0, 1), // North
(1, 1), // North-East
(1, 0), // East
(1, -1), // South-East
(0, -1), // South
(-1, -1), // South-West
(-1, 0), // West
(-1, 1) // North- West
]
override func isMovementPossible(fromLocation: BoardLocation, toLocation: BoardLocation, board: Board) -> Bool {
override func isMovementPossible(from fromLocation: BoardLocation,
to toLocation: BoardLocation,
board: Board) -> Bool {
// Make sure cannot take king
if let piece = board.getPiece(at: toLocation) {
@@ -487,7 +509,10 @@ open class PieceMovementKing: PieceMovement {
if toLocation == offsetLocation
&& offsetLocation.isInBounds()
&& canPieceOccupySquare(pieceLocation: fromLocation, xOffset: offset.x, yOffset: offset.y, board: board) {
&& canPieceOccupySquare(pieceLocation: fromLocation,
xOffset: offset.x,
yOffset: offset.y,
board: board) {
return true
}
}
SwiftChess/Source/Player.swift
+17 -20
View File
@@ -18,9 +18,9 @@ open class Player {
weak var game: Game!
weak var delegate: PlayerDelegate?
public func occupiesSquareAt(location: BoardLocation) -> Bool{
public func occupiesSquare(at location: BoardLocation) -> Bool {
if let piece = self.game.board.getPiece(at: location){
if let piece = self.game.board.getPiece(at: location) {
if piece.color == self.color {
return true
}
@@ -29,11 +29,7 @@ open class Player {
return false
}
public func canMovePiece(fromLocation: BoardLocation, toLocation: BoardLocation) -> Bool {
return canMovePieceWithError(fromLocation: fromLocation, toLocation: toLocation).result
}
public enum MoveError : Error {
public enum MoveError: Int, Error, Equatable {
case notThisPlayersTurn
case movingToSameLocation
case noPieceToMove
@@ -42,48 +38,49 @@ open class Player {
case playerMustMoveOutOfCheck
case cannotMoveInToCheck
case gameIsNotInProgress
public static func == (lhs: MoveError, rhs: MoveError) -> Bool {
return lhs.rawValue == rhs.rawValue
}
}
public func canMovePieceWithError(fromLocation: BoardLocation, toLocation: BoardLocation) -> (result: Bool, error: MoveError?) {
func canMovePiece(from fromLocation: BoardLocation, to toLocation: BoardLocation) throws -> Bool {
// We can't move to our current location
if fromLocation == toLocation {
return (false, .movingToSameLocation)
throw MoveError.movingToSameLocation
}
// Get the piece
guard let piece = self.game.board.getPiece(at: fromLocation) else {
return (false, .noPieceToMove)
throw MoveError.noPieceToMove
}
// Check that the piece color matches the player color
if piece.color != self.color {
return (false, .pieceColorDoesNotMatchPlayerColor)
throw MoveError.pieceColorDoesNotMatchPlayerColor
}
// Make sure the piece can move to the location
if !piece.movement.canPieceMove(fromLocation: fromLocation, toLocation: toLocation, board: game.board) {
return (false, .pieceUnableToMoveToLocation)
if !piece.movement.canPieceMove(from: fromLocation, to: toLocation, board: game.board) {
throw MoveError.pieceUnableToMoveToLocation
}
// Move the piece
let inCheckBeforeMove = self.game.board.isColorInCheck(color: self.color)
var board = self.game.board
board.movePiece(fromLocation: fromLocation, toLocation: toLocation)
board.movePiece(from: fromLocation, to: toLocation)
let inCheckAfterMove = board.isColorInCheck(color: self.color)
// Return
if inCheckBeforeMove && inCheckAfterMove {
return (false, .playerMustMoveOutOfCheck)
throw MoveError.playerMustMoveOutOfCheck
}
if !inCheckBeforeMove && inCheckAfterMove {
return (false, .cannotMoveInToCheck)
throw MoveError.cannotMoveInToCheck
}
return (true, nil)
return true
}
}
SwiftChess/SwiftChess.xcodeproj/project.pbxproj
+43 -5
View File
@@ -211,6 +211,7 @@
67A9C9DA1DE64CD200510FB8 /* Frameworks */,
67A9C9DB1DE64CD200510FB8 /* Headers */,
67A9C9DC1DE64CD200510FB8 /* Resources */,
67B663191F9939A4004621B2 /* Swift Lint */,
);
buildRules = (
);
@@ -246,15 +247,17 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0800;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 0900;
ORGANIZATIONNAME = "Steve Barnegren";
TargetAttributes = {
67A9C9DD1DE64CD200510FB8 = {
CreatedOnToolsVersion = 8.0;
LastSwiftMigration = 0900;
ProvisioningStyle = Automatic;
};
67A9C9E61DE64CD300510FB8 = {
CreatedOnToolsVersion = 8.0;
LastSwiftMigration = 0900;
ProvisioningStyle = Automatic;
};
};
@@ -294,6 +297,23 @@
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
67B663191F9939A4004621B2 /* Swift Lint */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Swift Lint";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
67A9C9D91DE64CD200510FB8 /* Sources */ = {
isa = PBXSourcesBuildPhase;
@@ -351,7 +371,9 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -359,7 +381,12 @@
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -404,7 +431,9 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -412,7 +441,12 @@
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -455,7 +489,8 @@
PRODUCT_BUNDLE_IDENTIFIER = SteveBarnegren.SwiftChess;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
@@ -473,7 +508,8 @@
PRODUCT_BUNDLE_IDENTIFIER = SteveBarnegren.SwiftChess;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
};
name = Release;
};
@@ -485,7 +521,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = SteveBarnegren.SwiftChessTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
@@ -497,7 +534,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = SteveBarnegren.SwiftChessTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
};
name = Release;
};
_Pods.xcodeproj
-1
View File
@@ -1 +0,0 @@
Example/Pods/Pods.xcodeproj