Skip to content

Commit 1950dc0

Browse files
committed
// 2022Q2
1 parent 9935ffa commit 1950dc0

File tree

246 files changed

+6652
-2633
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

246 files changed

+6652
-2633
lines changed

BitCutStudios.CorpusExplorer/BitCutStudios.CorpusExplorer.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
<ErrorReport>prompt</ErrorReport>
5151
</PropertyGroup>
5252
<ItemGroup>
53-
<Reference Include="HtmlAgilityPack, Version=1.11.39.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
54-
<HintPath>..\packages\HtmlAgilityPack.1.11.39\lib\Net45\HtmlAgilityPack.dll</HintPath>
53+
<Reference Include="HtmlAgilityPack, Version=1.11.42.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
54+
<HintPath>..\packages\HtmlAgilityPack.1.11.42\lib\Net45\HtmlAgilityPack.dll</HintPath>
5555
</Reference>
5656
<Reference Include="System" />
5757
<Reference Include="System.Core" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="HtmlAgilityPack" version="1.11.39" targetFramework="net461" />
3+
<package id="HtmlAgilityPack" version="1.11.42" targetFramework="net461" />
44
</packages>

CorpusExplorer.Core/CorpusExplorer.Core.csproj

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
<ErrorReport>prompt</ErrorReport>
5252
</PropertyGroup>
5353
<ItemGroup>
54-
<Reference Include="HtmlAgilityPack, Version=1.11.39.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
55-
<HintPath>..\packages\HtmlAgilityPack.1.11.39\lib\Net45\HtmlAgilityPack.dll</HintPath>
54+
<Reference Include="HtmlAgilityPack, Version=1.11.42.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
55+
<HintPath>..\packages\HtmlAgilityPack.1.11.42\lib\Net45\HtmlAgilityPack.dll</HintPath>
5656
</Reference>
5757
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5858
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -78,25 +78,29 @@
7878
<Reference Include="System.Xaml" />
7979
<Reference Include="System.Xml" />
8080
<Reference Include="System.Xml.Linq" />
81-
<Reference Include="Telerik.Windows.Documents.Core, Version=2021.1.118.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
81+
<Reference Include="Telerik.Windows.Documents, Version=2022.1.117.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
8282
<SpecificVersion>False</SpecificVersion>
83-
<HintPath>W:\Telerik\Telerik UI for WinForms R1 2021\Bin40\Telerik.Windows.Documents.Core.dll</HintPath>
83+
<HintPath>W:\Telerik\Telerik UI for WPF R1 2022\Binaries.NoXaml\WPF45\Telerik.Windows.Documents.dll</HintPath>
8484
</Reference>
85-
<Reference Include="Telerik.Windows.Documents.Fixed, Version=2021.1.118.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
85+
<Reference Include="Telerik.Windows.Documents.Core, Version=2022.1.106.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
8686
<SpecificVersion>False</SpecificVersion>
87-
<HintPath>W:\Telerik\Telerik UI for WinForms R1 2021\Bin40\Telerik.Windows.Documents.Fixed.dll</HintPath>
87+
<HintPath>W:\Telerik\Telerik UI for WPF R1 2022\Binaries.NoXaml\WPF45\Telerik.Windows.Documents.Core.dll</HintPath>
8888
</Reference>
89-
<Reference Include="Telerik.Windows.Documents.Flow, Version=2021.1.118.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
89+
<Reference Include="Telerik.Windows.Documents.Fixed, Version=2022.1.106.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
9090
<SpecificVersion>False</SpecificVersion>
91-
<HintPath>W:\Telerik\Telerik UI for WinForms R1 2021\Bin40\Telerik.Windows.Documents.Flow.dll</HintPath>
91+
<HintPath>W:\Telerik\Telerik UI for WPF R1 2022\Binaries.NoXaml\WPF45\Telerik.Windows.Documents.Fixed.dll</HintPath>
9292
</Reference>
93-
<Reference Include="Telerik.Windows.Documents.Flow.FormatProviders.Pdf, Version=2021.1.118.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
93+
<Reference Include="Telerik.Windows.Documents.Flow, Version=2022.1.106.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
9494
<SpecificVersion>False</SpecificVersion>
95-
<HintPath>W:\Telerik\Telerik UI for WinForms R1 2021\Bin40\Telerik.Windows.Documents.Flow.FormatProviders.Pdf.dll</HintPath>
95+
<HintPath>W:\Telerik\Telerik UI for WPF R1 2022\Binaries.NoXaml\WPF45\Telerik.Windows.Documents.Flow.dll</HintPath>
9696
</Reference>
97-
<Reference Include="Telerik.Windows.Zip, Version=2021.1.118.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
97+
<Reference Include="Telerik.Windows.Documents.Flow.FormatProviders.Pdf, Version=2022.1.106.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
9898
<SpecificVersion>False</SpecificVersion>
99-
<HintPath>W:\Telerik\Telerik UI for WinForms R1 2021\Bin40\Telerik.Windows.Zip.dll</HintPath>
99+
<HintPath>W:\Telerik\Telerik UI for WPF R1 2022\Binaries.NoXaml\WPF45\Telerik.Windows.Documents.Flow.FormatProviders.Pdf.dll</HintPath>
100+
</Reference>
101+
<Reference Include="Telerik.Windows.Zip, Version=2022.1.106.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
102+
<SpecificVersion>False</SpecificVersion>
103+
<HintPath>W:\Telerik\Telerik UI for WPF R1 2022\Binaries.NoXaml\WPF45\Telerik.Windows.Zip.dll</HintPath>
100104
</Reference>
101105
<Reference Include="WindowsBase" />
102106
</ItemGroup>

