Skip to content
Closed
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
5 changes: 4 additions & 1 deletion .github/workflows/validate-io-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:
- "Services/IoTesting/**"
- "tests/ARSAS.Tests/IoTest*"
- "tests/ARSAS.Tests/IoList*"
- "tests/ARSAS.Tests/IoFat*"
- "tests/ARSAS.Tests/FatDataSet*"
- "tests/ARSAS.Tests/FatScl*"
- "engines/ARIEC61850.lock.json"
- ".github/workflows/validate-io-testing.yml"
workflow_dispatch:
Expand Down Expand Up @@ -85,7 +88,7 @@ jobs:
if-no-files-found: error

- name: Run IO testing regression tests
run: dotnet test .\ARSAS\tests\ARSAS.Tests\ARSAS.Tests.csproj -c Release --no-build --no-restore --filter "FullyQualifiedName~IoTest|FullyQualifiedName~IoList" --logger "trx;LogFileName=io-testing-tests.trx" --results-directory .\ARSAS\TestResults
run: dotnet test .\ARSAS\tests\ARSAS.Tests\ARSAS.Tests.csproj -c Release --no-build --no-restore --filter "FullyQualifiedName~IoTest|FullyQualifiedName~IoList|FullyQualifiedName~IoFat|FullyQualifiedName~FatDataSet|FullyQualifiedName~FatScl" --logger "trx;LogFileName=io-testing-tests.trx" --results-directory .\ARSAS\TestResults

- name: Upload IO testing test results
if: always()
Expand Down
18 changes: 12 additions & 6 deletions Services/IoTesting/FatDataSetSignalProjectionService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,16 @@ private static FatVerificationSignal CreateRow(

internal static FatSignalKind Classify(string? functionalConstraint, string? dataType)
{
var fc = (functionalConstraint ?? string.Empty).Trim().ToUpperInvariant();
// Functional constraint describes service/semantic grouping, not the value domain.
// In particular MX may legally carry enumerated or structured values. Treating every
// MX member as numeric would silently opt such members into analog semantics. Capture
// policy is therefore conservative and driven by the ARIEC-resolved basic/MMS type.
_ = functionalConstraint;
var type = (dataType ?? string.Empty).Trim().ToUpperInvariant();

if (fc == "MX" ||
type.Contains("FLOAT", StringComparison.Ordinal) ||
if (type.Contains("FLOAT", StringComparison.Ordinal) ||
type.Contains("DOUBLE", StringComparison.Ordinal) ||
type.Contains("REAL", StringComparison.Ordinal) ||
type.Contains("ANALOG", StringComparison.Ordinal))
{
return FatSignalKind.Analog;
Expand All @@ -121,13 +125,15 @@ internal static FatSignalKind Classify(string? functionalConstraint, string? dat
type.Contains("BOOL", StringComparison.Ordinal) ||
type.Contains("DBPOS", StringComparison.Ordinal) ||
type.Contains("DOUBLE-POINT", StringComparison.Ordinal) ||
type.Contains("DOUBLE POINT", StringComparison.Ordinal))
type.Contains("DOUBLE POINT", StringComparison.Ordinal) ||
type.Contains("SINGLE-POINT", StringComparison.Ordinal) ||
type.Contains("SINGLE POINT", StringComparison.Ordinal))
{
return FatSignalKind.Discrete;
}

// ST is intentionally not assumed to be boolean by itself. Enumerated/integer ST
// values need an explicit discrete semantic before automatic two-state capture.
// Integer/enumerated/bit-string/structured values remain required FAT rows, but use
// operator snapshot capture until a stronger two-state/numeric semantic is proven.
return FatSignalKind.Other;
}

Expand Down
Loading
Loading