Skip to content

Use correct corpus versification for chapter calculation #1021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pmachapman wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −16
Open

Use correct corpus versification for chapter calculation #1021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions src/Serval/src/Serval.Translation/Services/ContractMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,6 @@ private IReadOnlyList<ParallelCorpusContract> Map(Build build, IReadOnlyList<Par
TrainingCorpus? trainingCorpus = trainingCorpora?.GetValueOrDefault(source.Id);
PretranslateCorpus? pretranslateCorpus = pretranslateCorpora?.GetValueOrDefault(source.Id);

string? referenceFileLocation =
source.TargetCorpora.Count > 0 && source.TargetCorpora[0].Files.Count > 0
? Map(source.TargetCorpora[0].Files[0]).Location
: null;

mappedParallelCorpora.Add(
new ParallelCorpusContract
{
Expand All @@ -171,7 +166,6 @@ .. source.SourceCorpora.Select(sc =>
sc,
trainingCorpus?.SourceFilters?.Where(sf => sf.CorpusRef == sc.Id).FirstOrDefault(),
pretranslateCorpus?.SourceFilters?.Where(sf => sf.CorpusRef == sc.Id).FirstOrDefault(),
referenceFileLocation,
trainOnAllCorpora
|| (trainingCorpus is not null && trainingCorpus.SourceFilters is null),
pretranslateAllCorpora
Expand All @@ -187,7 +181,6 @@ .. source.TargetCorpora.Select(tc =>
tc,
trainingCorpus?.TargetFilters?.Where(sf => sf.CorpusRef == tc.Id).FirstOrDefault(),
null,
referenceFileLocation,
trainOnAllCorpora
|| (trainingCorpus is not null && trainingCorpus.TargetFilters is null),
pretranslateAllCorpora || pretranslateCorpus is not null
Expand All @@ -205,11 +198,11 @@ private MonolingualCorpusContract Map(
MonolingualCorpus inputCorpus,
ParallelCorpusFilter? trainingFilter,
ParallelCorpusFilter? pretranslateFilter,
string? referenceFileLocation,
bool trainOnAll,
bool pretranslateAll
)
{
string? referenceFileLocation = inputCorpus.Files.Count > 0 ? Map(inputCorpus.Files[0]).Location : null;
Dictionary<string, HashSet<int>>? trainOnChapters = null;
if (
trainingFilter is not null
Expand Down
9 changes: 1 addition & 8 deletions src/Serval/src/Serval.WordAlignment/Services/ContractMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ private IReadOnlyList<ParallelCorpusContract> Map(Build build, IReadOnlyList<Par
TrainingCorpus? trainingCorpus = trainingCorpora?.GetValueOrDefault(source.Id);
WordAlignmentCorpus? wordAlignOnCorpus = wordAlignOnCorpora?.GetValueOrDefault(source.Id);

string? referenceFileLocation =
source.TargetCorpora.Count > 0 && source.TargetCorpora[0].Files.Count > 0
? Map(source.TargetCorpora[0].Files[0]).Location
: null;

mappedParallelCorpora.Add(
new ParallelCorpusContract
{
Expand All @@ -54,7 +49,6 @@ .. source.SourceCorpora.Select(sc =>
sc,
trainingCorpus?.SourceFilters?.Where(sf => sf.CorpusRef == sc.Id).FirstOrDefault(),
wordAlignOnCorpus?.SourceFilters?.Where(sf => sf.CorpusRef == sc.Id).FirstOrDefault(),
referenceFileLocation,
trainOnAllCorpora
|| (trainingCorpus is not null && trainingCorpus.SourceFilters is null),
wordAlignOnAllCorpora
Expand All @@ -70,7 +64,6 @@ .. source.TargetCorpora.Select(tc =>
tc,
trainingCorpus?.TargetFilters?.Where(sf => sf.CorpusRef == tc.Id).FirstOrDefault(),
null,
referenceFileLocation,
trainOnAllCorpora
|| (trainingCorpus is not null && trainingCorpus.TargetFilters is null),
wordAlignOnAllCorpora || wordAlignOnCorpus is not null
Expand All @@ -88,11 +81,11 @@ private MonolingualCorpusContract Map(
MonolingualCorpus inputCorpus,
ParallelCorpusFilter? trainingFilter,
ParallelCorpusFilter? wordAlignmentFilter,
string? referenceFileLocation,
bool trainOnAll,
bool wordAlignOnAll
)
{
string? referenceFileLocation = inputCorpus.Files.Count > 0 ? Map(inputCorpus.Files[0]).Location : null;
Dictionary<string, HashSet<int>>? trainOnChapters = null;
if (
trainingFilter is not null
Expand Down
Loading