CorpusExplorer.Core/RepositoryManifest.cs

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -119,23 +119,25 @@ public class RepositoryManifest : AbstractAddonRepository
119119
public override IEnumerable<KeyValuePair<string, AbstractExporter>> AddonExporters =>
120120
new Dictionary<string, AbstractExporter>
121121
{
122-
{"JSON-Export (*.json)|*.json", new ExporterJson()},
123-
{"XML-Export (*.xml)|*.xml", new ExporterXml()},
124-
{"TLV-XML-Export (*.xml)|*.xml", new ExporterTlv()},
125-
{"CorpusExplorer v6 (*.cec6)|*.cec6", new ExporterCec6()},
126-
{"CorpusExplorer v6+GZIP (*.cec6.gz)|*.cec6.gz", new ExporterCec6 {UseCompression = true}},
127-
{"Plaintext-Export (*.txt)|*.txt", new ExporterPlaintext()},
128-
{"Plaintext-Export [Nur Wort-Layer] (*.txt)|*.txt", new ExporterPlaintextPure()},
129-
{"Plaintext-Export [Nur Wort-Layer - Eine Datei] (*.txt)|*.txt", new ExporterPlaintextPureInOneFile()},
130-
{"Einfacher HTML-Export [Nur Wort-Layer] (*.txt)|*.txt", new ExporterHtmlPure()},
131-
{"CSV-Export [Nur Metadatan] (*.csv)|*.csv", new ExporterCsvMetadataOnly()},
132-
{"CSV-Export [Metadaten + Wort-Layer] (*.csv)|*.csv", new ExporterCsv()},
133-
{"Abfragen-Export [Nur für Schnappschüsse] (*.ceusd)|*.ceusd", new ExporterQuery()},
134-
{"CoNLL (*.conll)|*.conll", new ExporterConll()},
135-
{"TreeTagger (*.treetagger)|*.treetagger", new ExporterTreeTagger()},
136-
{"TreeTagger + Satzgrenze (*.treetagger)|*.treetagger", new ExporterTreeTagger {UseSentenceTag = true}},
137-
{"CorpusWorkBench (*.vrt)|*.vrt", new ExporterCorpusWorkBench{UseSentenceTag = false}},
138-
{"CorpusWorkBench + Satzgrenze (*.vrt)|*.vrt", new ExporterCorpusWorkBench {UseSentenceTag = true}}
122+
{ "JSON-Export (*.json)|*.json", new ExporterJson() },
123+
{ "XML-Export (*.xml)|*.xml", new ExporterXml() },
124+
{ "TLV-XML-Export (*.xml)|*.xml", new ExporterTlv() },
125+
{ "CorpusExplorer v6 (*.cec6)|*.cec6", new ExporterCec6() },
126+
{ "CorpusExplorer v6 + LZ4 (*.cec6.lz4)|*.cec6.lz4", new ExporterCec6 { UseCompression = true } },
127+
{ "CorpusExplorer v6 + GZip (*.cec6.gz)|*.cec6.gz", new ExporterCec6 { UseCompression = true } },
128+
{ "Plaintext-Export (*.txt)|*.txt", new ExporterPlaintext() },
129+
{ "Plaintext-Export [Nur Wort-Layer] (*.txt)|*.txt", new ExporterPlaintextPure() },
130+
{ "Plaintext-Export [Nur Wort-Layer - Eine Datei] (*.txt)|*.txt", new ExporterPlaintextPureInOneFile() },
131+
{ "Einfacher HTML-Export [Nur Wort-Layer] (*.txt)|*.txt", new ExporterHtmlPure() },
132+
{ "CSV-Export [Nur Metadatan] (*.csv)|*.csv", new ExporterCsvMetadataOnly() },
133+
{ "CSV-Export [Metadaten + Wort-Layer] (*.csv)|*.csv", new ExporterCsv() },
134+
{ "Abfragen-Export [Nur für Schnappschüsse] (*.ceusd)|*.ceusd", new ExporterQuery() },
135+
{ "CoNLL (*.conll)|*.conll", new ExporterConll() },
136+
{ "TreeTagger (*.treetagger)|*.treetagger", new ExporterTreeTagger() },
137+
{ "TreeTagger + Satzgrenze (*.treetagger)|*.treetagger", new ExporterTreeTagger { UseSentenceTag = true } },
138+
{ "CorpusWorkBench (*.vrt)|*.vrt", new ExporterCorpusWorkBench { UseSentenceTag = false } },
139+
{ "CorpusWorkBench + Satzgrenze (*.vrt)|*.vrt", new ExporterCorpusWorkBench { UseSentenceTag = true } },
140+
{ "Sketch Engine VERT (*.vert)|*.vert", new ExporterSketchEngine() },
139141
};
140142

