Skip to content

Fix LT-22241: User Disapproved analyses should be included #335

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

Merged
jtmaxwell3 merged 2 commits into from
Aug 6, 2025
Merged

Fix LT-22241: User Disapproved analyses should be included #335

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ff9dc5
Fix LT-22241: User Disapproved analyses should be included
jtmaxwell3 Aug 5, 2025
e9950b8
Merge branch 'master' into LT-22241
jtmaxwell3 Aug 6, 2025
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: 6 additions & 3 deletions src/SIL.LCModel/DomainServices/AnalysisGuessServices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,12 @@ public bool UpdatingOccurrence(IAnalysis oldAnalysis, IAnalysis newAnalysis)
return result;
}

bool IsNotDisapproved(IWfiAnalysis wa)
bool IncludeAnalysis(IWfiAnalysis wa)
{
// Exclude human-disapproved analyses unless we are in Parsing Dev mode.
ICmAgentEvaluation cae = null;
if (PrioritizeParser)
return true;
foreach (var ae in wa.EvaluationsRC)
if (((ICmAgent)ae.Owner).Human)
cae = ae;
Expand Down Expand Up @@ -512,7 +515,7 @@ private IDictionary<IAnalysis, Dictionary<IAnalysis, PriorityCount>> GetAnalysis
// Include analyses that may not have been selected.
foreach (IWfiAnalysis analysis in wordform.AnalysesOC)
{
if (IsNotDisapproved(analysis))
if (IncludeAnalysis(analysis))
{
// Human takes priority over parser which takes priority over computer.
// Approved takes priority over disapproved.
Expand All @@ -538,7 +541,7 @@ private Dictionary<IAnalysis, Dictionary<IAnalysis, PriorityCount>> GetGlossCoun
{
var counts = new Dictionary<IAnalysis, Dictionary<IAnalysis, PriorityCount>>();
var segs = new HashSet<ISegment>();
if (!IsNotDisapproved(analysis))
if (!IncludeAnalysis(analysis))
return counts;
foreach (ISegment seg in analysis.Wordform.OccurrencesInTexts)
{
Expand Down
Loading