Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 10 additions & 5 deletions src/SIL.Machine/QualityEstimation/ChrF3QualityEstimator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ private List<ScriptureBookUsability> ComputeBookUsability(ScriptureBookScores bo
book,
label: BookThresholds.ReturnLabel(averageProbability),
usability: averageProbability,
projectedChrF3: score.ProjectedChrF3
projectedChrF3: score.ProjectedChrF3,
confidence: score.Confidence
)
);
}
Expand Down Expand Up @@ -136,7 +137,8 @@ private List<ScriptureChapterUsability> ComputeChapterUsability(ScriptureChapter
chapter,
label: ChapterThresholds.ReturnLabel(averageProbability),
usability: averageProbability,
projectedChrF3: score.ProjectedChrF3
projectedChrF3: score.ProjectedChrF3,
confidence: score.Confidence
)
);
}
Expand Down Expand Up @@ -170,7 +172,8 @@ ScriptureBookScores bookScores
scriptureRef: segmentScore.ScriptureRef,
label: SegmentThresholds.ReturnLabel(probability),
usability: probability,
projectedChrF3: segmentScore.ProjectedChrF3
projectedChrF3: segmentScore.ProjectedChrF3,
confidence: segmentScore.Confidence
)
);
}
Expand All @@ -193,7 +196,8 @@ TextScores textScores
segmentRef: segmentScore.SegmentRef,
label: SegmentThresholds.ReturnLabel(probability),
usability: probability,
projectedChrF3: segmentScore.ProjectedChrF3
projectedChrF3: segmentScore.ProjectedChrF3,
confidence: segmentScore.Confidence
)
);
}
Expand All @@ -217,7 +221,8 @@ private List<TextUsability> ComputeTextUsability(TextScores textScores)
textId,
label: BookThresholds.ReturnLabel(averageProbability),
usability: averageProbability,
projectedChrF3: score.ProjectedChrF3
projectedChrF3: score.ProjectedChrF3,
confidence: score.Confidence
)
);
}
Expand Down
10 changes: 8 additions & 2 deletions src/SIL.Machine/QualityEstimation/ScriptureBookUsability.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@
{
public class ScriptureBookUsability : UsabilityBase
{
public ScriptureBookUsability(string book, UsabilityLabel label, double projectedChrF3, double usability)
: base(label, projectedChrF3, usability)
public ScriptureBookUsability(
string book,
UsabilityLabel label,
double projectedChrF3,
double usability,
double confidence
)
: base(label, projectedChrF3, usability, confidence)
{
Book = book;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ public ScriptureChapterUsability(
int chapter,
UsabilityLabel label,
double projectedChrF3,
double usability
double usability,
double confidence
)
: base(book, label, projectedChrF3, usability)
: base(book, label, projectedChrF3, usability, confidence)
{
Chapter = chapter;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ public ScriptureSegmentUsability(
ScriptureRef scriptureRef,
UsabilityLabel label,
double projectedChrF3,
double usability
double usability,
double confidence
)
: base(scriptureRef.Book, scriptureRef.ChapterNum, label, projectedChrF3, usability)
: base(scriptureRef.Book, scriptureRef.ChapterNum, label, projectedChrF3, usability, confidence)
{
ScriptureRef = scriptureRef;
}
Expand Down
5 changes: 3 additions & 2 deletions src/SIL.Machine/QualityEstimation/TextSegmentUsability.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ public TextSegmentUsability(
MultiKeyRef segmentRef,
UsabilityLabel label,
double projectedChrF3,
double usability
double usability,
double confidence
)
: base(segmentRef.TextId, label, projectedChrF3, usability)
: base(segmentRef.TextId, label, projectedChrF3, usability, confidence)
{
SegmentRef = segmentRef;
}
Expand Down
10 changes: 8 additions & 2 deletions src/SIL.Machine/QualityEstimation/TextUsability.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@
{
public class TextUsability : UsabilityBase
{
public TextUsability(string textId, UsabilityLabel label, double projectedChrF3, double usability)
: base(label, projectedChrF3, usability)
public TextUsability(
string textId,
UsabilityLabel label,
double projectedChrF3,
double usability,
double confidence
)
: base(label, projectedChrF3, usability, confidence)
{
TextId = textId;
}
Expand Down
5 changes: 4 additions & 1 deletion src/SIL.Machine/QualityEstimation/UsabilityBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@
{
public abstract class UsabilityBase
{
protected UsabilityBase(UsabilityLabel label, double projectedChrF3, double usability)
protected UsabilityBase(UsabilityLabel label, double projectedChrF3, double usability, double confidence)
{
Confidence = confidence;
Label = label;
ProjectedChrF3 = projectedChrF3;
Usability = usability;
}

public double Confidence { get; }

public UsabilityLabel Label { get; }

public double ProjectedChrF3 { get; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class ChrF3QualityEstimatorTests
public void ChrF3QualityEstimator_TxtFiles()
{
var qualityEstimation = new ChrF3QualityEstimator(slope: 109.6145, intercept: -14.0633);
List<(MultiKeyRef Key, double Confidence)> confidences =
List<(MultiKeyRef key, double confidence)> confidences =
[
(new MultiKeyRef("MAT.txt", 1), 0.6020749899712906),
(new MultiKeyRef("MAT.txt", 2), 0.5416165991875662),
Expand All @@ -25,19 +25,24 @@ public void ChrF3QualityEstimator_TxtFiles()
Assert.That(usabilityTextSegments[0].Label, Is.EqualTo(UsabilityLabel.Green));
Assert.That(usabilityTextSegments[0].ProjectedChrF3, Is.EqualTo(51.93).Within(0.01));
Assert.That(usabilityTextSegments[0].Usability, Is.EqualTo(0.765).Within(0.001));
Assert.That(usabilityTextSegments[0].Confidence, Is.EqualTo(confidences[0].confidence).Within(0.001));
Assert.That(usabilityTextSegments[1].Label, Is.EqualTo(UsabilityLabel.Yellow));
Assert.That(usabilityTextSegments[1].ProjectedChrF3, Is.EqualTo(45.31).Within(0.01));
Assert.That(usabilityTextSegments[1].Usability, Is.EqualTo(0.691).Within(0.001));
Assert.That(usabilityTextSegments[1].Confidence, Is.EqualTo(confidences[1].confidence).Within(0.001));
Assert.That(usabilityTextSegments[2].Label, Is.EqualTo(UsabilityLabel.Red));
Assert.That(usabilityTextSegments[2].ProjectedChrF3, Is.EqualTo(30.14).Within(0.01));
Assert.That(usabilityTextSegments[2].Usability, Is.EqualTo(0.465).Within(0.001));
Assert.That(usabilityTextSegments[2].Confidence, Is.EqualTo(confidences[2].confidence).Within(0.001));
Assert.That(usabilityTexts, Has.Count.EqualTo(2));
Assert.That(usabilityTexts[0].Label, Is.EqualTo(UsabilityLabel.Yellow));
Assert.That(usabilityTexts[0].ProjectedChrF3, Is.EqualTo(48.53).Within(0.01));
Assert.That(usabilityTexts[0].Usability, Is.EqualTo(0.728).Within(0.001));
Assert.That(usabilityTexts[0].Confidence, Is.EqualTo(0.571).Within(0.001));
Assert.That(usabilityTexts[1].Label, Is.EqualTo(UsabilityLabel.Red));
Assert.That(usabilityTexts[1].ProjectedChrF3, Is.EqualTo(30.14).Within(0.01));
Assert.That(usabilityTexts[1].Usability, Is.EqualTo(0.465).Within(0.001));
Assert.That(usabilityTexts[1].Confidence, Is.EqualTo(confidences[2].confidence).Within(0.001));
}
}

Expand All @@ -62,23 +67,29 @@ List<ScriptureBookUsability> usabilityBooks
Assert.That(usabilitySegments[0].Label, Is.EqualTo(UsabilityLabel.Green));
Assert.That(usabilitySegments[0].ProjectedChrF3, Is.EqualTo(51.93).Within(0.01));
Assert.That(usabilitySegments[0].Usability, Is.EqualTo(0.765).Within(0.001));
Assert.That(usabilitySegments[0].Confidence, Is.EqualTo(confidences[0].confidence).Within(0.001));
Assert.That(usabilitySegments[1].Label, Is.EqualTo(UsabilityLabel.Yellow));
Assert.That(usabilitySegments[1].ProjectedChrF3, Is.EqualTo(45.31).Within(0.01));
Assert.That(usabilitySegments[1].Usability, Is.EqualTo(0.691).Within(0.001));
Assert.That(usabilitySegments[1].Confidence, Is.EqualTo(confidences[1].confidence).Within(0.001));
Assert.That(usabilitySegments[2].Label, Is.EqualTo(UsabilityLabel.Red));
Assert.That(usabilitySegments[2].ProjectedChrF3, Is.EqualTo(30.14).Within(0.01));
Assert.That(usabilitySegments[2].Usability, Is.EqualTo(0.465).Within(0.001));
Assert.That(usabilitySegments[2].Confidence, Is.EqualTo(confidences[2].confidence).Within(0.001));
Assert.That(usabilityChapters, Has.Count.EqualTo(2));
Assert.That(usabilityChapters[0].Label, Is.EqualTo(UsabilityLabel.Yellow));
Assert.That(usabilityChapters[0].ProjectedChrF3, Is.EqualTo(48.53).Within(0.01));
Assert.That(usabilityChapters[0].Usability, Is.EqualTo(0.728).Within(0.001));
Assert.That(usabilityChapters[0].Confidence, Is.EqualTo(0.571).Within(0.001));
Assert.That(usabilityChapters[1].Label, Is.EqualTo(UsabilityLabel.Red));
Assert.That(usabilityChapters[1].ProjectedChrF3, Is.EqualTo(30.14).Within(0.01));
Assert.That(usabilityChapters[1].Usability, Is.EqualTo(0.465).Within(0.001));
Assert.That(usabilityChapters[1].Confidence, Is.EqualTo(confidences[2].confidence).Within(0.001));
Assert.That(usabilityBooks, Has.Count.EqualTo(1));
Assert.That(usabilityBooks[0].Label, Is.EqualTo(UsabilityLabel.Yellow));
Assert.That(usabilityBooks[0].ProjectedChrF3, Is.EqualTo(41.68).Within(0.01));
Assert.That(usabilityBooks[0].Usability, Is.EqualTo(0.640).Within(0.001));
Assert.That(usabilityBooks[0].Confidence, Is.EqualTo(0.508).Within(0.001));
}
}
}
Loading