141143
/// <summary>
@@ -145,12 +147,13 @@ public class RepositoryManifest : AbstractAddonRepository
145147
public override IEnumerable<KeyValuePair<string, AbstractImporter>> AddonImporter =>
146148
new Dictionary<string, AbstractImporter>
147149
{
148-
{"CorpusExplorer v6 (*.cec6, *.cec6.gz)|*.cec6;*.cec6.gz", new ImporterCec6()},
150+
{"CorpusExplorer v6 (*.cec6, *.cec6.lz4, *.cec6.gz)|*.cec6;*.cec6.gz;*.cec6.lz4", new ImporterCec6()},
149151
{"CorpusExplorer v6 [STREAM] (*.cec6)|*.cec6", new ImporterCec6Stream()},
150152
{"TLV-XML (*.xml)|*.xml", new ImporterTlv()},
151153
{"CoNLL (*.conll)|*.conll", new ImporterConll()},
152154
{"TreeTagger (*.txt)|*.txt", new ImporterTreeTagger()},
153-
{"CorpusWorkBench VRT (*.vrt)|*.vrt", new ImporterCorpusWorkBench()}
155+
{"CorpusWorkBench VRT (*.vrt)|*.vrt", new ImporterCorpusWorkBench()},
156+
{"Sketch Engine VERT (*.vert)|*.vert", new ImporterSketchEngine()},
154157
};
155158

