Skip to content

Commit bc1b0a9

Browse files
AndMuAndMu
authored
Merge pull request #7 from AndMu/feature/Training
Feature/training
2 parents 9175415 + 1db4b3e commit bc1b0a9

File tree

10 files changed

+84
-77
lines changed

10 files changed

+84
-77
lines changed

‎src/Sentiment/Wikiled.Sentiment.AcceptanceTests/Wikiled.Sentiment.AcceptanceTests.csproj‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,30 @@
77

88
<ItemGroup>
99
<PackageReference Include="Accord.MachineLearning" Version="3.8.0" />
10-
<PackageReference Include="Moq" Version="4.13.0" />
10+
<PackageReference Include="Moq" Version="4.13.1" />
1111
<PackageReference Include="Newtonsoft.Json" version="12.0.2" />
1212
<PackageReference Include="NLog" version="4.6.7" />
13-
<PackageReference Include="NLog.Extensions.Logging" Version="1.5.4" />
13+
<PackageReference Include="NLog.Extensions.Logging" Version="1.6.1" />
1414
<PackageReference Include="NUnit" version="3.12.0" />
1515
<PackageReference Include="Polly" version="7.1.1" />
16-
<PackageReference Include="protobuf-net" version="2.4.0" />
1716
<PackageReference Include="Snappy.NET" version="1.1.1.8" />
1817
<PackageReference Include="StackExchange.Redis" Version="2.0.601" />
19-
<PackageReference Include="System.Reactive" version="4.1.6" />
20-
<PackageReference Include="System.Reactive.Core" version="4.1.6" />
21-
<PackageReference Include="System.Reactive.Interfaces" version="4.1.6" />
22-
<PackageReference Include="System.Reactive.Linq" version="4.1.6" />
23-
<PackageReference Include="System.Reactive.PlatformServices" version="4.1.6" />
18+
<PackageReference Include="System.Reactive" version="4.2.0" />
19+
<PackageReference Include="System.Reactive.Core" version="4.2.0" />
20+
<PackageReference Include="System.Reactive.Interfaces" version="4.2.0" />
21+
<PackageReference Include="System.Reactive.Linq" version="4.2.0" />
22+
<PackageReference Include="System.Reactive.PlatformServices" version="4.2.0" />
2423
<PackageReference Include="System.ValueTuple" version="4.5.0" />
2524
<PackageReference Include="Wikiled.Amazon" version="1.1.3" />
2625
<PackageReference Include="Wikiled.Arff" version="2.2.24" />
2726
<PackageReference Include="Wikiled.Common" Version="1.1.9" />
28-
<PackageReference Include="Wikiled.MachineLearning" version="2.4.22" />
29-
<PackageReference Include="Wikiled.Redis" version="3.5.32" />
27+
<PackageReference Include="Wikiled.MachineLearning" version="2.4.25" />
28+
<PackageReference Include="Wikiled.Redis" version="3.5.60" />
3029
<PackageReference Include="Wikiled.Text.Analysis" version="1.7.23" />
3130
<packagereference Include="Microsoft.NET.Test.Sdk" Version="16.3.0"></packagereference>
3231
<packagereference Include="NUnit3TestAdapter" Version="3.15.1" />
33-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
34-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.2.0" />
32+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.0.0" />
33+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.0.0" />
3534
</ItemGroup>
3635

3736

