From 16bb580142ed626902511d05c539fe29444c821e Mon Sep 17 00:00:00 2001
From: Jim Wallace <james.wallace@uwaterloo.ca>
Date: Wed, 3 Apr 2024 15:32:33 -0400
Subject: [PATCH] mutating functions
---
.../SwiftNLP/0. SNLP Internal Protocols/SNLPCorpus.swift | 6 +++---
Sources/SwiftNLP/1. Data Collection/InMemoryCorpus.swift | 6 +++---
.../2. Encoding/NaturalLanguageEncoderTests.swift | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Sources/SwiftNLP/0. SNLP Internal Protocols/SNLPCorpus.swift b/Sources/SwiftNLP/0. SNLP Internal Protocols/SNLPCorpus.swift
index 3d922641..9e37ca66 100644
--- a/Sources/SwiftNLP/0. SNLP Internal Protocols/SNLPCorpus.swift
+++ b/Sources/SwiftNLP/0. SNLP Internal Protocols/SNLPCorpus.swift
@@ -42,8 +42,8 @@ protocol SNLPCorpus<Item> {
var dimensions: UInt { get }
var count: Int { get }
- func addUntokenizedDocument(_ document: Item)
- func addUntokenizedDocuments(_ documents: [Item])
+ mutating func addUntokenizedDocument(_ document: Item)
+ mutating func addUntokenizedDocuments(_ documents: [Item])
func searchFor(_ query: String) -> [Item]
}
@@ -59,7 +59,7 @@ extension SNLPCorpus {
/**
Adds a series of untokenized documents to the corpus, using default tokenization and text processing
*/
- func addUntokenizedDocuments(_ documents: [Item]) {
+ mutating func addUntokenizedDocuments(_ documents: [Item]) {
for d in documents {
addUntokenizedDocument(d)
}
diff --git a/Sources/SwiftNLP/1. Data Collection/InMemoryCorpus.swift b/Sources/SwiftNLP/1. Data Collection/InMemoryCorpus.swift
index fdb6ea47..bdca399d 100644
--- a/Sources/SwiftNLP/1. Data Collection/InMemoryCorpus.swift
+++ b/Sources/SwiftNLP/1. Data Collection/InMemoryCorpus.swift
@@ -23,7 +23,7 @@
import Foundation
-final class InMemoryCorpus<Scalar: BinaryFloatingPoint, Encoder: SNLPEncoder, Item: SNLPDataItem>: SNLPCorpus where Encoder.Scalar == Scalar {
+struct InMemoryCorpus<Scalar: BinaryFloatingPoint, Encoder: SNLPEncoder, Item: SNLPDataItem>: SNLPCorpus where Encoder.Scalar == Scalar {
internal var documentEncoder: Encoder
@@ -41,14 +41,14 @@ final class InMemoryCorpus<Scalar: BinaryFloatingPoint, Encoder: SNLPEncoder, It
documentEncoder = encoder
}
- func addUntokenizedDocument(_ document: Item) {
+ mutating func addUntokenizedDocument(_ document: Item) {
documents.append(document)
encodedDocuments.append(documentEncoder.encodeSentence(document.fullText))
assert( documents.count == encodedDocuments.count )
}
- func addUntokenizedDocuments(_ documents: [Item]) {
+ mutating func addUntokenizedDocuments(_ documents: [Item]) {
for document in documents {
addUntokenizedDocument(document)
}
diff --git a/Tests/SwiftNLPTests/2. Encoding/NaturalLanguageEncoderTests.swift b/Tests/SwiftNLPTests/2. Encoding/NaturalLanguageEncoderTests.swift
index 6c49181c..0f22e071 100644
--- a/Tests/SwiftNLPTests/2. Encoding/NaturalLanguageEncoderTests.swift
+++ b/Tests/SwiftNLPTests/2. Encoding/NaturalLanguageEncoderTests.swift
@@ -77,7 +77,7 @@ final class NaturalLanguageEncoderTests: XCTestCase {
let (submissions, _ ): ([Submission],[Data]) = try await loadFromRedditArchive(submissionsData)
let encoder = NaturalLanguageEncoder<Double>()
- let corpus = InMemoryCorpus<Double,NaturalLanguageEncoder,String>(encoder: encoder)
+ var corpus = InMemoryCorpus<Double,NaturalLanguageEncoder,String>(encoder: encoder)
for submission in submissions {
if let text = submission.selftext {
--
GitLab