156159
/// <summary>
@@ -193,16 +196,18 @@ public class RepositoryManifest : AbstractAddonRepository
193196
new IAction[]
194197
{
195198
new BasicInformationAction(),
196-
199+
197200
new ClusterAction(),
198201
new ClusterListAction(),
199202
new ConvertAction(),
200203
new CooccurrenceAction(),
201204
new CooccurrenceCorrespondingAction(),
202205
new CooccurrenceCrossAction(),
203206
new CooccurrenceCrossFullAction(),
207+
new CooccurrencePolarisationAction(),
204208
new CooccurrenceProfileAction(),
205209
new CooccurrenceSelectedAction(),
210+
new CooccurrenceSelectedCorrespondingAction(),
206211
new CorrespondingValuesAction(),
207212
new CrossFrequencyAction(),
208213
new CrossFrequencyCorrespondingAction(),
@@ -216,7 +221,7 @@ public class RepositoryManifest : AbstractAddonRepository
216221
new DocumentTermFrequencyAction(),
217222

218223
new EditDistanceAction(),
219-
224+
220225
new Frequency1Action(),
221226
new Frequency1RawAction(),
222227
new Frequency1SelectAction(),
@@ -255,16 +260,22 @@ public class RepositoryManifest : AbstractAddonRepository
255260

256261
new NamedEntityAction(),
257262
new NGramAction(),
263+
new NGramCooccurrenceAction(),
258264
new NGramCorrespondingAction(),
259265
new NGramSelectedAction(),
266+
new NGramSelectedCooccurrenceAction(),
260267

261268
new PositionFrequencyAction(),
262269
new PositionFrequencyCorrespondingAction(),
263270

264271
new QueryAction(),
272+
new QueryCountAllTokenMatchesAction(),
273+
new QueryCountDocumentsAction(),
274+
new QueryCountSentencesAction(),
265275
new QueryListAction(),
266276

267277
new SentenceCountAction(),
278+
new SizeAction(),
268279
new StyleBurrowsDeltaAction(),
269280
new StyleNgramAction(),
270281

CorpusExplorer.Core/app.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@
3434
<assemblyIdentity name="PostSharp.Patterns.Common" publicKeyToken="e7f631e6ce13f078" culture="neutral" />
3535
<bindingRedirect oldVersion="0.0.0.0-6.0.27.0" newVersion="6.0.27.0" />
3636
</dependentAssembly>
37+
<dependentAssembly>
38+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
39+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
40+
</dependentAssembly>
41+
<dependentAssembly>
42+
<assemblyIdentity name="K4os.Hash.xxHash" publicKeyToken="32cd54395057cec3" culture="neutral" />
43+
<bindingRedirect oldVersion="0.0.0.0-1.0.7.0" newVersion="1.0.7.0" />
44+
</dependentAssembly>
3745
</assemblyBinding>
3846
</runtime>
3947
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>

CorpusExplorer.Core/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="HtmlAgilityPack" version="1.11.39" targetFramework="net461" />
4-
<package id="Microsoft.NETCore.Platforms" version="6.0.1" targetFramework="net461" />
3+
<package id="HtmlAgilityPack" version="1.11.42" targetFramework="net461" />
4+
<package id="Microsoft.NETCore.Platforms" version="6.0.3" targetFramework="net461" />
55
<package id="NETStandard.Library" version="2.0.3" targetFramework="net45" />
66
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
77
<package id="SharpSerializer" version="3.0.2" targetFramework="net461" />

CorpusExplorer.Port.TreeTaggerTrainer/App.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@
2929
<assemblyIdentity name="PostSharp.Patterns.Common" publicKeyToken="e7f631e6ce13f078" culture="neutral" />
3030
<bindingRedirect oldVersion="0.0.0.0-6.0.27.0" newVersion="6.0.27.0" />
3131
</dependentAssembly>
32+
<dependentAssembly>
33+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
34+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
35+
</dependentAssembly>
36+
<dependentAssembly>
37+
<assemblyIdentity name="K4os.Hash.xxHash" publicKeyToken="32cd54395057cec3" culture="neutral" />
38+
<bindingRedirect oldVersion="0.0.0.0-1.0.7.0" newVersion="1.0.7.0" />
39+
</dependentAssembly>
3240
</assemblyBinding>
3341
</runtime>
3442
</configuration>

CorpusExplorer.Sdk.Addon.Example/app.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@
4646
<assemblyIdentity name="PostSharp.Patterns.Common" publicKeyToken="e7f631e6ce13f078" culture="neutral" />
4747
<bindingRedirect oldVersion="0.0.0.0-6.0.27.0" newVersion="6.0.27.0" />
4848
</dependentAssembly>
49+
<dependentAssembly>
50+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
51+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
52+
</dependentAssembly>
53+
<dependentAssembly>
54+
<assemblyIdentity name="K4os.Hash.xxHash" publicKeyToken="32cd54395057cec3" culture="neutral" />
55+
<bindingRedirect oldVersion="0.0.0.0-1.0.7.0" newVersion="1.0.7.0" />
56+
</dependentAssembly>
4957
</assemblyBinding>
5058
</runtime>
5159
<startup>

CorpusExplorer.Sdk.Compatibility/app.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@
2626
<assemblyIdentity name="PostSharp.Patterns.Common" publicKeyToken="e7f631e6ce13f078" culture="neutral" />
2727
<bindingRedirect oldVersion="0.0.0.0-6.0.27.0" newVersion="6.0.27.0" />
2828
</dependentAssembly>
29+
<dependentAssembly>
30+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
31+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
32+
</dependentAssembly>
33+
<dependentAssembly>
34+
<assemblyIdentity name="K4os.Hash.xxHash" publicKeyToken="32cd54395057cec3" culture="neutral" />
35+
<bindingRedirect oldVersion="0.0.0.0-1.0.7.0" newVersion="1.0.7.0" />
36+
</dependentAssembly>
2937
</assemblyBinding>
3038
</runtime>
3139
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>

CorpusExplorer.Sdk.Db.Addon/CorpusExplorer.Sdk.Db.ElasticSearch.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@
4747
</PropertyGroup>
4848
<ItemGroup>
4949
<Reference Include="Elasticsearch.Net, Version=7.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
50-
<HintPath>..\packages\Elasticsearch.Net.7.16.0\lib\net461\Elasticsearch.Net.dll</HintPath>
50+
<HintPath>..\packages\Elasticsearch.Net.7.17.1\lib\net461\Elasticsearch.Net.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Microsoft.CSharp" />
5353
<Reference Include="Nest, Version=7.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
54-
<HintPath>..\packages\NEST.7.16.0\lib\net461\Nest.dll</HintPath>
54+
<HintPath>..\packages\NEST.7.17.1\lib\net461\Nest.dll</HintPath>
5555
</Reference>
5656
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5757
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>

0 commit comments

Comments
 (0)