‎src/Sentiment/Wikiled.Sentiment.Analysis.Tests/Wikiled.Sentiment.Analysis.Tests.csproj‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,23 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Reactive.Testing" version="4.1.6" />
10-
<PackageReference Include="Moq" Version="4.13.0" />
9+
<PackageReference Include="Microsoft.Reactive.Testing" version="4.2.0" />
10+
<PackageReference Include="Moq" Version="4.13.1" />
1111
<PackageReference Include="Newtonsoft.Json" version="12.0.2" />
1212
<PackageReference Include="NLog" version="4.6.7" />
1313
<PackageReference Include="NUnit" version="3.12.0" />
1414
<PackageReference Include="Polly" version="7.1.1" />
15-
<PackageReference Include="protobuf-net" version="2.4.0" />
1615
<PackageReference Include="StackExchange.Redis" Version="2.0.601" />
17-
<PackageReference Include="System.Reactive" version="4.1.6" />
18-
<PackageReference Include="System.Reactive.Core" version="4.1.6" />
19-
<PackageReference Include="System.Reactive.Interfaces" version="4.1.6" />
20-
<PackageReference Include="System.Reactive.Linq" version="4.1.6" />
21-
<PackageReference Include="System.Reactive.PlatformServices" version="4.1.6" />
16+
<PackageReference Include="System.Reactive" version="4.2.0" />
17+
<PackageReference Include="System.Reactive.Core" version="4.2.0" />
18+
<PackageReference Include="System.Reactive.Interfaces" version="4.2.0" />
19+
<PackageReference Include="System.Reactive.Linq" version="4.2.0" />
20+
<PackageReference Include="System.Reactive.PlatformServices" version="4.2.0" />
2221
<PackageReference Include="System.ValueTuple" version="4.5.0" />
2322
<PackageReference Include="Wikiled.Arff" version="2.2.24" />
2423
<PackageReference Include="Wikiled.Common" Version="1.1.9" />
25-
<PackageReference Include="Wikiled.MachineLearning" version="2.4.22" />
26-
<PackageReference Include="Wikiled.Redis" version="3.5.32" />
24+
<PackageReference Include="Wikiled.MachineLearning" version="2.4.25" />
25+
<PackageReference Include="Wikiled.Redis" version="3.5.60" />
2726
<PackageReference Include="Wikiled.Text.Analysis" version="1.7.23" />
2827
<packagereference Include="Microsoft.NET.Test.Sdk" Version="16.3.0"></packagereference>
2928
<packagereference Include="NUnit3TestAdapter" Version="3.15.1" />

‎src/Sentiment/Wikiled.Sentiment.Analysis/Processing/ITestingClient.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Threading.Tasks;
23
using Wikiled.MachineLearning.Mathematics;
34
using Wikiled.Sentiment.Analysis.Pipeline;
45
using Wikiled.Sentiment.Text.Aspects;
@@ -43,6 +44,8 @@ public interface ITestingClient
4344

4445
IObservable<ProcessingContext> Process(IObservable<IParsedDocumentHolder> reviews);
4546

47+
Task<ProcessingContext> Process(IParsedDocumentHolder review);
48+
4649
void Save(string path);
4750
}
4851
}

‎src/Sentiment/Wikiled.Sentiment.Analysis/Processing/TestingClient.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.IO;
44
using System.Reactive.Linq;
55
using System.Threading;
6+
using System.Threading.Tasks;
67
using System.Xml.Linq;
78
using Wikiled.Arff.Extensions;
89
using Wikiled.Arff.Logic;
@@ -140,6 +141,17 @@ public IObservable<ProcessingContext> Process(IObservable<IParsedDocumentHolder>
140141
return documentSelector;
141142
}
142143

