Cleaning up for Linux

Package.resolved

@@ -62,15 +62,6 @@
         "revision" : "8eeea249ead49f6f8db8e76bf66abce49cc5b856",
         "version" : "1.0.0"
       }
-    },
-    {
-      "identity" : "swiftcsv",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/swiftcsv/SwiftCSV.git",
-      "state" : {
-        "revision" : "96fa14b92e88e0befdbc8bc31c7c2c9594a30060",
-        "version" : "0.8.1"
-      }
     }
   ],
   "version" : 2

Package.swift

@@ -18,7 +18,7 @@ let package = Package(
         .package(url: "https://github.com/tsolomko/SWCompression.git", .upToNextMajor(from: "4.8.5")),
         .package(url: "https://github.com/jbadger3/SwiftAnnoy", .upToNextMajor(from: "1.0.0")),
         .package(url: "https://github.com/L1MeN9Yu/Elva", .upToNextMajor(from: "2.0.0")),
-        .package(url: "https://github.com/swiftcsv/SwiftCSV.git", from: "0.8.0"),
+        //.package(url: "https://github.com/swiftcsv/SwiftCSV.git", from: "0.8.0"),
         .package(url: "https://github.com/Bersaelor/KDTree", .upToNextMajor(from: "1.4.1")),
         .package(url: "https://github.com/apple/swift-collections", .upToNextMinor(from: "1.0.0")),
         //.package(url: "https://github.com/dclelland/Plinth", from: "2.0.0"),
@@ -35,7 +35,7 @@ let package = Package(
                 "SWCompression",
                 "SwiftAnnoy",
                 .product(name: "ZSTD", package: "Elva"),
-                "SwiftCSV",
+                //"SwiftCSV",
                 "KDTree",
                 .product(name: "Collections", package: "swift-collections"),
                 //"Plinth",

Sources/SwiftNLP/0. SNLP Internal Protocols/SNLPCorpus + Text Processing.swift

-import Foundation
+// Copyright (c) 2023 Jim Wallace
+//
+// 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.
 
+import Foundation
 
 extension SNLPCorpus {
     static func applyBasicTextProcessing(_ text: String, characterFilters: CharacterSet, tokenFilters: Set<String>) -> [String] {

Sources/SwiftNLP/0. SNLP Internal Protocols/SNLPCorpus.swift

-import Foundation
+// Copyright (c) 2023 Jim Wallace
+//
+// 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.
 
+import Foundation
 
 protocol SNLPCorpus {
     

Sources/SwiftNLP/0. SNLP Internal Protocols/SNLPDataItem.swift

+// Copyright (c) 2023 Jim Wallace
+//
+// 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.
 
-// What's the most basic, common features we need?
-// - A date
-// - Some text (maybe a bunch, concatenated?)
-// - An ID for the entry ... Identifiable means awkwardness for Mac versioning
 import Foundation
 
 public protocol SNLPDataItem: Codable, Equatable, Identifiable {

Sources/SwiftNLP/0. SNLP Internal Protocols/SNLPDictionary.swift

+// Copyright (c) 2023 Jim Wallace
 //
-//  SNLPDictionary.swift
-//  
+// 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:
 //
-//  Created by Jim Wallace on 2023-03-09.
+// 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.
 
 import Foundation
-import NaturalLanguage
 
 
 protocol SNLPDictionary : Codable {

Sources/SwiftNLP/0. SNLP Internal Protocols/SNLPTopicModel.swift

+// Copyright (c) 2023 Jim Wallace
 //
-//  File.swift
-//  
+// 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:
 //
-//  Created by Jim Wallace on 2023-04-06.
+// 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.
 
 import Foundation
 
 
-
 protocol SNLPTopicModel {
     
     associatedtype DocumentEncoding

Sources/SwiftNLP/1. Data Collection/CSV/CSVDataItem.swift

 import Foundation
-import SwiftCSV
+//import SwiftCSV
 
 public struct CSVDataItem: SNLPDataItem {
         

Sources/SwiftNLP/5. Topic Model/StubTopicModel.swift

+// Copyright (c) 2023 Jim Wallace
 //
-//  File.swift
-//  
+// 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:
 //
-//  Created by Jim Wallace on 2023-04-06.
+// 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.
 
 import Foundation
 

Tests/SwiftNLPTests/Reddit API/Session Network Endpoint Tests.swift

@@ -169,16 +169,7 @@ final class RedditSessionEndpointTest: XCTestCase {
         // This should return an array of listings, one with original submisison and one with responses.
         // It's a big thread, so we *should* also get a `more` entry
         let result = try await client.searchComment(subreddit: "AskReddit", articleID: "7dljcy", showMore: true)
-        
-//        for (i, listing) in result.enumerated() {
-//            print("Listing \(i): \(listing.data.children.count) elements")
-//            for item in listing.data.children {
-//                if item.kind == .more {
-//                    print(item)
-//                }
-//            }
-//        }
-                
+                        
         XCTAssert(result.count > 0)
         //XCTAssert(result[1].children.count > 0)
     }

Tests/SwiftNLPTests/SwiftAnnoyTest.swift

@@ -30,7 +30,7 @@ final class SwiftAnnoyTest: XCTestCase {
         //print("Initialized corpus in \(totalTime) seconds")
         
         corpus.addDocuments(documents: docs)
-        print(corpus.encodedDocuments)
+        //print(corpus.encodedDocuments)
         
         let dictionary = corpus.dictionary