Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Trie] Fix trie contains function for empty string #954

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[Trie] Fix trie contains function for empty string #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd99ad3
Fix contains to return true for empty string
lexorus Oct 8, 2020
e6af119
Remove useless UI tests
lexorus Oct 8, 2020
b78383a
Convert project to Swift 5
lexorus Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
124 changes: 7 additions & 117 deletions Trie/Trie/Trie.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
EB798E021DFEF79900F0628D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EB798E011DFEF79900F0628D /* Assets.xcassets */; };
EB798E051DFEF79900F0628D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EB798E031DFEF79900F0628D /* Main.storyboard */; };
EB798E101DFEF79900F0628D /* TrieTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB798E0F1DFEF79900F0628D /* TrieTests.swift */; };
EB798E1B1DFEF79900F0628D /* TrieUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB798E1A1DFEF79900F0628D /* TrieUITests.swift */; };
EB798E291DFEF81400F0628D /* Trie.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB798E281DFEF81400F0628D /* Trie.swift */; };
EB798E2A1DFEF81400F0628D /* Trie.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB798E281DFEF81400F0628D /* Trie.swift */; };
EB798E2C1DFEF90B00F0628D /* dictionary.txt in Resources */ = {isa = PBXBuildFile; fileRef = EB798E2B1DFEF90B00F0628D /* dictionary.txt */; };
Expand All @@ -27,13 +26,6 @@
remoteGlobalIDString = EB798DF91DFEF79900F0628D;
remoteInfo = Trie;
};
EB798E171DFEF79900F0628D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = EB798DF21DFEF79900F0628D /* Project object */;
proxyType = 1;
remoteGlobalIDString = EB798DF91DFEF79900F0628D;
remoteInfo = Trie;
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
Expand All @@ -46,9 +38,6 @@
EB798E0B1DFEF79900F0628D /* TrieTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TrieTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
EB798E0F1DFEF79900F0628D /* TrieTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrieTests.swift; sourceTree = "<group>"; };
EB798E111DFEF79900F0628D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
EB798E161DFEF79900F0628D /* TrieUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TrieUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
EB798E1A1DFEF79900F0628D /* TrieUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrieUITests.swift; sourceTree = "<group>"; };
EB798E1C1DFEF79900F0628D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
EB798E281DFEF81400F0628D /* Trie.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Trie.swift; sourceTree = "<group>"; };
EB798E2B1DFEF90B00F0628D /* dictionary.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dictionary.txt; sourceTree = "<group>"; };
EB8369AC1E15C5710003A7F8 /* ReadMe.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = ReadMe.md; sourceTree = "<group>"; };
Expand All @@ -69,13 +58,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
EB798E131DFEF79900F0628D /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
Expand All @@ -84,7 +66,6 @@
children = (
EB798DFC1DFEF79900F0628D /* Trie */,
EB798E0E1DFEF79900F0628D /* TrieTests */,
EB798E191DFEF79900F0628D /* TrieUITests */,
EB798DFB1DFEF79900F0628D /* Products */,
);
indentWidth = 2;
Expand All @@ -96,7 +77,6 @@
children = (
EB798DFA1DFEF79900F0628D /* Trie.app */,
EB798E0B1DFEF79900F0628D /* TrieTests.xctest */,
EB798E161DFEF79900F0628D /* TrieUITests.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -125,15 +105,6 @@
path = TrieTests;
sourceTree = "<group>";
};
EB798E191DFEF79900F0628D /* TrieUITests */ = {
isa = PBXGroup;
children = (
EB798E1A1DFEF79900F0628D /* TrieUITests.swift */,
EB798E1C1DFEF79900F0628D /* Info.plist */,
);
path = TrieUITests;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -172,24 +143,6 @@
productReference = EB798E0B1DFEF79900F0628D /* TrieTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
EB798E151DFEF79900F0628D /* TrieUITests */ = {
isa = PBXNativeTarget;
buildConfigurationList = EB798E251DFEF79900F0628D /* Build configuration list for PBXNativeTarget "TrieUITests" */;
buildPhases = (
EB798E121DFEF79900F0628D /* Sources */,
EB798E131DFEF79900F0628D /* Frameworks */,
EB798E141DFEF79900F0628D /* Resources */,
);
buildRules = (
);
dependencies = (
EB798E181DFEF79900F0628D /* PBXTargetDependency */,
);
name = TrieUITests;
productName = TrieUITests;
productReference = EB798E161DFEF79900F0628D /* TrieUITests.xctest */;
productType = "com.apple.product-type.bundle.ui-testing";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
Expand All @@ -202,18 +155,12 @@
TargetAttributes = {
EB798DF91DFEF79900F0628D = {
CreatedOnToolsVersion = 8.1;
LastSwiftMigration = 1000;
LastSwiftMigration = 1200;
ProvisioningStyle = Automatic;
};
EB798E0A1DFEF79900F0628D = {
CreatedOnToolsVersion = 8.1;
LastSwiftMigration = 1000;
ProvisioningStyle = Automatic;
TestTargetID = EB798DF91DFEF79900F0628D;
};
EB798E151DFEF79900F0628D = {
CreatedOnToolsVersion = 8.1;
LastSwiftMigration = 1000;
LastSwiftMigration = 1200;
ProvisioningStyle = Automatic;
TestTargetID = EB798DF91DFEF79900F0628D;
};
Expand All @@ -224,6 +171,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand All @@ -234,7 +182,6 @@
targets = (
EB798DF91DFEF79900F0628D /* Trie */,
EB798E0A1DFEF79900F0628D /* TrieTests */,
EB798E151DFEF79900F0628D /* TrieUITests */,
);
};
/* End PBXProject section */
Expand All @@ -258,13 +205,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
EB798E141DFEF79900F0628D /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand All @@ -287,14 +227,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
EB798E121DFEF79900F0628D /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
EB798E1B1DFEF79900F0628D /* TrieUITests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
Expand All @@ -303,11 +235,6 @@
target = EB798DF91DFEF79900F0628D /* Trie */;
targetProxy = EB798E0C1DFEF79900F0628D /* PBXContainerItemProxy */;
};
EB798E181DFEF79900F0628D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = EB798DF91DFEF79900F0628D /* Trie */;
targetProxy = EB798E171DFEF79900F0628D /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
Expand Down Expand Up @@ -439,7 +366,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = edu.bucknell.zaccone.Trie;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -452,7 +379,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = edu.bucknell.zaccone.Trie;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -466,7 +393,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = edu.bucknell.zaccone.TrieTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Trie.app/Contents/MacOS/Trie";
};
name = Debug;
Expand All @@ -481,39 +408,11 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = edu.bucknell.zaccone.TrieTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Trie.app/Contents/MacOS/Trie";
};
name = Release;
};
EB798E261DFEF79900F0628D /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = TrieUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = edu.bucknell.zaccone.TrieUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
TEST_TARGET_NAME = Trie;
};
name = Debug;
};
EB798E271DFEF79900F0628D /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = TrieUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = edu.bucknell.zaccone.TrieUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
TEST_TARGET_NAME = Trie;
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand Down Expand Up @@ -544,15 +443,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
EB798E251DFEF79900F0628D /* Build configuration list for PBXNativeTarget "TrieUITests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
EB798E261DFEF79900F0628D /* Debug */,
EB798E271DFEF79900F0628D /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = EB798DF21DFEF79900F0628D /* Project object */;
Expand Down
2 changes: 1 addition & 1 deletion Trie/Trie/Trie/Trie.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ extension Trie {
/// - Returns: true if the word is present, false otherwise.
func contains(word: String, matchPrefix: Bool = false) -> Bool {
guard !word.isEmpty else {
return false
return true
}
var currentNode = root
for character in word.lowercased() {
Expand Down
22 changes: 0 additions & 22 deletions Trie/Trie/TrieUITests/Info.plist
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions Trie/Trie/TrieUITests/TrieUITests.swift
View file
Open in desktop

This file was deleted.