Skip to content

Commit

Permalink
Merge pull request #21 from Cananito/swiftify
Browse files Browse the repository at this point in the history
Converted decision tree class to Swift.
  • Loading branch information
ayanonagon committed Apr 7, 2015
2 parents 9fb5730 + ba35bf9 commit bf5f1f8
Show file tree
Hide file tree
Showing 8 changed files with 240 additions and 416 deletions.
16 changes: 4 additions & 12 deletions Parsimmon/Parsimmon.xcodeproj/project.pbxproj
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
42FA0A8D1AD213C4006F7B70 /* ParsimmonDecisionTree.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42FA0A8C1AD213C4006F7B70 /* ParsimmonDecisionTree.swift */; };
452631151A97CCD900F51473 /* LemmatizerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B63E18C118E618160006BD3E /* LemmatizerTests.swift */; };
452631161A97CCDC00F51473 /* TaggerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B63E18C218E618160006BD3E /* TaggerTests.swift */; };
452C8BA51A96B19D003D7441 /* Seed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 452C8BA41A96B19D003D7441 /* Seed.swift */; };
Expand Down Expand Up @@ -40,8 +41,6 @@
B670059A1807D79500CFF860 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B67005991807D79500CFF860 /* XCTest.framework */; };
B670059B1807D79500CFF860 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B670057A1807D79500CFF860 /* Foundation.framework */; };
B67005B31808595600CFF860 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B67005B21808595600CFF860 /* UIKit.framework */; };
B6A43FD318837077000F61BA /* ParsimmonDecisionTree.m in Sources */ = {isa = PBXBuildFile; fileRef = B6A43FD218837077000F61BA /* ParsimmonDecisionTree.m */; };
B6A43FD618837CF6000F61BA /* ParsimmonNode.m in Sources */ = {isa = PBXBuildFile; fileRef = B6A43FD518837CF6000F61BA /* ParsimmonNode.m */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -55,6 +54,7 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
42FA0A8C1AD213C4006F7B70 /* ParsimmonDecisionTree.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParsimmonDecisionTree.swift; sourceTree = "<group>"; };
452C8BA41A96B19D003D7441 /* Seed.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Seed.swift; sourceTree = "<group>"; };
452C8BA61A96B557003D7441 /* Tokenizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Tokenizer.swift; sourceTree = "<group>"; };
452C8BAE1A96C27F003D7441 /* Analyzer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Analyzer.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -88,10 +88,6 @@
B67005981807D79500CFF860 /* ParsimmonTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ParsimmonTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
B67005991807D79500CFF860 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
B67005B21808595600CFF860 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
B6A43FD118837077000F61BA /* ParsimmonDecisionTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParsimmonDecisionTree.h; sourceTree = "<group>"; };
B6A43FD218837077000F61BA /* ParsimmonDecisionTree.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ParsimmonDecisionTree.m; sourceTree = "<group>"; };
B6A43FD418837CF6000F61BA /* ParsimmonNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParsimmonNode.h; sourceTree = "<group>"; };
B6A43FD518837CF6000F61BA /* ParsimmonNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ParsimmonNode.m; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -217,10 +213,7 @@
isa = PBXGroup;
children = (
459B01481A9534B0000859A1 /* NaiveBayesClassifier.swift */,
B6A43FD118837077000F61BA /* ParsimmonDecisionTree.h */,
B6A43FD218837077000F61BA /* ParsimmonDecisionTree.m */,
B6A43FD418837CF6000F61BA /* ParsimmonNode.h */,
B6A43FD518837CF6000F61BA /* ParsimmonNode.m */,
42FA0A8C1AD213C4006F7B70 /* ParsimmonDecisionTree.swift */,
);
name = Classifiers;
sourceTree = "<group>";
Expand Down Expand Up @@ -331,11 +324,10 @@
files = (
452C8BB61A96E5DC003D7441 /* TaggedToken.swift in Sources */,
452C8BA51A96B19D003D7441 /* Seed.swift in Sources */,
B6A43FD618837CF6000F61BA /* ParsimmonNode.m in Sources */,
4537FBFE1A97E2F6001634FD /* TaggerViewController.swift in Sources */,
4537FC001A97E6E0001634FD /* ClassifierViewController.swift in Sources */,
B6A43FD318837077000F61BA /* ParsimmonDecisionTree.m in Sources */,
452C8BB41A96E58F003D7441 /* Lemmatizer.swift in Sources */,
42FA0A8D1AD213C4006F7B70 /* ParsimmonDecisionTree.swift in Sources */,
452C8BB21A96E589003D7441 /* Tagger.swift in Sources */,
B670058B1807D79500CFF860 /* AppDelegate.m in Sources */,
459B014D1A955E3D000859A1 /* Functions.swift in Sources */,
Expand Down
63 changes: 0 additions & 63 deletions Parsimmon/Parsimmon/ParsimmonDecisionTree.h

This file was deleted.

259 changes: 0 additions & 259 deletions Parsimmon/Parsimmon/ParsimmonDecisionTree.m

This file was deleted.

0 comments on commit bf5f1f8

Please sign in to comment.