From 9fa07a2f023e5b49406fd96fcff108a72a473023 Mon Sep 17 00:00:00 2001 From: kreeben Date: Tue, 12 Apr 2022 21:06:06 +0200 Subject: [PATCH] move vectorspace ns into search prj --- src/Sir.Cmd/BenchmarkCommand.cs | 5 ++++- src/Sir.Cmd/Program.cs | 1 - src/Sir.Crawl/CrawlUserDirectoryCommand.cs | 1 - src/Sir.HttpServer/HttpQueryParser.cs | 1 - src/Sir.HttpServer/HttpWriter.cs | 1 - src/Sir.HttpServer/IHttpReader.cs | 1 - src/Sir.HttpServer/IHttpWriter.cs | 1 - src/Sir.HttpServer/ServiceConfiguration.cs | 1 - src/Sir.Mnist/IndexMnistCommand.cs | 1 - src/Sir.Search/Field.cs | 3 +-- src/{Sir.VectorSpace => Sir.Search}/Hit.cs | 2 +- src/{Sir.VectorSpace => Sir.Search/Index}/ColumnReader.cs | 2 +- src/{Sir.VectorSpace => Sir.Search/Index}/ColumnWriter.cs | 2 +- src/{Sir.VectorSpace => Sir.Search/Index}/GraphBuilder.cs | 2 +- src/{Sir.VectorSpace => Sir.Search/Index}/IColumnReader.cs | 2 +- src/{Sir.VectorSpace => Sir.Search/Index}/IReducer.cs | 2 +- .../Index}/PageIndexReader.cs | 2 +- .../Index}/PageIndexWriter.cs | 2 +- src/{Sir.VectorSpace => Sir.Search/Index}/PathFinder.cs | 2 +- src/{Sir.VectorSpace => Sir.Search/Index}/PostingsReader.cs | 2 +- .../Index}/PostingsResolver.cs | 2 +- src/{Sir.VectorSpace => Sir.Search/Index}/Scorer.cs | 2 +- .../Index}/SerializableVector.cs | 5 ++--- src/Sir.Search/Models/BagOfCharsModel.cs | 3 +-- src/Sir.Search/Models/LinearClassifierImageModel.cs | 3 +-- src/Sir.Search/Models/NGramModel.cs | 3 +-- src/Sir.Search/Parsers/IQueryFormatter.cs | 1 - src/Sir.Search/Parsers/QueryParser.cs | 1 - src/{Sir.VectorSpace => Sir.Search}/Query.cs | 5 +++-- src/Sir.Search/Session/Debug/GraphInfo.cs | 4 +--- src/Sir.Search/Session/DocumentStreamSession.cs | 1 - src/Sir.Search/Session/ISearchSession.cs | 3 +-- src/Sir.Search/Session/IndexSession.cs | 3 +-- src/Sir.Search/Session/IndexWriter.cs | 1 - src/Sir.Search/Session/SearchSession.cs | 1 - src/Sir.Search/Sir.Search.csproj | 1 - src/{Sir.VectorSpace => Sir.Search}/Term.cs | 2 +- src/Sir.Store.Tests/BagOfCharsModelTests.cs | 1 - src/Sir.Store.Tests/ImageModelTests.cs | 1 - src/Sir.Store.Tests/IndexSessionTests.cs | 1 - src/Sir.Store.Tests/NGramModelTests.cs | 1 - src/Sir.StringCompare/Program.cs | 1 - src/Sir.WebFront/Features/CrawlJob.cs | 1 - src/Sir.WebFront/Features/SaveAsJob.cs | 1 - src/Sir.WebFront/HttpQueryParser.cs | 1 - src/Sir.Wikipedia/IndexWikipediaCommand.cs | 1 - src/Sir.sln | 6 ------ 47 files changed, 29 insertions(+), 63 deletions(-) rename src/{Sir.VectorSpace => Sir.Search}/Hit.cs (94%) rename src/{Sir.VectorSpace => Sir.Search/Index}/ColumnReader.cs (99%) rename src/{Sir.VectorSpace => Sir.Search/Index}/ColumnWriter.cs (97%) rename src/{Sir.VectorSpace => Sir.Search/Index}/GraphBuilder.cs (99%) rename src/{Sir.VectorSpace => Sir.Search/Index}/IColumnReader.cs (85%) rename src/{Sir.VectorSpace => Sir.Search/Index}/IReducer.cs (87%) rename src/{Sir.VectorSpace => Sir.Search/Index}/PageIndexReader.cs (98%) rename src/{Sir.VectorSpace => Sir.Search/Index}/PageIndexWriter.cs (96%) rename src/{Sir.VectorSpace => Sir.Search/Index}/PathFinder.cs (99%) rename src/{Sir.VectorSpace => Sir.Search/Index}/PostingsReader.cs (99%) rename src/{Sir.VectorSpace => Sir.Search/Index}/PostingsResolver.cs (96%) rename src/{Sir.VectorSpace => Sir.Search/Index}/Scorer.cs (99%) rename src/{Sir.VectorSpace => Sir.Search/Index}/SerializableVector.cs (98%) rename src/{Sir.VectorSpace => Sir.Search}/Query.cs (98%) rename src/{Sir.VectorSpace => Sir.Search}/Term.cs (97%) diff --git a/src/Sir.Cmd/BenchmarkCommand.cs b/src/Sir.Cmd/BenchmarkCommand.cs index 51fdb2a9..0371def6 100644 --- a/src/Sir.Cmd/BenchmarkCommand.cs +++ b/src/Sir.Cmd/BenchmarkCommand.cs @@ -17,13 +17,16 @@ public void Run(IDictionary args, ILogger logger) RunIndexBenchmark(args, logger); } + /// + /// E.g. benchmark --tokenize --file d:\enwiki-20211122-cirrussearch-content.json.gz --directory C:\projects\resin\src\Sir.HttpServer\AppData\database --skip 0 --take 10000 + /// public void RunTokenizeBenchmark(IDictionary args, ILogger logger) { const int numOfRuns = 10; int skip = int.Parse(args["skip"]); int take = int.Parse(args["take"]); var fileName = args["file"]; - var model = new BagOfCharsModel(); + var model = new NGramModel(new BagOfCharsModel()); var documents = new List(WikipediaHelper.Read(fileName, skip, take, new HashSet { "text" })); var timer = Stopwatch.StartNew(); diff --git a/src/Sir.Cmd/Program.cs b/src/Sir.Cmd/Program.cs index 178ece05..8c6de488 100644 --- a/src/Sir.Cmd/Program.cs +++ b/src/Sir.Cmd/Program.cs @@ -6,7 +6,6 @@ using Newtonsoft.Json; using Sir.Documents; using Sir.Search; -using Sir.VectorSpace; namespace Sir.Cmd { diff --git a/src/Sir.Crawl/CrawlUserDirectoryCommand.cs b/src/Sir.Crawl/CrawlUserDirectoryCommand.cs index 6357839f..8d68c832 100644 --- a/src/Sir.Crawl/CrawlUserDirectoryCommand.cs +++ b/src/Sir.Crawl/CrawlUserDirectoryCommand.cs @@ -1,7 +1,6 @@ using HtmlAgilityPack; using Microsoft.Extensions.Logging; using Sir.Search; -using Sir.VectorSpace; using System; using System.Collections.Generic; using System.Diagnostics; diff --git a/src/Sir.HttpServer/HttpQueryParser.cs b/src/Sir.HttpServer/HttpQueryParser.cs index 5f488353..8c914418 100644 --- a/src/Sir.HttpServer/HttpQueryParser.cs +++ b/src/Sir.HttpServer/HttpQueryParser.cs @@ -1,7 +1,6 @@ using Microsoft.AspNetCore.Http; using Newtonsoft.Json; using Sir.Search; -using Sir.VectorSpace; using System.Collections.Generic; using System.Dynamic; using System.IO; diff --git a/src/Sir.HttpServer/HttpWriter.cs b/src/Sir.HttpServer/HttpWriter.cs index 8961bd1f..af222126 100644 --- a/src/Sir.HttpServer/HttpWriter.cs +++ b/src/Sir.HttpServer/HttpWriter.cs @@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Http; using Newtonsoft.Json; using Sir.Search; -using Sir.VectorSpace; namespace Sir.HttpServer { diff --git a/src/Sir.HttpServer/IHttpReader.cs b/src/Sir.HttpServer/IHttpReader.cs index a15a4b83..3ec6f799 100644 --- a/src/Sir.HttpServer/IHttpReader.cs +++ b/src/Sir.HttpServer/IHttpReader.cs @@ -1,6 +1,5 @@ using Microsoft.AspNetCore.Http; using Sir.Search; -using Sir.VectorSpace; using System.Threading.Tasks; namespace Sir.HttpServer diff --git a/src/Sir.HttpServer/IHttpWriter.cs b/src/Sir.HttpServer/IHttpWriter.cs index 1fb48e88..744584e0 100644 --- a/src/Sir.HttpServer/IHttpWriter.cs +++ b/src/Sir.HttpServer/IHttpWriter.cs @@ -1,5 +1,4 @@ using Microsoft.AspNetCore.Http; -using Sir.VectorSpace; namespace Sir.HttpServer { diff --git a/src/Sir.HttpServer/ServiceConfiguration.cs b/src/Sir.HttpServer/ServiceConfiguration.cs index 02e41cb7..d5a74c74 100644 --- a/src/Sir.HttpServer/ServiceConfiguration.cs +++ b/src/Sir.HttpServer/ServiceConfiguration.cs @@ -1,7 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Sir.Search; -using Sir.VectorSpace; using System; using System.IO; diff --git a/src/Sir.Mnist/IndexMnistCommand.cs b/src/Sir.Mnist/IndexMnistCommand.cs index 09706b99..d4268160 100644 --- a/src/Sir.Mnist/IndexMnistCommand.cs +++ b/src/Sir.Mnist/IndexMnistCommand.cs @@ -1,7 +1,6 @@ using Microsoft.Extensions.Logging; using Sir.Documents; using Sir.Search; -using Sir.VectorSpace; using System.Collections.Generic; using System.Diagnostics; using System.IO; diff --git a/src/Sir.Search/Field.cs b/src/Sir.Search/Field.cs index e6fcf06b..b4dd2242 100644 --- a/src/Sir.Search/Field.cs +++ b/src/Sir.Search/Field.cs @@ -1,5 +1,4 @@ -using Sir.VectorSpace; -using System; +using System; using System.Collections.Generic; using System.Diagnostics; diff --git a/src/Sir.VectorSpace/Hit.cs b/src/Sir.Search/Hit.cs similarity index 94% rename from src/Sir.VectorSpace/Hit.cs rename to src/Sir.Search/Hit.cs index 631c1ae1..bf605af7 100644 --- a/src/Sir.VectorSpace/Hit.cs +++ b/src/Sir.Search/Hit.cs @@ -1,6 +1,6 @@ using System.Diagnostics; -namespace Sir.VectorSpace +namespace Sir.Search { [DebuggerDisplay("{Score} {Node}")] public class Hit diff --git a/src/Sir.VectorSpace/ColumnReader.cs b/src/Sir.Search/Index/ColumnReader.cs similarity index 99% rename from src/Sir.VectorSpace/ColumnReader.cs rename to src/Sir.Search/Index/ColumnReader.cs index 018cdfb7..77c75b7a 100644 --- a/src/Sir.VectorSpace/ColumnReader.cs +++ b/src/Sir.Search/Index/ColumnReader.cs @@ -5,7 +5,7 @@ using System.Diagnostics; using System.IO; -namespace Sir.VectorSpace +namespace Sir.Search { /// /// Index bitmap reader. Each block is a . diff --git a/src/Sir.VectorSpace/ColumnWriter.cs b/src/Sir.Search/Index/ColumnWriter.cs similarity index 97% rename from src/Sir.VectorSpace/ColumnWriter.cs rename to src/Sir.Search/Index/ColumnWriter.cs index 03e05218..fba4992c 100644 --- a/src/Sir.VectorSpace/ColumnWriter.cs +++ b/src/Sir.Search/Index/ColumnWriter.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace Sir.VectorSpace +namespace Sir.Search { public class ColumnWriter : IDisposable { diff --git a/src/Sir.VectorSpace/GraphBuilder.cs b/src/Sir.Search/Index/GraphBuilder.cs similarity index 99% rename from src/Sir.VectorSpace/GraphBuilder.cs rename to src/Sir.Search/Index/GraphBuilder.cs index 670e9d98..002bfc92 100644 --- a/src/Sir.VectorSpace/GraphBuilder.cs +++ b/src/Sir.Search/Index/GraphBuilder.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace Sir.VectorSpace +namespace Sir.Search { public static class GraphBuilder { diff --git a/src/Sir.VectorSpace/IColumnReader.cs b/src/Sir.Search/Index/IColumnReader.cs similarity index 85% rename from src/Sir.VectorSpace/IColumnReader.cs rename to src/Sir.Search/Index/IColumnReader.cs index 82160436..102ec8ad 100644 --- a/src/Sir.VectorSpace/IColumnReader.cs +++ b/src/Sir.Search/Index/IColumnReader.cs @@ -1,6 +1,6 @@ using System; -namespace Sir.VectorSpace +namespace Sir.Search { public interface IColumnReader : IDisposable { diff --git a/src/Sir.VectorSpace/IReducer.cs b/src/Sir.Search/Index/IReducer.cs similarity index 87% rename from src/Sir.VectorSpace/IReducer.cs rename to src/Sir.Search/Index/IReducer.cs index 5d5971dc..440bc156 100644 --- a/src/Sir.VectorSpace/IReducer.cs +++ b/src/Sir.Search/Index/IReducer.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Sir.VectorSpace +namespace Sir.Search { public interface IReducer { diff --git a/src/Sir.VectorSpace/PageIndexReader.cs b/src/Sir.Search/Index/PageIndexReader.cs similarity index 98% rename from src/Sir.VectorSpace/PageIndexReader.cs rename to src/Sir.Search/Index/PageIndexReader.cs index ad857715..2f582e00 100644 --- a/src/Sir.VectorSpace/PageIndexReader.cs +++ b/src/Sir.Search/Index/PageIndexReader.cs @@ -3,7 +3,7 @@ using System.IO; using System.Runtime.InteropServices; -namespace Sir.VectorSpace +namespace Sir.Search { /// /// Index segment address reader. diff --git a/src/Sir.VectorSpace/PageIndexWriter.cs b/src/Sir.Search/Index/PageIndexWriter.cs similarity index 96% rename from src/Sir.VectorSpace/PageIndexWriter.cs rename to src/Sir.Search/Index/PageIndexWriter.cs index 7aa3371e..b3ea7c2c 100644 --- a/src/Sir.VectorSpace/PageIndexWriter.cs +++ b/src/Sir.Search/Index/PageIndexWriter.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace Sir.VectorSpace +namespace Sir.Search { /// /// Index segment address writer. diff --git a/src/Sir.VectorSpace/PathFinder.cs b/src/Sir.Search/Index/PathFinder.cs similarity index 99% rename from src/Sir.VectorSpace/PathFinder.cs rename to src/Sir.Search/Index/PathFinder.cs index a06bf29a..a2382635 100644 --- a/src/Sir.VectorSpace/PathFinder.cs +++ b/src/Sir.Search/Index/PathFinder.cs @@ -3,7 +3,7 @@ using System.IO; using System.Text; -namespace Sir.VectorSpace +namespace Sir.Search { public static class PathFinder { diff --git a/src/Sir.VectorSpace/PostingsReader.cs b/src/Sir.Search/Index/PostingsReader.cs similarity index 99% rename from src/Sir.VectorSpace/PostingsReader.cs rename to src/Sir.Search/Index/PostingsReader.cs index 766a6829..ff33db9c 100644 --- a/src/Sir.VectorSpace/PostingsReader.cs +++ b/src/Sir.Search/Index/PostingsReader.cs @@ -5,7 +5,7 @@ using System.IO; using System.Runtime.InteropServices; -namespace Sir.VectorSpace +namespace Sir.Search { /// /// Allocate postings in memory. diff --git a/src/Sir.VectorSpace/PostingsResolver.cs b/src/Sir.Search/Index/PostingsResolver.cs similarity index 96% rename from src/Sir.VectorSpace/PostingsResolver.cs rename to src/Sir.Search/Index/PostingsResolver.cs index 621099db..48ecba8b 100644 --- a/src/Sir.VectorSpace/PostingsResolver.cs +++ b/src/Sir.Search/Index/PostingsResolver.cs @@ -1,4 +1,4 @@ -namespace Sir.VectorSpace +namespace Sir.Search { public class PostingsResolver { diff --git a/src/Sir.VectorSpace/Scorer.cs b/src/Sir.Search/Index/Scorer.cs similarity index 99% rename from src/Sir.VectorSpace/Scorer.cs rename to src/Sir.Search/Index/Scorer.cs index c689fe92..99ba7188 100644 --- a/src/Sir.VectorSpace/Scorer.cs +++ b/src/Sir.Search/Index/Scorer.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Sir.VectorSpace +namespace Sir.Search { public class Scorer { diff --git a/src/Sir.VectorSpace/SerializableVector.cs b/src/Sir.Search/Index/SerializableVector.cs similarity index 98% rename from src/Sir.VectorSpace/SerializableVector.cs rename to src/Sir.Search/Index/SerializableVector.cs index 2da1fcd2..f2841883 100644 --- a/src/Sir.VectorSpace/SerializableVector.cs +++ b/src/Sir.Search/Index/SerializableVector.cs @@ -6,9 +6,8 @@ using System.IO.MemoryMappedFiles; using System.Runtime.InteropServices; -namespace Sir.VectorSpace +namespace Sir.Search { - [System.Diagnostics.DebuggerDisplay("{Label}")] public class SerializableVector : ISerializableVector { public object Label { get; private set; } @@ -223,7 +222,7 @@ public static long Serialize(ISerializableVector vector, Stream vectorStream) public override string ToString() { - return Value.ToString(); + return Value==null?base.ToString() : Value.ToString(); } } } \ No newline at end of file diff --git a/src/Sir.Search/Models/BagOfCharsModel.cs b/src/Sir.Search/Models/BagOfCharsModel.cs index aeb27a86..4f984b4a 100644 --- a/src/Sir.Search/Models/BagOfCharsModel.cs +++ b/src/Sir.Search/Models/BagOfCharsModel.cs @@ -1,5 +1,4 @@ -using Sir.VectorSpace; -using System.Collections.Generic; +using System.Collections.Generic; namespace Sir.Search { diff --git a/src/Sir.Search/Models/LinearClassifierImageModel.cs b/src/Sir.Search/Models/LinearClassifierImageModel.cs index 19ffba28..63bbddb6 100644 --- a/src/Sir.Search/Models/LinearClassifierImageModel.cs +++ b/src/Sir.Search/Models/LinearClassifierImageModel.cs @@ -1,5 +1,4 @@ -using Sir.VectorSpace; -using System; +using System; using System.Collections.Generic; using System.Linq; diff --git a/src/Sir.Search/Models/NGramModel.cs b/src/Sir.Search/Models/NGramModel.cs index 6e470d6f..0596e82e 100644 --- a/src/Sir.Search/Models/NGramModel.cs +++ b/src/Sir.Search/Models/NGramModel.cs @@ -1,5 +1,4 @@ -using Sir.VectorSpace; -using System.Collections.Generic; +using System.Collections.Generic; namespace Sir.Search { diff --git a/src/Sir.Search/Parsers/IQueryFormatter.cs b/src/Sir.Search/Parsers/IQueryFormatter.cs index 12466f8c..c3d81bdb 100644 --- a/src/Sir.Search/Parsers/IQueryFormatter.cs +++ b/src/Sir.Search/Parsers/IQueryFormatter.cs @@ -1,5 +1,4 @@ using Microsoft.AspNetCore.Http; -using Sir.VectorSpace; using System.Threading.Tasks; namespace Sir.Search diff --git a/src/Sir.Search/Parsers/QueryParser.cs b/src/Sir.Search/Parsers/QueryParser.cs index 88ee0fae..99ef7413 100644 --- a/src/Sir.Search/Parsers/QueryParser.cs +++ b/src/Sir.Search/Parsers/QueryParser.cs @@ -1,6 +1,5 @@ using Microsoft.Extensions.Logging; using Newtonsoft.Json; -using Sir.VectorSpace; using System.Collections.Generic; namespace Sir.Search diff --git a/src/Sir.VectorSpace/Query.cs b/src/Sir.Search/Query.cs similarity index 98% rename from src/Sir.VectorSpace/Query.cs rename to src/Sir.Search/Query.cs index 5d747390..a35c3d50 100644 --- a/src/Sir.VectorSpace/Query.cs +++ b/src/Sir.Search/Query.cs @@ -1,6 +1,7 @@ -using System.Collections.Generic; + +using System.Collections.Generic; -namespace Sir.VectorSpace +namespace Sir.Search { /// /// A boolean query. diff --git a/src/Sir.Search/Session/Debug/GraphInfo.cs b/src/Sir.Search/Session/Debug/GraphInfo.cs index ab417fee..5bd1e145 100644 --- a/src/Sir.Search/Session/Debug/GraphInfo.cs +++ b/src/Sir.Search/Session/Debug/GraphInfo.cs @@ -1,6 +1,4 @@ -using Sir.VectorSpace; - -namespace Sir.Search +namespace Sir.Search { public class GraphInfo { diff --git a/src/Sir.Search/Session/DocumentStreamSession.cs b/src/Sir.Search/Session/DocumentStreamSession.cs index fbda8b62..decea8df 100644 --- a/src/Sir.Search/Session/DocumentStreamSession.cs +++ b/src/Sir.Search/Session/DocumentStreamSession.cs @@ -1,5 +1,4 @@ using Sir.Documents; -using Sir.VectorSpace; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Sir.Search/Session/ISearchSession.cs b/src/Sir.Search/Session/ISearchSession.cs index 45e7f7f8..68f0fa8f 100644 --- a/src/Sir.Search/Session/ISearchSession.cs +++ b/src/Sir.Search/Session/ISearchSession.cs @@ -1,5 +1,4 @@ -using Sir.VectorSpace; -using System; +using System; namespace Sir.Search { diff --git a/src/Sir.Search/Session/IndexSession.cs b/src/Sir.Search/Session/IndexSession.cs index 2cc5d6cb..3e378271 100644 --- a/src/Sir.Search/Session/IndexSession.cs +++ b/src/Sir.Search/Session/IndexSession.cs @@ -1,5 +1,4 @@ -using Sir.VectorSpace; -using System; +using System; using System.Collections.Generic; namespace Sir.Search diff --git a/src/Sir.Search/Session/IndexWriter.cs b/src/Sir.Search/Session/IndexWriter.cs index 6ff858ea..e08ec901 100644 --- a/src/Sir.Search/Session/IndexWriter.cs +++ b/src/Sir.Search/Session/IndexWriter.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.Logging; -using Sir.VectorSpace; using System; using System.Collections.Generic; using System.Diagnostics; diff --git a/src/Sir.Search/Session/SearchSession.cs b/src/Sir.Search/Session/SearchSession.cs index 5d00025c..e2ca5292 100644 --- a/src/Sir.Search/Session/SearchSession.cs +++ b/src/Sir.Search/Session/SearchSession.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.Logging; -using Sir.VectorSpace; using System; using System.Collections.Generic; using System.Diagnostics; diff --git a/src/Sir.Search/Sir.Search.csproj b/src/Sir.Search/Sir.Search.csproj index 0ade786b..3d453548 100644 --- a/src/Sir.Search/Sir.Search.csproj +++ b/src/Sir.Search/Sir.Search.csproj @@ -25,7 +25,6 @@ - diff --git a/src/Sir.VectorSpace/Term.cs b/src/Sir.Search/Term.cs similarity index 97% rename from src/Sir.VectorSpace/Term.cs rename to src/Sir.Search/Term.cs index 5261c2fc..9ffbaac4 100644 --- a/src/Sir.VectorSpace/Term.cs +++ b/src/Sir.Search/Term.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Sir.VectorSpace +namespace Sir.Search { [System.Diagnostics.DebuggerDisplay("{Key}:{Label}")] public class Term : BooleanStatement, ITerm diff --git a/src/Sir.Store.Tests/BagOfCharsModelTests.cs b/src/Sir.Store.Tests/BagOfCharsModelTests.cs index b656588d..11830b79 100644 --- a/src/Sir.Store.Tests/BagOfCharsModelTests.cs +++ b/src/Sir.Store.Tests/BagOfCharsModelTests.cs @@ -1,7 +1,6 @@ using Microsoft.Extensions.Logging; using NUnit.Framework; using Sir.Search; -using Sir.VectorSpace; using System; using System.Diagnostics; using System.IO; diff --git a/src/Sir.Store.Tests/ImageModelTests.cs b/src/Sir.Store.Tests/ImageModelTests.cs index 0944c586..8f26d39f 100644 --- a/src/Sir.Store.Tests/ImageModelTests.cs +++ b/src/Sir.Store.Tests/ImageModelTests.cs @@ -1,7 +1,6 @@ using NUnit.Framework; using Sir.Mnist; using Sir.Search; -using Sir.VectorSpace; using System; using System.Diagnostics; using System.IO; diff --git a/src/Sir.Store.Tests/IndexSessionTests.cs b/src/Sir.Store.Tests/IndexSessionTests.cs index 9c58dbaa..7ddf3aa2 100644 --- a/src/Sir.Store.Tests/IndexSessionTests.cs +++ b/src/Sir.Store.Tests/IndexSessionTests.cs @@ -2,7 +2,6 @@ using NUnit.Framework; using Sir.Documents; using Sir.Search; -using Sir.VectorSpace; using System; using System.Diagnostics; using System.Linq; diff --git a/src/Sir.Store.Tests/NGramModelTests.cs b/src/Sir.Store.Tests/NGramModelTests.cs index 4c4c4dff..2a7f5a3f 100644 --- a/src/Sir.Store.Tests/NGramModelTests.cs +++ b/src/Sir.Store.Tests/NGramModelTests.cs @@ -1,7 +1,6 @@ using Microsoft.Extensions.Logging; using NUnit.Framework; using Sir.Search; -using Sir.VectorSpace; using System; using System.Diagnostics; using System.IO; diff --git a/src/Sir.StringCompare/Program.cs b/src/Sir.StringCompare/Program.cs index a3d961a8..543a8d70 100644 --- a/src/Sir.StringCompare/Program.cs +++ b/src/Sir.StringCompare/Program.cs @@ -1,5 +1,4 @@ using Sir.Search; -using Sir.VectorSpace; using System; using System.Linq; diff --git a/src/Sir.WebFront/Features/CrawlJob.cs b/src/Sir.WebFront/Features/CrawlJob.cs index 5a4a6d56..59ed2b30 100644 --- a/src/Sir.WebFront/Features/CrawlJob.cs +++ b/src/Sir.WebFront/Features/CrawlJob.cs @@ -9,7 +9,6 @@ using System.Threading; using Microsoft.Extensions.Logging; using Sir.Search; -using Sir.VectorSpace; namespace Sir.HttpServer.Features { diff --git a/src/Sir.WebFront/Features/SaveAsJob.cs b/src/Sir.WebFront/Features/SaveAsJob.cs index 6cfbacd0..18b0d81f 100644 --- a/src/Sir.WebFront/Features/SaveAsJob.cs +++ b/src/Sir.WebFront/Features/SaveAsJob.cs @@ -3,7 +3,6 @@ using Microsoft.Extensions.Logging; using Sir.Documents; using Sir.Search; -using Sir.VectorSpace; namespace Sir.HttpServer.Features { diff --git a/src/Sir.WebFront/HttpQueryParser.cs b/src/Sir.WebFront/HttpQueryParser.cs index 67a9e8ae..e902734a 100644 --- a/src/Sir.WebFront/HttpQueryParser.cs +++ b/src/Sir.WebFront/HttpQueryParser.cs @@ -1,7 +1,6 @@ using Microsoft.AspNetCore.Http; using Newtonsoft.Json; using Sir.Search; -using Sir.VectorSpace; using System.Collections.Generic; using System.Dynamic; using System.IO; diff --git a/src/Sir.Wikipedia/IndexWikipediaCommand.cs b/src/Sir.Wikipedia/IndexWikipediaCommand.cs index 0ca38c9c..4b6c4c2b 100644 --- a/src/Sir.Wikipedia/IndexWikipediaCommand.cs +++ b/src/Sir.Wikipedia/IndexWikipediaCommand.cs @@ -1,7 +1,6 @@ using Microsoft.Extensions.Logging; using Sir.Documents; using Sir.Search; -using Sir.VectorSpace; using System.Collections.Generic; using System.IO; diff --git a/src/Sir.sln b/src/Sir.sln index ef2451c2..a56a7041 100644 --- a/src/Sir.sln +++ b/src/Sir.sln @@ -41,8 +41,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sir.WebFront", "Sir.WebFron EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sir.Search", "Sir.Search\Sir.Search.csproj", "{AB275A5B-E72E-475A-8E1A-FFA7A5F9C932}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sir.VectorSpace", "Sir.VectorSpace\Sir.VectorSpace.csproj", "{9791D56B-F5A5-448D-A615-612585CA6C37}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sir.StringCompare", "Sir.StringCompare\Sir.StringCompare.csproj", "{C6050E65-9411-41E3-A6EE-0A45E6FFB4FC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sir.Cmd", "Sir.Cmd\Sir.Cmd.csproj", "{CEDD3CA9-D38D-43BF-9013-212AE6332CE0}" @@ -97,10 +95,6 @@ Global {AB275A5B-E72E-475A-8E1A-FFA7A5F9C932}.Debug|Any CPU.Build.0 = Debug|Any CPU {AB275A5B-E72E-475A-8E1A-FFA7A5F9C932}.Release|Any CPU.ActiveCfg = Release|Any CPU {AB275A5B-E72E-475A-8E1A-FFA7A5F9C932}.Release|Any CPU.Build.0 = Release|Any CPU - {9791D56B-F5A5-448D-A615-612585CA6C37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9791D56B-F5A5-448D-A615-612585CA6C37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9791D56B-F5A5-448D-A615-612585CA6C37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9791D56B-F5A5-448D-A615-612585CA6C37}.Release|Any CPU.Build.0 = Release|Any CPU {C6050E65-9411-41E3-A6EE-0A45E6FFB4FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C6050E65-9411-41E3-A6EE-0A45E6FFB4FC}.Debug|Any CPU.Build.0 = Debug|Any CPU {C6050E65-9411-41E3-A6EE-0A45E6FFB4FC}.Release|Any CPU.ActiveCfg = Release|Any CPU