Skip to content

141 Add in accepted variables even if not in current #142

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
par456 merged 2 commits into from
Apr 13, 2026
Merged

141 Add in accepted variables even if not in current #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25bce25
Add in accepted variables even if not in current
par456 Apr 13, 2026
5c7c6e8
Check nulls
par456 Apr 13, 2026
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
14 changes: 7 additions & 7 deletions APSIM.POStats.Shared/Comparison/ApsimFileComparison.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ private List<TableComparison> GetTables()
var acceptedTable = Accepted?.Tables.Find(t => t.Name == currentTable.Name);
tables.Add(new TableComparison(currentTable, acceptedTable));
}
}

// Add in tables that are in the accepted file but not in the current file.
if (Accepted != null)
{
var tablesNotInCurrent = Accepted.Tables.Except(tables.Select(t => t.Accepted));
foreach (var acceptedTable in tablesNotInCurrent)
tables.Add(new TableComparison(null, acceptedTable));
}
// Add in tables that are in the accepted file but not in the current file.
if (Accepted != null && Accepted.Tables != null)
{
var tablesNotInCurrent = Accepted.Tables.Except(tables.Select(t => t.Accepted));
foreach (var acceptedTable in tablesNotInCurrent)
tables.Add(new TableComparison(null, acceptedTable));
}

return tables.OrderBy(t => t.Name).ToList();
Expand Down
16 changes: 8 additions & 8 deletions APSIM.POStats.Shared/Comparison/TableComparison.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ private List<VariableComparison> GetVariables()
matchingAcceptedVariables.Add(acceptedVariable);
variables.Add(new VariableComparison(currentVariable, acceptedVariable));
}

// Add in variables that are in the accepted table but not in the current table.
if (Accepted != null)
{
var variablesNotInCurrent = Accepted.Variables.Except(matchingAcceptedVariables);
foreach (var acceptedTable in variablesNotInCurrent)
variables.Add(new VariableComparison(null, acceptedTable));
}
}
// Add in variables that are in the accepted table but not in the current table.
if (Accepted != null && Accepted.Variables != null)
{
var variablesNotInCurrent = Accepted.Variables.Except(matchingAcceptedVariables);
foreach (var acceptedTable in variablesNotInCurrent)
variables.Add(new VariableComparison(null, acceptedTable));
}

return variables.OrderBy(v => v.Name).ToList();
}
}
Expand Down
Loading