144+
public async Task<ProcessingContext> Process(IParsedDocumentHolder review)
145+
{
146+
if (review == null)
147+
{
148+
throw new ArgumentNullException(nameof(review));
149+
}
150+
151+
var result = await Process(Observable.Never<IParsedDocumentHolder>().StartWith(review));
152+
return result;
153+
}
154+
143155
public void Save(string path)
144156
{
145157
path.EnsureDirectoryExistence();

‎src/Sentiment/Wikiled.Sentiment.Analysis/Wikiled.Sentiment.Analysis.csproj‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,18 @@
2424
<PackageReference Include="CsvHelper" version="12.1.2" />
2525
<PackageReference Include="Newtonsoft.Json" version="12.0.2" />
2626
<PackageReference Include="Polly" version="7.1.1" />
27-
<PackageReference Include="protobuf-net" version="2.4.0" />
2827
<PackageReference Include="StackExchange.Redis" Version="2.0.601" />
29-
<PackageReference Include="System.Reactive" version="4.1.6" />
30-
<PackageReference Include="System.Reactive.Core" version="4.1.6" />
31-
<PackageReference Include="System.Reactive.Interfaces" version="4.1.6" />
32-
<PackageReference Include="System.Reactive.Linq" version="4.1.6" />
33-
<PackageReference Include="System.Reactive.PlatformServices" version="4.1.6" />
28+
<PackageReference Include="System.Reactive" version="4.2.0" />
29+
<PackageReference Include="System.Reactive.Core" version="4.2.0" />
30+
<PackageReference Include="System.Reactive.Interfaces" version="4.2.0" />
31+
<PackageReference Include="System.Reactive.Linq" version="4.2.0" />
32+
<PackageReference Include="System.Reactive.PlatformServices" version="4.2.0" />
3433
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
3534
<PackageReference Include="System.ValueTuple" version="4.5.0" />
3635
<PackageReference Include="Wikiled.Arff" version="2.2.24" />
3736
<PackageReference Include="Wikiled.Common" Version="1.1.9" />
38-
<PackageReference Include="Wikiled.MachineLearning" version="2.4.22" />
39-
<PackageReference Include="Wikiled.Redis" version="3.5.32" />
37+
<PackageReference Include="Wikiled.MachineLearning" version="2.4.25" />
38+
<PackageReference Include="Wikiled.Redis" version="3.5.60" />
4039
<PackageReference Include="Wikiled.Text.Analysis" version="1.7.23" />
4140
<PackageReference Include="Wikiled.Text.Inquirer" version="1.2.25" />
4241
</ItemGroup>

‎src/Sentiment/Wikiled.Sentiment.Integration.Tests/Wikiled.Sentiment.Integration.Tests.csproj‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,20 @@
77

88
<ItemGroup>
99
<PackageReference Include="Accord.MachineLearning" Version="3.8.0" />
10-
<PackageReference Include="Moq" Version="4.13.0" />
10+
<PackageReference Include="Moq" Version="4.13.1" />
1111
<PackageReference Include="Newtonsoft.Json" version="12.0.2" />
1212
<PackageReference Include="NLog" version="4.6.7" />
1313
<PackageReference Include="NUnit" version="3.12.0" />
1414
<PackageReference Include="Polly" version="7.1.1" />
15-
<PackageReference Include="protobuf-net" version="2.4.0" />
1615
<PackageReference Include="StackExchange.Redis" Version="2.0.601" />
17-
<PackageReference Include="System.Reactive" version="4.1.6" />
18-
<PackageReference Include="System.Reactive.Core" version="4.1.6" />
19-
<PackageReference Include="System.Reactive.Interfaces" version="4.1.6" />
20-
<PackageReference Include="System.Reactive.Linq" version="4.1.6" />
21-
<PackageReference Include="System.Reactive.PlatformServices" version="4.1.6" />
16+
<PackageReference Include="System.Reactive" version="4.2.0" />
17+
<PackageReference Include="System.Reactive.Core" version="4.2.0" />
18+
<PackageReference Include="System.Reactive.Interfaces" version="4.2.0" />
19+
<PackageReference Include="System.Reactive.Linq" version="4.2.0" />
20+
<PackageReference Include="System.Reactive.PlatformServices" version="4.2.0" />
2221
<PackageReference Include="System.ValueTuple" version="4.5.0" />
2322
<PackageReference Include="Wikiled.Arff" version="2.2.24" />
24-
<PackageReference Include="Wikiled.Redis" version="3.5.32" />
23+
<PackageReference Include="Wikiled.Redis" version="3.5.60" />
2524
<PackageReference Include="Wikiled.RedisInside" Version="3.2.101.34" />
2625
<PackageReference Include="Wikiled.Text.Analysis" version="1.7.23" />
2726
<packagereference Include="Microsoft.NET.Test.Sdk" Version="16.3.0"></packagereference>

‎src/Sentiment/Wikiled.Sentiment.TestLogic.Shared/Wikiled.Sentiment.TestLogic.Shared.csproj‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,24 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Moq" Version="4.13.0" />
12+
<PackageReference Include="Moq" Version="4.13.1" />
1313
<PackageReference Include="Newtonsoft.Json" version="12.0.2" />
1414
<PackageReference Include="NLog" version="4.6.7" />
1515
<PackageReference Include="NUnit" version="3.12.0" />
1616
<PackageReference Include="Polly" version="7.1.1" />
17-
<PackageReference Include="protobuf-net" version="2.4.0" />
1817
<PackageReference Include="StackExchange.Redis" Version="2.0.601" />
19-
<PackageReference Include="System.Reactive" version="4.1.6" />
20-
<PackageReference Include="System.Reactive.Core" version="4.1.6" />
21-
<PackageReference Include="System.Reactive.Interfaces" version="4.1.6" />
22-
<PackageReference Include="System.Reactive.Linq" version="4.1.6" />
23-
<PackageReference Include="System.Reactive.PlatformServices" version="4.1.6" />
18+
<PackageReference Include="System.Reactive" version="4.2.0" />
19+
<PackageReference Include="System.Reactive.Core" version="4.2.0" />
20+
<PackageReference Include="System.Reactive.Interfaces" version="4.2.0" />
21+
<PackageReference Include="System.Reactive.Linq" version="4.2.0" />
22+
<PackageReference Include="System.Reactive.PlatformServices" version="4.2.0" />
2423
<PackageReference Include="System.ValueTuple" version="4.5.0" />
2524
<PackageReference Include="Wikiled.Arff" version="2.2.24" />
26-
<PackageReference Include="Wikiled.Redis" version="3.5.32" />
25+
<PackageReference Include="Wikiled.Redis" version="3.5.60" />
2726
<PackageReference Include="Wikiled.Text.Analysis" version="1.7.23" />
2827
<PackageReference Include="Wikiled.Text.Inquirer" version="1.2.25" />
29-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
30-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.2.0" />
28+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.0.0" />
3130
</ItemGroup>
3231

3332
<ItemGroup>

‎src/Sentiment/Wikiled.Sentiment.Text.Tests/Wikiled.Sentiment.Text.Tests.csproj‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,22 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Accord.MachineLearning" Version="3.8.0" />
14-
<PackageReference Include="Moq" Version="4.13.0" />
14+
<PackageReference Include="Moq" Version="4.13.1" />
1515
<PackageReference Include="Newtonsoft.Json" version="12.0.2" />
1616
<PackageReference Include="NLog" version="4.6.7" />
1717
<PackageReference Include="NUnit" version="3.12.0" />
1818
<PackageReference Include="Polly" version="7.1.1" />
19-
<PackageReference Include="protobuf-net" version="2.4.0" />
2019
<PackageReference Include="StackExchange.Redis" Version="2.0.601" />
21-
<PackageReference Include="System.Reactive" version="4.1.6" />
22-
<PackageReference Include="System.Reactive.Core" version="4.1.6" />
23-
<PackageReference Include="System.Reactive.Interfaces" version="4.1.6" />
24-
<PackageReference Include="System.Reactive.Linq" version="4.1.6" />
25-
<PackageReference Include="System.Reactive.PlatformServices" version="4.1.6" />
20+
<PackageReference Include="System.Reactive" version="4.2.0" />
21+
<PackageReference Include="System.Reactive.Core" version="4.2.0" />
22+
<PackageReference Include="System.Reactive.Interfaces" version="4.2.0" />
23+
<PackageReference Include="System.Reactive.Linq" version="4.2.0" />
24+
<PackageReference Include="System.Reactive.PlatformServices" version="4.2.0" />
2625
<PackageReference Include="System.ValueTuple" version="4.5.0" />
2726
<PackageReference Include="Wikiled.Arff" version="2.2.24" />
2827
<PackageReference Include="Wikiled.Common" Version="1.1.9" />
29-
<PackageReference Include="Wikiled.MachineLearning" version="2.4.22" />
30-
<PackageReference Include="Wikiled.Redis" version="3.5.32" />
28+
<PackageReference Include="Wikiled.MachineLearning" version="2.4.25" />
29+
<PackageReference Include="Wikiled.Redis" version="3.5.60" />
3130
<PackageReference Include="Wikiled.Text.Analysis" version="1.7.23" />
3231
<PackageReference Include="Wikiled.Text.Inquirer" version="1.2.25" />
3332
<packagereference Include="Microsoft.NET.Test.Sdk" Version="16.3.0"></packagereference>

‎src/Sentiment/Wikiled.Sentiment.Text/Wikiled.Sentiment.Text.csproj‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,25 @@
1616
<ItemGroup>
1717
<PackageReference Include="Accord.MachineLearning" Version="3.8.0" />
1818
<PackageReference Include="morelinq" Version="3.2.0" />
19-
<PackageReference Include="MathNet.Numerics" Version="4.8.1" />
19+
<PackageReference Include="MathNet.Numerics" Version="4.9.0" />
2020
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
2121
<PackageReference Include="Polly" Version="7.1.1" />
22-
<PackageReference Include="protobuf-net" Version="2.4.0" />
2322
<PackageReference Include="SharpZipLib" Version="1.2.0" />
2423
<PackageReference Include="StackExchange.Redis" Version="2.0.601" />
2524
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
26-
<PackageReference Include="System.Reactive" Version="4.1.6" />
27-
<PackageReference Include="System.Reactive.Core" Version="4.1.6" />
28-
<PackageReference Include="System.Reactive.Interfaces" Version="4.1.6" />
29-
<PackageReference Include="System.Reactive.Linq" Version="4.1.6" />
30-
<PackageReference Include="System.Reactive.PlatformServices" Version="4.1.6" />
25+
<PackageReference Include="System.Reactive" Version="4.2.0" />
26+
<PackageReference Include="System.Reactive.Core" Version="4.2.0" />
27+
<PackageReference Include="System.Reactive.Interfaces" Version="4.2.0" />
28+
<PackageReference Include="System.Reactive.Linq" Version="4.2.0" />
29+
<PackageReference Include="System.Reactive.PlatformServices" Version="4.2.0" />
3130
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
3231
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
3332
<PackageReference Include="Wikiled.Arff" Version="2.2.24" />
3433
<PackageReference Include="Wikiled.Common" Version="1.1.9" />
35-
<PackageReference Include="Wikiled.Common.Utilities" Version="1.2.18" />
36-
<PackageReference Include="Wikiled.MachineLearning" Version="2.4.22" />
34+
<PackageReference Include="Wikiled.Common.Utilities" Version="1.2.22" />
35+
<PackageReference Include="Wikiled.MachineLearning" Version="2.4.25" />
3736
<PackageReference Include="Knuppe.SharpNL" Version="1.3.0" />
38-
<PackageReference Include="Wikiled.Redis" Version="3.5.32" />
37+
<PackageReference Include="Wikiled.Redis" Version="3.5.60" />
3938
<PackageReference Include="Wikiled.Text.Analysis" Version="1.7.23" />
4039
<PackageReference Include="Wikiled.Text.Inquirer" Version="1.2.25" />
4140
</ItemGroup>

‎src/Utilities/Wikiled.Sentiment.ConsoleApp/Wikiled.Sentiment.ConsoleApp.csproj‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,22 @@
2020
<PackageReference Include="CsvHelper" version="12.1.2" />
2121
<PackageReference Include="Newtonsoft.Json" version="12.0.2" />
2222
<PackageReference Include="NLog" version="4.6.7" />
23-
<PackageReference Include="NLog.Extensions.Logging" Version="1.5.4" />
23+
<PackageReference Include="NLog.Extensions.Logging" Version="1.6.1" />
2424
<PackageReference Include="Polly" version="7.1.1" />
25-
<PackageReference Include="protobuf-net" version="2.4.0" />
2625
<PackageReference Include="StackExchange.Redis" Version="2.0.601" />
27-
<PackageReference Include="System.Reactive" version="4.1.6" />
28-
<PackageReference Include="System.Reactive.Core" version="4.1.6" />
29-
<PackageReference Include="System.Reactive.Interfaces" version="4.1.6" />
30-
<PackageReference Include="System.Reactive.Linq" version="4.1.6" />
31-
<PackageReference Include="System.Reactive.PlatformServices" version="4.1.6" />
26+
<PackageReference Include="System.Reactive" version="4.2.0" />
27+
<PackageReference Include="System.Reactive.Core" version="4.2.0" />
28+
<PackageReference Include="System.Reactive.Interfaces" version="4.2.0" />
29+
<PackageReference Include="System.Reactive.Linq" version="4.2.0" />
30+
<PackageReference Include="System.Reactive.PlatformServices" version="4.2.0" />
3231
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
3332
<PackageReference Include="System.ValueTuple" version="4.5.0" />
3433
<PackageReference Include="Wikiled.Arff" version="2.2.24" />
3534
<PackageReference Include="Wikiled.Common" Version="1.1.9" />
36-
<PackageReference Include="Wikiled.Common.Utilities" Version="1.2.18" />
35+
<PackageReference Include="Wikiled.Common.Utilities" Version="1.2.22" />
3736
<PackageReference Include="Wikiled.Console" Version="1.4.5" />
38-
<PackageReference Include="Wikiled.MachineLearning" version="2.4.22" />
39-
<PackageReference Include="Wikiled.Redis" version="3.5.32" />
37+
<PackageReference Include="Wikiled.MachineLearning" version="2.4.25" />
38+
<PackageReference Include="Wikiled.Redis" version="3.5.60" />
4039
<PackageReference Include="Wikiled.Text.Analysis" version="1.7.23" />
4140
<PackageReference Include="Wikiled.Text.Inquirer" version="1.2.25" />
4241

0 commit comments

Comments
 (0)