diff --git a/src/Gemstone.PQDIF/Gemstone - Backup.PQDIF.csproj b/src/Gemstone.PQDIF/Gemstone - Backup.PQDIF.csproj new file mode 100644 index 000000000..d9e54dfb8 --- /dev/null +++ b/src/Gemstone.PQDIF/Gemstone - Backup.PQDIF.csproj @@ -0,0 +1,74 @@ + + + + + + netstandard2.1;net7.0 + Gemstone.PQDIF + Gemstone.PQDIF + Grid Protection Alliance + Grid Protection Alliance + Gemstone + GPA Gemstone PQDIF Library + GPA Gemstone Power Quality Data Exchange File Format Parser Library + Copyright © 2022 + https://github.com/gemstone + gemstone-square-128.png + https://github.com/gemstone/pqdif + git + true + MIT + GPA;Gemstone;library;pqdif + latest + true + enable + AnyCPU + 1.0.86 + 1.0.86 -- Release Build + 1.0.86 -- Debug Build + Debug;Release;Development + + + + ..\..\build\$(Configuration) + + + + ..\..\build\$(Configuration)\$(AssemblyName).xml + + + + Full + + + + + + + + + TagDefinitions.xml + + + + + + True + + + + + + + + + + + + + + + $(SIGNTOOL) $(TargetPath) + + + diff --git a/src/Gemstone.PQDIF/Gemstone.PQDIF.csproj b/src/Gemstone.PQDIF/Gemstone.PQDIF.csproj index 5ae9c3861..e9613a65a 100644 --- a/src/Gemstone.PQDIF/Gemstone.PQDIF.csproj +++ b/src/Gemstone.PQDIF/Gemstone.PQDIF.csproj @@ -3,7 +3,7 @@ - netstandard2.0;netstandard2.1;net7.0 + net7.0;netstandard2.1 Gemstone.PQDIF Gemstone.PQDIF Grid Protection Alliance diff --git a/src/Gemstone.PQDIF/Logical/ChannelDefinition.cs b/src/Gemstone.PQDIF/Logical/ChannelDefinition.cs index e5f57bf29..e8789943c 100644 --- a/src/Gemstone.PQDIF/Logical/ChannelDefinition.cs +++ b/src/Gemstone.PQDIF/Logical/ChannelDefinition.cs @@ -512,8 +512,8 @@ public IList SeriesDefinitions /// New series definition. public SeriesDefinition AddNewSeriesDefinition() { - CollectionElement seriesDefinitionElement = new CollectionElement { TagOfElement = OneSeriesDefinitionTag }; - SeriesDefinition seriesDefinition = new SeriesDefinition(seriesDefinitionElement, this); + CollectionElement seriesDefinitionElement = new() { TagOfElement = OneSeriesDefinitionTag }; + SeriesDefinition seriesDefinition = new(seriesDefinitionElement, this); seriesDefinition.ValueTypeID = SeriesValueType.Val; seriesDefinition.QuantityUnits = QuantityUnits.None; @@ -548,7 +548,7 @@ public void Remove(SeriesDefinition seriesDefinition) foreach (CollectionElement seriesDefinitionElement in seriesDefinitionElements) { - SeriesDefinition definition = new SeriesDefinition(seriesDefinitionElement, this); + SeriesDefinition definition = new(seriesDefinitionElement, this); if (Equals(seriesDefinition, definition)) seriesDefinitionsElement.RemoveElement(seriesDefinitionElement); @@ -569,7 +569,7 @@ public bool Equals(ChannelDefinition other) => /// The object to compare with the current object. /// true if the specified object is equal to the current object; otherwise, false. /// 2 - public override bool Equals(object obj) => obj is ChannelDefinition other + public override bool Equals(object? obj) => obj is ChannelDefinition other ? Equals(other) : false; @@ -590,42 +590,42 @@ public override int GetHashCode() => /// /// Tag that identifies the channel definition index. /// - public static Guid ChannelDefinitionIndexTag { get; } = new Guid("b48d858f-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid ChannelDefinitionIndexTag { get; } = new("b48d858f-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the channel name. /// - public static Guid ChannelNameTag { get; } = new Guid("b48d8590-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid ChannelNameTag { get; } = new("b48d8590-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the phase ID. /// - public static Guid PhaseIDTag { get; } = new Guid("b48d8591-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid PhaseIDTag { get; } = new("b48d8591-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the quantity type. /// - public static Guid QuantityTypeIDTag { get; } = new Guid("b48d8592-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid QuantityTypeIDTag { get; } = new("b48d8592-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the quantity measured ID. /// - public static Guid QuantityMeasuredIDTag { get; } = new Guid("c690e872-f755-11cf-9d89-0080c72e70a3"); + public static Guid QuantityMeasuredIDTag { get; } = new("c690e872-f755-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the quantity name. /// - public static Guid QuantityNameTag { get; } = new Guid("b48d8595-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid QuantityNameTag { get; } = new("b48d8595-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the series definitions collection. /// - public static Guid SeriesDefinitionsTag { get; } = new Guid("b48d8598-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid SeriesDefinitionsTag { get; } = new("b48d8598-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies a single series definition within the collection. /// - public static Guid OneSeriesDefinitionTag { get; } = new Guid("b48d859a-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid OneSeriesDefinitionTag { get; } = new("b48d859a-f5f5-11cf-9d89-0080c72e70a3"); // Static Methods diff --git a/src/Gemstone.PQDIF/Logical/ChannelInstance.cs b/src/Gemstone.PQDIF/Logical/ChannelInstance.cs index 3ad86a21e..7ef30d415 100644 --- a/src/Gemstone.PQDIF/Logical/ChannelInstance.cs +++ b/src/Gemstone.PQDIF/Logical/ChannelInstance.cs @@ -243,9 +243,9 @@ public SeriesInstance AddNewSeriesInstance() if (Definition.SeriesDefinitions.Count <= SeriesInstances.Count) throw new InvalidOperationException("Cannot create a series instance without a corresponding series definition."); - CollectionElement seriesInstanceElement = new CollectionElement { TagOfElement = OneSeriesInstanceTag }; + CollectionElement seriesInstanceElement = new() { TagOfElement = OneSeriesInstanceTag }; SeriesDefinition seriesDefinition = Definition.SeriesDefinitions[SeriesInstances.Count]; - SeriesInstance seriesInstance = new SeriesInstance(seriesInstanceElement, this, seriesDefinition); + SeriesInstance seriesInstance = new(seriesInstanceElement, this, seriesDefinition); seriesInstanceElement.AddOrUpdateVector(SeriesInstance.SeriesValuesTag, PhysicalType.UnsignedInteger1, new byte[0]); CollectionElement? seriesInstancesElement = m_physicalStructure.GetCollectionByTag(SeriesInstancesTag); @@ -277,7 +277,7 @@ public void Remove(SeriesInstance seriesInstance) for (int i = seriesInstanceElements.Count; i >= 0; i--) { - SeriesInstance instance = new SeriesInstance(seriesInstanceElements[i], this, seriesDefinitions[i]); + SeriesInstance instance = new(seriesInstanceElements[i], this, seriesDefinitions[i]); if (Equals(seriesInstance, instance)) seriesInstancesElement.RemoveElement(seriesInstancesElement); @@ -298,7 +298,7 @@ public bool Equals(ChannelInstance other) => /// The object to compare with the current object. /// true if the specified object is equal to the current object; otherwise, false. /// 2 - public override bool Equals(object obj) => obj is ChannelInstance other + public override bool Equals(object? obj) => obj is ChannelInstance other ? Equals(other) : false; @@ -319,27 +319,27 @@ public override int GetHashCode() => /// /// Tag that identifies the channel group ID. /// - public static Guid ChannelGroupIDTag { get; } = new Guid("f90de218-e67b-4cf1-a295-b021a2d46767"); + public static Guid ChannelGroupIDTag { get; } = new("f90de218-e67b-4cf1-a295-b021a2d46767"); /// /// Tag that identifies the series instances collection. /// - public static Guid SeriesInstancesTag { get; } = new Guid("3d786f93-f76e-11cf-9d89-0080c72e70a3"); + public static Guid SeriesInstancesTag { get; } = new("3d786f93-f76e-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies a single series instance in the collection. /// - public static Guid OneSeriesInstanceTag { get; } = new Guid("3d786f94-f76e-11cf-9d89-0080c72e70a3"); + public static Guid OneSeriesInstanceTag { get; } = new("3d786f94-f76e-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the channel trigger module name. /// - public static Guid ChannelTriggerModuleNameTag { get; } = new Guid("0fa118c6-cb4a-11cf-9d89-0080c72e70a3"); + public static Guid ChannelTriggerModuleNameTag { get; } = new("0fa118c6-cb4a-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the cross trigger device name. /// - public static Guid CrossTriggerDeviceNameTag { get; } = new Guid("0fa118c5-cb4a-11cf-9d89-0080c72e70a3"); + public static Guid CrossTriggerDeviceNameTag { get; } = new("0fa118c5-cb4a-11cf-9d89-0080c72e70a3"); #endregion } diff --git a/src/Gemstone.PQDIF/Logical/ChannelSetting.cs b/src/Gemstone.PQDIF/Logical/ChannelSetting.cs index 6ee82f91a..1d2187fd2 100644 --- a/src/Gemstone.PQDIF/Logical/ChannelSetting.cs +++ b/src/Gemstone.PQDIF/Logical/ChannelSetting.cs @@ -151,12 +151,12 @@ public bool HasElement(Guid tag) => /// /// Tag that identifies the system side ratio. /// - public static Guid XDSystemSideRatioTag { get; } = new Guid("62f2818a-f9c4-11cf-9d89-0080c72e70a3"); + public static Guid XDSystemSideRatioTag { get; } = new("62f2818a-f9c4-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the monitor side ratio. /// - public static Guid XDMonitorSideRatioTag { get; } = new Guid("62f2818b-f9c4-11cf-9d89-0080c72e70a3"); + public static Guid XDMonitorSideRatioTag { get; } = new("62f2818b-f9c4-11cf-9d89-0080c72e70a3"); #endregion } diff --git a/src/Gemstone.PQDIF/Logical/ContainerRecord.cs b/src/Gemstone.PQDIF/Logical/ContainerRecord.cs index 514aad034..89445cc64 100644 --- a/src/Gemstone.PQDIF/Logical/ContainerRecord.cs +++ b/src/Gemstone.PQDIF/Logical/ContainerRecord.cs @@ -333,42 +333,42 @@ public void RemoveElement(Guid tag) => /// /// Tag that identifies the version info. /// - public static Guid VersionInfoTag { get; } = new Guid("89738607-f1c3-11cf-9d89-0080c72e70a3"); + public static Guid VersionInfoTag { get; } = new("89738607-f1c3-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the file name. /// - public static Guid FileNameTag { get; } = new Guid("89738608-f1c3-11cf-9d89-0080c72e70a3"); + public static Guid FileNameTag { get; } = new("89738608-f1c3-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the date and time of creation. /// - public static Guid CreationTag { get; } = new Guid("89738609-f1c3-11cf-9d89-0080c72e70a3"); + public static Guid CreationTag { get; } = new("89738609-f1c3-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the title applied to the PQDIF file. /// - public static readonly Guid TitleTag = new Guid("8973860d-f1c3-11cf-9d89-0080c72e70a3"); + public static readonly Guid TitleTag = new("8973860d-f1c3-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the subject applied to the PQDIF file. /// - public static readonly Guid SubjectTag = new Guid("8973860e-f1c3-11cf-9d89-0080c72e70a3"); + public static readonly Guid SubjectTag = new("8973860e-f1c3-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the notes stored in the PQDIF file. /// - public static Guid NotesTag { get; } = new Guid("89738617-f1c3-11cf-9d89-0080c72e70a3"); + public static Guid NotesTag { get; } = new("89738617-f1c3-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the compression style of the PQDIF file. /// - public static Guid CompressionStyleTag { get; } = new Guid("8973861b-f1c3-11cf-9d89-0080c72e70a3"); + public static Guid CompressionStyleTag { get; } = new("8973861b-f1c3-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the compression algorithm used when writing the PQDIF file. /// - public static Guid CompressionAlgorithmTag { get; } = new Guid("8973861c-f1c3-11cf-9d89-0080c72e70a3"); + public static Guid CompressionAlgorithmTag { get; } = new("8973861c-f1c3-11cf-9d89-0080c72e70a3"); // Static Methods @@ -379,8 +379,8 @@ public void RemoveElement(Guid tag) => public static ContainerRecord CreateContainerRecord() { Guid recordTypeTag = Record.GetTypeAsTag(RecordType.Container); - Record physicalRecord = new Record(recordTypeTag); - ContainerRecord containerRecord = new ContainerRecord(physicalRecord); + Record physicalRecord = new(recordTypeTag); + ContainerRecord containerRecord = new(physicalRecord); DateTime now = DateTime.UtcNow; containerRecord.WriterMajorVersion = 1; diff --git a/src/Gemstone.PQDIF/Logical/DataSourceRecord.cs b/src/Gemstone.PQDIF/Logical/DataSourceRecord.cs index 48542788f..af2762005 100644 --- a/src/Gemstone.PQDIF/Logical/DataSourceRecord.cs +++ b/src/Gemstone.PQDIF/Logical/DataSourceRecord.cs @@ -40,27 +40,27 @@ public static class DataSourceType /// /// The ID for data source type Measure. /// - public static Guid Measure { get; } = new Guid("e6b51730-f747-11cf-9d89-0080c72e70a3"); + public static Guid Measure { get; } = new("e6b51730-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for data source type Manual. /// - public static Guid Manual { get; } = new Guid("e6b51731-f747-11cf-9d89-0080c72e70a3"); + public static Guid Manual { get; } = new("e6b51731-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for data source type Simulate. /// - public static Guid Simulate { get; } = new Guid("e6b51732-f747-11cf-9d89-0080c72e70a3"); + public static Guid Simulate { get; } = new("e6b51732-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for data source type Benchmark. /// - public static Guid Benchmark { get; } = new Guid("e6b51733-f747-11cf-9d89-0080c72e70a3"); + public static Guid Benchmark { get; } = new("e6b51733-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for data source type Debug. /// - public static Guid Debug { get; } = new Guid("e6b51734-f747-11cf-9d89-0080c72e70a3"); + public static Guid Debug { get; } = new("e6b51734-f747-11cf-9d89-0080c72e70a3"); /// /// Gets information about the data source type identified by the given ID. @@ -380,8 +380,8 @@ public DateTime Effective /// New channel definition. public ChannelDefinition AddNewChannelDefinition() { - CollectionElement channelDefinitionElement = new CollectionElement { TagOfElement = OneChannelDefinitionTag }; - ChannelDefinition channelDefinition = new ChannelDefinition(channelDefinitionElement, this); + CollectionElement channelDefinitionElement = new() { TagOfElement = OneChannelDefinitionTag }; + ChannelDefinition channelDefinition = new(channelDefinitionElement, this); channelDefinition.Phase = Phase.None; channelDefinition.QuantityMeasured = QuantityMeasured.None; @@ -415,7 +415,7 @@ public void Remove(ChannelDefinition channelDefinition) foreach (CollectionElement channelDefinitionElement in channelDefinitionElements) { - ChannelDefinition definition = new ChannelDefinition(channelDefinitionElement, this); + ChannelDefinition definition = new(channelDefinitionElement, this); if (Equals(channelDefinition, definition)) channelDefinitionsElement.RemoveElement(channelDefinitionElement); @@ -438,52 +438,52 @@ public void RemoveElement(Guid tag) => /// /// Tag that identifies the data source type. /// - public static Guid DataSourceTypeIDTag { get; } = new Guid("b48d8581-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid DataSourceTypeIDTag { get; } = new("b48d8581-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the vendor ID. /// - public static Guid VendorIDTag { get; } = new Guid("b48d8582-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid VendorIDTag { get; } = new("b48d8582-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the equipment ID. /// - public static Guid EquipmentIDTag { get; } = new Guid("b48d8583-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid EquipmentIDTag { get; } = new("b48d8583-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the data source name. /// - public static Guid DataSourceNameTag { get; } = new Guid("b48d8587-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid DataSourceNameTag { get; } = new("b48d8587-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the data source owner. /// - public static Guid DataSourceOwnerTag { get; } = new Guid("b48d8588-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid DataSourceOwnerTag { get; } = new("b48d8588-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the data source owner. /// - public static Guid DataSourceLocationTag { get; } = new Guid("b48d8589-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid DataSourceLocationTag { get; } = new("b48d8589-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the physical location of the data source. /// - public static Guid DataSourceCoordinatesTag { get; } = new Guid("b48d858b-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid DataSourceCoordinatesTag { get; } = new("b48d858b-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the channel definitions collection. /// - public static Guid ChannelDefinitionsTag { get; } = new Guid("b48d858d-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid ChannelDefinitionsTag { get; } = new("b48d858d-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the a single channel definition in the collection. /// - public static Guid OneChannelDefinitionTag { get; } = new Guid("b48d858e-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid OneChannelDefinitionTag { get; } = new("b48d858e-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the time that the data source record becomes effective. /// - public static Guid EffectiveTag { get; } = new Guid("62f28183-f9c4-11cf-9d89-0080c72e70a3"); + public static Guid EffectiveTag { get; } = new("62f28183-f9c4-11cf-9d89-0080c72e70a3"); // Static Methods @@ -495,8 +495,8 @@ public void RemoveElement(Guid tag) => public static DataSourceRecord CreateDataSourceRecord(string dataSourceName) { Guid recordTypeTag = Record.GetTypeAsTag(RecordType.DataSource); - Record physicalRecord = new Record(recordTypeTag); - DataSourceRecord dataSourceRecord = new DataSourceRecord(physicalRecord); + Record physicalRecord = new(recordTypeTag); + DataSourceRecord dataSourceRecord = new(physicalRecord); DateTime now = DateTime.UtcNow; dataSourceRecord.DataSourceTypeID = DataSourceType.Simulate; diff --git a/src/Gemstone.PQDIF/Logical/DisturbanceCategory.cs b/src/Gemstone.PQDIF/Logical/DisturbanceCategory.cs index 8c98e3925..b033bb5e7 100644 --- a/src/Gemstone.PQDIF/Logical/DisturbanceCategory.cs +++ b/src/Gemstone.PQDIF/Logical/DisturbanceCategory.cs @@ -35,178 +35,178 @@ public static class DisturbanceCategory /// /// The ID for no distrubance or undefined. /// - public static Guid None { get; } = new Guid("67f6af8f-f753-11cf-9d89-0080c72e70a3"); + public static Guid None { get; } = new("67f6af8f-f753-11cf-9d89-0080c72e70a3"); /// /// The ID for a IEEE 1159 Transient. /// - public static Guid Transient { get; } = new Guid("67f6af90-f753-0x11cf-9d89-0080c72e70a3"); + public static Guid Transient { get; } = new("67f6af90-f753-0x11cf-9d89-0080c72e70a3"); /// /// The ID for a IEEE 1159 Impulsive Transient. /// - public static Guid ImpulsiveTransient { get; } = new Guid("dd56ef60-7edd-11d2-b30a-00609789d193"); + public static Guid ImpulsiveTransient { get; } = new("dd56ef60-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Impulsive Transient with nanosecond duration. /// - public static Guid ImpulsiveTransient_nano { get; } = new Guid("dd56ef61-7edd-11d2-b30a-00609789d193"); + public static Guid ImpulsiveTransient_nano { get; } = new("dd56ef61-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Impulsive Transient with microsecond duration. /// - public static Guid ImpulsiveTransient_micro { get; } = new Guid("dd56ef63-7edd-11d2-b30a-00609789d193"); + public static Guid ImpulsiveTransient_micro { get; } = new("dd56ef63-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Impulsive Transient with milisecond duration. /// - public static Guid ImpulsiveTransient_mili { get; } = new Guid("dd56ef64-7edd-11d2-b30a-00609789d193"); + public static Guid ImpulsiveTransient_mili { get; } = new("dd56ef64-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Oscillatory Transient. /// - public static Guid OscillatoryTransient { get; } = new Guid("dd56ef65-7edd-11d2-b30a-00609789d193"); + public static Guid OscillatoryTransient { get; } = new("dd56ef65-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Low Frequency Oscillatory Transient. /// - public static Guid OscillatoryTransient_low { get; } = new Guid("dd56ef66-7edd-11d2-b30a-00609789d193"); + public static Guid OscillatoryTransient_low { get; } = new("dd56ef66-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Medium Frequency Oscillatory Transient. /// - public static Guid OscillatoryTransient_medium { get; } = new Guid("dd56ef67-7edd-11d2-b30a-00609789d193"); + public static Guid OscillatoryTransient_medium { get; } = new("dd56ef67-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 High Frequency Oscillatory Transient. /// - public static Guid OscillatoryTransient_high { get; } = new Guid("dd56ef68-7edd-11d2-b30a-00609789d193"); + public static Guid OscillatoryTransient_high { get; } = new("dd56ef68-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Short Duration RMS Variation /// n - public static Guid RMSVariationShortDuration { get; } = new Guid("67f6af91-f753-11cf-9d89-0080c72e70a3"); + public static Guid RMSVariationShortDuration { get; } = new("67f6af91-f753-11cf-9d89-0080c72e70a3"); /// /// The ID for a IEEE 1159 Short Duration RMS Variation - Instantaneous duration. /// - public static Guid RMSVariationShortDuration_Instantaneous { get; } = new Guid("dd56ef69-7edd-11d2-b30a-00609789d193"); + public static Guid RMSVariationShortDuration_Instantaneous { get; } = new("dd56ef69-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Short Duration RMS Variation - Instantaneous Sag. /// - public static Guid RMSVariationShortDuration_InstantaneousSag { get; } = new Guid("dd56ef6a-7edd-11d2-b30a-00609789d193"); + public static Guid RMSVariationShortDuration_InstantaneousSag { get; } = new("dd56ef6a-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Short Duration RMS Variation - Instantaneous Swell. /// - public static Guid RMSVariationShortDuration_InstantaneousSwell { get; } = new Guid("dd56ef6b-7edd-11d2-b30a-00609789d193"); + public static Guid RMSVariationShortDuration_InstantaneousSwell { get; } = new("dd56ef6b-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Short Duration RMS Variation - Momentary Duration. /// - public static Guid RMSVariationShortDuration_Momentary { get; } = new Guid("dd56ef6c-7edd-11d2-b30a-00609789d193"); + public static Guid RMSVariationShortDuration_Momentary { get; } = new("dd56ef6c-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Short Duration RMS Variation - Momentary Interruption. /// - public static Guid RMSVariationShortDuration_MomentaryInterruption { get; } = new Guid("dd56ef6d-7edd-11d2-b30a-00609789d193"); + public static Guid RMSVariationShortDuration_MomentaryInterruption { get; } = new("dd56ef6d-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Short Duration RMS Variation - Momentary Sag. /// - public static Guid RMSVariationShortDuration_MomentarySag { get; } = new Guid("dd56ef6e-7edd-11d2-b30a-00609789d193"); + public static Guid RMSVariationShortDuration_MomentarySag { get; } = new("dd56ef6e-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Short Duration RMS Variation - Momentary Swell. /// - public static Guid RMSVariationShortDuration_MomentarySwell { get; } = new Guid("dd56ef6f-7edd-11d2-b30a-00609789d193"); + public static Guid RMSVariationShortDuration_MomentarySwell { get; } = new("dd56ef6f-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159Short Duration RMS Variation - Temporary Duration. /// - public static Guid RMSVariationShortDuration_Temporary { get; } = new Guid("dd56ef70-7edd-11d2-b30a-00609789d193"); + public static Guid RMSVariationShortDuration_Temporary { get; } = new("dd56ef70-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Short Duration RMS Variation - Temporary Interruption. /// - public static Guid RMSVariationShortDuration_TemporaryInterruption { get; } = new Guid("dd56ef71-7edd-11d2-b30a-00609789d193"); + public static Guid RMSVariationShortDuration_TemporaryInterruption { get; } = new("dd56ef71-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Short Duration RMS Variation - Temporary Sag. /// - public static Guid RMSVariationShortDuration_TemporarySag { get; } = new Guid("dd56ef72-7edd-11d2-b30a-00609789d193"); + public static Guid RMSVariationShortDuration_TemporarySag { get; } = new("dd56ef72-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Short Duration RMS Variation - Temporary Swell. /// - public static Guid RMSVariationShortDuration_TemporarySwell { get; } = new Guid("dd56ef73-7edd-11d2-b30a-00609789d193"); + public static Guid RMSVariationShortDuration_TemporarySwell { get; } = new("dd56ef73-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Long Duration RMS Variation. /// - public static Guid RMSVariationLongDuration { get; } = new Guid("67f6af92-f753-11cf-9d89-0080c72e70a3"); + public static Guid RMSVariationLongDuration { get; } = new("67f6af92-f753-11cf-9d89-0080c72e70a3"); /// /// The ID for a IEEE 1159 Long Duration RMS Variation - Interruption. /// - public static Guid RMSVariationLongDuration_Interrruption { get; } = new Guid("dd56ef74-7edd-11d2-b30a-00609789d193"); + public static Guid RMSVariationLongDuration_Interrruption { get; } = new("dd56ef74-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Long Duration RMS Variation - Undervoltage. /// - public static Guid RMSVariationLongDuration_UnderVoltage { get; } = new Guid("dd56ef75-7edd-11d2-b30a-00609789d193"); + public static Guid RMSVariationLongDuration_UnderVoltage { get; } = new("dd56ef75-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Long Duration RMS Variation - Overvoltage. /// - public static Guid RMSVariationLongDuration_OverVoltage { get; } = new Guid("dd56ef76-7edd-11d2-b30a-00609789d193"); + public static Guid RMSVariationLongDuration_OverVoltage { get; } = new("dd56ef76-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Imbalance. /// - public static Guid Imbalance { get; } = new Guid("dd56ef77-7edd-11d2-b30a-00609789d193"); + public static Guid Imbalance { get; } = new("dd56ef77-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Power Frequency Variation. /// - public static Guid PowerFrequencyVariation { get; } = new Guid("dd56ef7e-7edd-11d2-b30a-00609789d193"); + public static Guid PowerFrequencyVariation { get; } = new("dd56ef7e-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Voltage Fluctuation. /// - public static Guid VoltageFuctuation { get; } = new Guid("67f6af93-f753-11cf-9d89-0080c72e70a3"); + public static Guid VoltageFuctuation { get; } = new("67f6af93-f753-11cf-9d89-0080c72e70a3"); /// /// The ID for a IEEE 1159 Waveform Distortion. /// - public static Guid WaveformDistortion { get; } = new Guid("67f6af94-f753-11cf-9d89-0080c72e70a3"); + public static Guid WaveformDistortion { get; } = new("67f6af94-f753-11cf-9d89-0080c72e70a3"); /// /// The ID for a IEEE 1159 DC offset of voltage or current waveform. /// - public static Guid DCoffset { get; } = new Guid("dd56ef78-7edd-11d2-b30a-00609789d193"); + public static Guid DCoffset { get; } = new("dd56ef78-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Waveform Harmonics Present. /// - public static Guid WaveformHarmonics { get; } = new Guid("dd56ef79-7edd-11d2-b30a-00609789d193"); + public static Guid WaveformHarmonics { get; } = new("dd56ef79-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Waveform Interharmonics Present. /// - public static Guid WaveformInterHarmonics { get; } = new Guid("dd56ef7a-7edd-11d2-b30a-00609789d193"); + public static Guid WaveformInterHarmonics { get; } = new("dd56ef7a-7edd-11d2-b30a-00609789d193"); /// /// The ID for a IEEE 1159 Waveform Notching Present. /// - public static Guid WaveformNotching { get; } = new Guid("67f6af95-f753-11cf-9d89-0080c72e70a3"); + public static Guid WaveformNotching { get; } = new("67f6af95-f753-11cf-9d89-0080c72e70a3"); /// /// The ID for a IEEE 1159 Waveform Noise Present. /// - public static Guid WaveformNoise { get; } = new Guid("67f6af96-f753-11cf-9d89-0080c72e70a3"); + public static Guid WaveformNoise { get; } = new("67f6af96-f753-11cf-9d89-0080c72e70a3"); /// /// Gets information about the Disturbance identified by the given ID. diff --git a/src/Gemstone.PQDIF/Logical/Equipment.cs b/src/Gemstone.PQDIF/Logical/Equipment.cs index 054b4fa11..3bdc93e8b 100644 --- a/src/Gemstone.PQDIF/Logical/Equipment.cs +++ b/src/Gemstone.PQDIF/Logical/Equipment.cs @@ -35,537 +35,537 @@ public static class Equipment /// /// The ID of the WPT 5530 device. /// - public static Guid WPT5530 { get; } = new Guid("e2da5083-7fdb-11d3-9b39-0040052c2d28"); + public static Guid WPT5530 { get; } = new("e2da5083-7fdb-11d3-9b39-0040052c2d28"); /// /// The ID of the WPT 5540 device. /// - public static Guid WPT5540 { get; } = new Guid("e2da5084-7fdb-11d3-9b39-0040052c2d28"); + public static Guid WPT5540 { get; } = new("e2da5084-7fdb-11d3-9b39-0040052c2d28"); /// /// The ID of the BMI 3100 device. /// - public static Guid BMI3100 { get; } = new Guid("f1c04780-50fb-11d3-ac3e-444553540000"); + public static Guid BMI3100 { get; } = new("f1c04780-50fb-11d3-ac3e-444553540000"); /// /// The ID of the BMI 7100 device. /// - public static Guid BMI7100 { get; } = new Guid("e6b51717-f747-11cf-9d89-0080c72e70a3"); + public static Guid BMI7100 { get; } = new("e6b51717-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of the BMI 7100 device. /// - public static Guid BMI8010 { get; } = new Guid("e6b51718-f747-11cf-9d89-0080c72e70a3"); + public static Guid BMI8010 { get; } = new("e6b51718-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of the BMI 7100 device. /// - public static Guid BMI8020 { get; } = new Guid("e6b51719-f747-11cf-9d89-0080c72e70a3"); + public static Guid BMI8020 { get; } = new("e6b51719-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of the BMI 7100 device. /// - public static Guid BMI9010 { get; } = new Guid("e6b5171a-f747-11cf-9d89-0080c72e70a3"); + public static Guid BMI9010 { get; } = new("e6b5171a-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of the Cooper V-Harm device. /// - public static Guid CooperVHarm { get; } = new Guid("e6b5171b-f747-11cf-9d89-0080c72e70a3"); + public static Guid CooperVHarm { get; } = new("e6b5171b-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of the Cooper V-Flicker device. /// - public static Guid CooperVFlicker { get; } = new Guid("e6b5171c-f747-11cf-9d89-0080c72e70a3"); + public static Guid CooperVFlicker { get; } = new("e6b5171c-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of the DCG EMTP device. /// - public static Guid DCGEMTP { get; } = new Guid("e6b5171d-f747-11cf-9d89-0080c72e70a3"); + public static Guid DCGEMTP { get; } = new("e6b5171d-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of the Dranetz 656 device. /// - public static Guid Dranetz656 { get; } = new Guid("e6b5171e-f747-11cf-9d89-0080c72e70a3"); + public static Guid Dranetz656 { get; } = new("e6b5171e-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of the Dranetz 658 device. /// - public static Guid Dranetz658 { get; } = new Guid("e6b5171f-f747-11cf-9d89-0080c72e70a3"); + public static Guid Dranetz658 { get; } = new("e6b5171f-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of the Electrotek test program. /// - public static Guid ETKTestProgram { get; } = new Guid("e6b51721-f747-11cf-9d89-0080c72e70a3"); + public static Guid ETKTestProgram { get; } = new("e6b51721-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of the Dranetz 8000 device. /// - public static Guid Dranetz8000 { get; } = new Guid("e6b51720-f747-11cf-9d89-0080c72e70a3"); + public static Guid Dranetz8000 { get; } = new("e6b51720-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of the Electrotek PQDIF editor. /// - public static Guid ETKPQDIFEditor { get; } = new Guid("e6b51722-f747-11cf-9d89-0080c72e70a3"); + public static Guid ETKPQDIFEditor { get; } = new("e6b51722-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of Electrotek PASS. /// - public static Guid ETKPASS { get; } = new Guid("e6b51723-f747-11cf-9d89-0080c72e70a3"); + public static Guid ETKPASS { get; } = new("e6b51723-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of Electrotek Super-Harm. /// - public static Guid ETKSuperHarm { get; } = new Guid("e6b51724-f747-11cf-9d89-0080c72e70a3"); + public static Guid ETKSuperHarm { get; } = new("e6b51724-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of Electrotek Super-Tran. /// - public static Guid ETKSuperTran { get; } = new Guid("e6b51725-f747-11cf-9d89-0080c72e70a3"); + public static Guid ETKSuperTran { get; } = new("e6b51725-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of Electrotek TOP. /// - public static Guid ETKTOP { get; } = new Guid("e6b51726-f747-11cf-9d89-0080c72e70a3"); + public static Guid ETKTOP { get; } = new("e6b51726-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of Electrotek PQView. /// - public static Guid ETKPQView { get; } = new Guid("e6b51727-f747-11cf-9d89-0080c72e70a3"); + public static Guid ETKPQView { get; } = new("e6b51727-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of Electrotek Harmoni. /// - public static Guid ETKHarmoni { get; } = new Guid("e6b51728-f747-11cf-9d89-0080c72e70a3"); + public static Guid ETKHarmoni { get; } = new("e6b51728-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of the Fluke CUR device. /// - public static Guid FlukeCUR { get; } = new Guid("e6b51729-f747-11cf-9d89-0080c72e70a3"); + public static Guid FlukeCUR { get; } = new("e6b51729-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of IEEE COMTRADE. /// - public static Guid IEEECOMTRADE { get; } = new Guid("e6b5172b-f747-11cf-9d89-0080c72e70a3"); + public static Guid IEEECOMTRADE { get; } = new("e6b5172b-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of the Fluke F41 device. /// - public static Guid FlukeF41 { get; } = new Guid("e6b5172a-f747-11cf-9d89-0080c72e70a3"); + public static Guid FlukeF41 { get; } = new("e6b5172a-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of public ATP. /// - public static Guid PublicATP { get; } = new Guid("e6b5172c-f747-11cf-9d89-0080c72e70a3"); + public static Guid PublicATP { get; } = new("e6b5172c-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of the Metrosonic M1 device. /// - public static Guid MetrosonicM1 { get; } = new Guid("e6b5172d-f747-11cf-9d89-0080c72e70a3"); + public static Guid MetrosonicM1 { get; } = new("e6b5172d-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of the Square D PowerLogic SMS device. /// - public static Guid SQDSMS { get; } = new Guid("e6b5172e-f747-11cf-9d89-0080c72e70a3"); + public static Guid SQDSMS { get; } = new("e6b5172e-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of the Telog M1 device. /// - public static Guid TelogM1 { get; } = new Guid("e6b5172f-f747-11cf-9d89-0080c72e70a3"); + public static Guid TelogM1 { get; } = new("e6b5172f-f747-11cf-9d89-0080c72e70a3"); /// /// The ID of the PML 3710 device. /// - public static Guid PML3710 { get; } = new Guid("085726d0-1dc0-11d0-9d89-0080c72e70a3"); + public static Guid PML3710 { get; } = new("085726d0-1dc0-11d0-9d89-0080c72e70a3"); /// /// The ID of the PML 3720 device. /// - public static Guid PML3720 { get; } = new Guid("085726d1-1dc0-11d0-9d89-0080c72e70a3"); + public static Guid PML3720 { get; } = new("085726d1-1dc0-11d0-9d89-0080c72e70a3"); /// /// The ID of the PML 3800 device. /// - public static Guid PML3800 { get; } = new Guid("085726d2-1dc0-11d0-9d89-0080c72e70a3"); + public static Guid PML3800 { get; } = new("085726d2-1dc0-11d0-9d89-0080c72e70a3"); /// /// The ID of the PML 7300 device. /// - public static Guid PML7300 { get; } = new Guid("085726d3-1dc0-11d0-9d89-0080c72e70a3"); + public static Guid PML7300 { get; } = new("085726d3-1dc0-11d0-9d89-0080c72e70a3"); /// /// The ID of the PML 7700 device. /// - public static Guid PML7700 { get; } = new Guid("085726d4-1dc0-11d0-9d89-0080c72e70a3"); + public static Guid PML7700 { get; } = new("085726d4-1dc0-11d0-9d89-0080c72e70a3"); /// /// The ID of the PML VIP device. /// - public static Guid PMLVIP { get; } = new Guid("085726d5-1dc0-11d0-9d89-0080c72e70a3"); + public static Guid PMLVIP { get; } = new("085726d5-1dc0-11d0-9d89-0080c72e70a3"); /// /// The ID of the PML Log Server. /// - public static Guid PMLLogServer { get; } = new Guid("085726d6-1dc0-11d0-9d89-0080c72e70a3"); + public static Guid PMLLogServer { get; } = new("085726d6-1dc0-11d0-9d89-0080c72e70a3"); /// /// The ID of the Met One ELT15 device. /// - public static Guid MetOneELT15 { get; } = new Guid("b5b5da62-e2e1-11d4-a4b3-444553540000"); + public static Guid MetOneELT15 { get; } = new("b5b5da62-e2e1-11d4-a4b3-444553540000"); /// /// The ID of the PMI scanner. /// - public static Guid PMIScanner { get; } = new Guid("609acec1-993d-11d4-a4b3-444553540000"); + public static Guid PMIScanner { get; } = new("609acec1-993d-11d4-a4b3-444553540000"); /// /// The ID of the AdvanTech ADAM 4017 device. /// - public static Guid AdvanTechADAM4017 { get; } = new Guid("92b7977b-0c02-4766-95cf-dd379caeb417"); + public static Guid AdvanTechADAM4017 { get; } = new("92b7977b-0c02-4766-95cf-dd379caeb417"); /// /// The ID of ETK DSS. /// - public static Guid ETKDSS { get; } = new Guid("d347ba66-e34c-11d4-82d9-00e09872a094"); + public static Guid ETKDSS { get; } = new("d347ba66-e34c-11d4-82d9-00e09872a094"); /// /// The ID of the AdvanTech ADAM 4018 device. /// - public static Guid AdvanTechADAM4018 { get; } = new Guid("3008151e-2317-4405-a59e-e7b3b20667a9"); + public static Guid AdvanTechADAM4018 { get; } = new("3008151e-2317-4405-a59e-e7b3b20667a9"); /// /// The ID of the AdvanTech ADAM 4018M device. /// - public static Guid AdvanTechADAM4018M { get; } = new Guid("3a1af807-1347-45f8-966a-f481c6ae208e"); + public static Guid AdvanTechADAM4018M { get; } = new("3a1af807-1347-45f8-966a-f481c6ae208e"); /// /// The ID of the AdvanTech ADAM 4052 device. /// - public static Guid AdvanTechADAM4052 { get; } = new Guid("8bba416b-a7ec-4616-8b8f-59fed749323d"); + public static Guid AdvanTechADAM4052 { get; } = new("8bba416b-a7ec-4616-8b8f-59fed749323d"); /// /// The ID of the BMI 8800 device. /// - public static Guid BMI8800 { get; } = new Guid("e77d1a81-1235-11d5-a390-0010a4924ecc"); + public static Guid BMI8800 { get; } = new("e77d1a81-1235-11d5-a390-0010a4924ecc"); /// /// The ID of the Trinergi Power Quality Meter. /// - public static Guid TrinergiPQM { get; } = new Guid("0fd5a3aa-d73a-11d2-ac3e-444553540000"); + public static Guid TrinergiPQM { get; } = new("0fd5a3aa-d73a-11d2-ac3e-444553540000"); /// /// The ID of the Medcal device. /// - public static Guid Medcal { get; } = new Guid("f3bfa0a1-eb87-11d2-ac3e-444553540000"); + public static Guid Medcal { get; } = new("f3bfa0a1-eb87-11d2-ac3e-444553540000"); /// /// The ID of the GE kV Energy Meter. /// - public static Guid GEKV { get; } = new Guid("5202bd01-245c-11d5-a4b3-444553540000"); + public static Guid GEKV { get; } = new("5202bd01-245c-11d5-a4b3-444553540000"); /// /// The ID of the GE kV2 Energy Meter. /// - public static Guid GEKV2 { get; } = new Guid("5202bd03-245c-11d5-a4b3-444553540000"); + public static Guid GEKV2 { get; } = new("5202bd03-245c-11d5-a4b3-444553540000"); /// /// The ID of the Acumentrics Control device. /// - public static Guid AcumentricsControl { get; } = new Guid("5202bd04-245c-11d5-a4b3-444553540000"); + public static Guid AcumentricsControl { get; } = new("5202bd04-245c-11d5-a4b3-444553540000"); /// /// The ID of Electrotek Text PQDIF. /// - public static Guid ETKTextPQDIF { get; } = new Guid("5202bd05-245c-11d5-a4b3-444553540000"); + public static Guid ETKTextPQDIF { get; } = new("5202bd05-245c-11d5-a4b3-444553540000"); /// /// The ID of Electrotek PQWeb. /// - public static Guid ETKPQWeb { get; } = new Guid("5202bd06-245c-11d5-a4b3-444553540000"); + public static Guid ETKPQWeb { get; } = new("5202bd06-245c-11d5-a4b3-444553540000"); /// /// The ID of the QWave Power Distribution device. /// - public static Guid QWavePowerDistribution { get; } = new Guid("80c4a723-2816-11d4-8ab4-004005698d26"); + public static Guid QWavePowerDistribution { get; } = new("80c4a723-2816-11d4-8ab4-004005698d26"); /// /// The ID of the QWave Power Transmission device. /// - public static Guid QWavePowerTransmission { get; } = new Guid("80c4a725-2816-11d4-8ab4-004005698d26"); + public static Guid QWavePowerTransmission { get; } = new("80c4a725-2816-11d4-8ab4-004005698d26"); /// /// The ID of the QWave Micro device. /// - public static Guid QWaveMicro { get; } = new Guid("80c4a727-2816-11d4-8ab4-004005698d26"); + public static Guid QWaveMicro { get; } = new("80c4a727-2816-11d4-8ab4-004005698d26"); /// /// The ID of the QWave TWin device. /// - public static Guid QWaveTWin { get; } = new Guid("80c4a728-2816-11d4-8ab4-004005698d26"); + public static Guid QWaveTWin { get; } = new("80c4a728-2816-11d4-8ab4-004005698d26"); /// /// The ID of the QWave Premium device. /// - public static Guid QWavePremium { get; } = new Guid("80c4a729-2816-11d4-8ab4-004005698d26"); + public static Guid QWavePremium { get; } = new("80c4a729-2816-11d4-8ab4-004005698d26"); /// /// The ID of the QWave Light device. /// - public static Guid QWaveLight { get; } = new Guid("80c4a72a-2816-11d4-8ab4-004005698d26"); + public static Guid QWaveLight { get; } = new("80c4a72a-2816-11d4-8ab4-004005698d26"); /// /// The ID of the QWave Nomad device. /// - public static Guid QWaveNomad { get; } = new Guid("80c4a72b-2816-11d4-8ab4-004005698d26"); + public static Guid QWaveNomad { get; } = new("80c4a72b-2816-11d4-8ab4-004005698d26"); /// /// The ID of the EWON 4000 device. /// - public static Guid EWON4000 { get; } = new Guid("80c4a762-2816-11d4-8ab4-004005698d26"); + public static Guid EWON4000 { get; } = new("80c4a762-2816-11d4-8ab4-004005698d26"); /// /// The ID of the Qualimetre device. /// - public static Guid Qualimetre { get; } = new Guid("80c4a764-2816-11d4-8ab4-004005698d26"); + public static Guid Qualimetre { get; } = new("80c4a764-2816-11d4-8ab4-004005698d26"); /// /// The ID of the LEM Analyst 3Q device. /// - public static Guid LEMAnalyst3Q { get; } = new Guid("d567cb71-bcc0-41ee-8e8c-35851553f655"); + public static Guid LEMAnalyst3Q { get; } = new("d567cb71-bcc0-41ee-8e8c-35851553f655"); /// /// The ID of the LEM Analyst 1Q device. /// - public static Guid LEMAnalyst1Q { get; } = new Guid("477ecb3b-917f-4915-af99-a6c29ac18764"); + public static Guid LEMAnalyst1Q { get; } = new("477ecb3b-917f-4915-af99-a6c29ac18764"); /// /// The ID of the LEM Analyst 2050 device. /// - public static Guid LEMAnalyst2050 { get; } = new Guid("9878ccab-a842-4cac-950f-6d47215bffdf"); + public static Guid LEMAnalyst2050 { get; } = new("9878ccab-a842-4cac-950f-6d47215bffdf"); /// /// The ID of the LEM Analyst 2060 device. /// - public static Guid LEMAnalyst2060 { get; } = new Guid("312471a2-b586-491c-855a-ca05459a7e20"); + public static Guid LEMAnalyst2060 { get; } = new("312471a2-b586-491c-855a-ca05459a7e20"); /// /// The ID of the LEM Midget 200 device. /// - public static Guid LEMMidget200 { get; } = new Guid("8449f6b9-10f4-40a7-a1c3-be338eb97422"); + public static Guid LEMMidget200 { get; } = new("8449f6b9-10f4-40a7-a1c3-be338eb97422"); /// /// The ID of the LEM MBX 300 device. /// - public static Guid LEMMBX300 { get; } = new Guid("d4578d61-df2b-4218-a7b1-5ef1a9bb85fa"); + public static Guid LEMMBX300 { get; } = new("d4578d61-df2b-4218-a7b1-5ef1a9bb85fa"); /// /// The ID of the LEM MBX 800 device. /// - public static Guid LEMMBX800 { get; } = new Guid("1c14b57a-ba25-47fb-88fa-5fe5cec99e6a"); + public static Guid LEMMBX800 { get; } = new("1c14b57a-ba25-47fb-88fa-5fe5cec99e6a"); /// /// The ID of the LEM MBX 601 device. /// - public static Guid LEMMBX601 { get; } = new Guid("1f3cda7b-2ce1-4030-a390-e3d49c5615d2"); + public static Guid LEMMBX601 { get; } = new("1f3cda7b-2ce1-4030-a390-e3d49c5615d2"); /// /// The ID of the LEM MBX 602 device. /// - public static Guid LEMMBX602 { get; } = new Guid("4a157756-414a-427b-9932-55760ed5f707"); + public static Guid LEMMBX602 { get; } = new("4a157756-414a-427b-9932-55760ed5f707"); /// /// The ID of the LEM MBX 603 device. /// - public static Guid LEMMBX603 { get; } = new Guid("f7b4677b-b277-45b5-aaae-5fb39341b390"); + public static Guid LEMMBX603 { get; } = new("f7b4677b-b277-45b5-aaae-5fb39341b390"); /// /// The ID of the LEM MBX 686 device. /// - public static Guid LEMMBX686 { get; } = new Guid("40004266-a978-4991-9ed6-c1cd730f5bf5"); + public static Guid LEMMBX686 { get; } = new("40004266-a978-4991-9ed6-c1cd730f5bf5"); /// /// The ID of the LEM Perma 701 device. /// - public static Guid LEMPerma701 { get; } = new Guid("9b0dfd9d-d4e9-419d-ba10-c1cee6cf8f93"); + public static Guid LEMPerma701 { get; } = new("9b0dfd9d-d4e9-419d-ba10-c1cee6cf8f93"); /// /// The ID of the LEM Perma 702 device. /// - public static Guid LEMPerma702 { get; } = new Guid("7f5d62ac-9fab-400f-b51a-f0f3941fb5aa"); + public static Guid LEMPerma702 { get; } = new("7f5d62ac-9fab-400f-b51a-f0f3941fb5aa"); /// /// The ID of the LEM Perma 705 device. /// - public static Guid LEMPerma705 { get; } = new Guid("d85fea9c-14d5-45eb-831f-e03973092bd8"); + public static Guid LEMPerma705 { get; } = new("d85fea9c-14d5-45eb-831f-e03973092bd8"); /// /// The ID of the LEM Perma 706 device. /// - public static Guid LEMPerma706 { get; } = new Guid("16d6bbfc-0b5a-4cf0-81cf-48a3105eff4f"); + public static Guid LEMPerma706 { get; } = new("16d6bbfc-0b5a-4cf0-81cf-48a3105eff4f"); /// /// The ID of the LEM QWave Micro device. /// - public static Guid LEMQWaveMicro { get; } = new Guid("e0380e52-c205-43a0-9ff4-76fbd6765f37"); + public static Guid LEMQWaveMicro { get; } = new("e0380e52-c205-43a0-9ff4-76fbd6765f37"); /// /// The ID of the LEM QWave Nomad device. /// - public static Guid LEMQWaveNomad { get; } = new Guid("165f145d-90c3-4591-959a-33b101d4bf8b"); + public static Guid LEMQWaveNomad { get; } = new("165f145d-90c3-4591-959a-33b101d4bf8b"); /// /// The ID of the LEM QWave Light device. /// - public static Guid LEMQWaveLight { get; } = new Guid("5198ceb9-4b4e-439c-a1c0-218c963d6a9c"); + public static Guid LEMQWaveLight { get; } = new("5198ceb9-4b4e-439c-a1c0-218c963d6a9c"); /// /// The ID of the LEM QWave TWin device. /// - public static Guid LEMQWaveTWin { get; } = new Guid("67a42a2d-b831-4222-805e-d5fdebdd3a46"); + public static Guid LEMQWaveTWin { get; } = new("67a42a2d-b831-4222-805e-d5fdebdd3a46"); /// /// The ID of the LEM QWave Power Distribution device. /// - public static Guid LEMQWavePowerDistribution { get; } = new Guid("2401bf48-9db2-46ec-acde-5dedde25e54e"); + public static Guid LEMQWavePowerDistribution { get; } = new("2401bf48-9db2-46ec-acde-5dedde25e54e"); /// /// The ID of the LEM QWave Premium device. /// - public static Guid LEMQWavePremium { get; } = new Guid("6b609a29-4a64-4d1c-16e3-caef94fa56a0"); + public static Guid LEMQWavePremium { get; } = new("6b609a29-4a64-4d1c-16e3-caef94fa56a0"); /// /// The ID of the LEM QWave Power Transport device. /// - public static Guid LEMQWavePowerTransport { get; } = new Guid("d4422eeb-b1cd-4ba9-a7c8-5d141df40518"); + public static Guid LEMQWavePowerTransport { get; } = new("d4422eeb-b1cd-4ba9-a7c8-5d141df40518"); /// /// The ID of the LEM TOPAS LT device. /// - public static Guid LEMTOPASLT { get; } = new Guid("9c46483a-541e-4d66-9c10-f943abfc348a"); + public static Guid LEMTOPASLT { get; } = new("9c46483a-541e-4d66-9c10-f943abfc348a"); /// /// The ID of the LEM TOPAS 1000 device. /// - public static Guid LEMTOPAS1000 { get; } = new Guid("459b8614-6724-48fb-b5d4-f149ed0c62f5"); + public static Guid LEMTOPAS1000 { get; } = new("459b8614-6724-48fb-b5d4-f149ed0c62f5"); /// /// The ID of the LEM TOPAS 1019 device. /// - public static Guid LEMTOPAS1019 { get; } = new Guid("7b11408b-9d2c-407c-84a5-89440218dcf8"); + public static Guid LEMTOPAS1019 { get; } = new("7b11408b-9d2c-407c-84a5-89440218dcf8"); /// /// The ID of the LEM TOPAS 1020 device. /// - public static Guid LEMTOPAS1020 { get; } = new Guid("d1def77d-990f-484e-a166-f7921170a64b"); + public static Guid LEMTOPAS1020 { get; } = new("d1def77d-990f-484e-a166-f7921170a64b"); /// /// The ID of the LEM TOPAS 1040 device. /// - public static Guid LEMTOPAS1040 { get; } = new Guid("d3cc1de2-6e6b-4b6e-ad90-10d6585f8fa2"); + public static Guid LEMTOPAS1040 { get; } = new("d3cc1de2-6e6b-4b6e-ad90-10d6585f8fa2"); /// /// The ID of the LEM BEN 5000 device. /// - public static Guid LEMBEN5000 { get; } = new Guid("a70e32b1-2f1a-4543-a684-78a4b5be34bb"); + public static Guid LEMBEN5000 { get; } = new("a70e32b1-2f1a-4543-a684-78a4b5be34bb"); /// /// The ID of the LEM BEN 6000 device. /// - public static Guid LEMBEN6000 { get; } = new Guid("05a4c1b5-6681-47e6-9f64-8da125dbec32"); + public static Guid LEMBEN6000 { get; } = new("05a4c1b5-6681-47e6-9f64-8da125dbec32"); /// /// The ID of the LEM EWave device. /// - public static Guid LEMEWave { get; } = new Guid("e46981d5-708d-4822-97aa-fdb6f73b3af2"); + public static Guid LEMEWave { get; } = new("e46981d5-708d-4822-97aa-fdb6f73b3af2"); /// /// The ID of the LEM EWON 4000 device. /// - public static Guid LEMEWON4000 { get; } = new Guid("d4c0895c-fd48-498a-997c-9e70d80efb06"); + public static Guid LEMEWON4000 { get; } = new("d4c0895c-fd48-498a-997c-9e70d80efb06"); /// /// The ID of the LEM WPT 5510 device. /// - public static Guid WPT5510 { get; } = new Guid("752871de-0583-4d44-a9ae-c5fadc0144ac"); + public static Guid WPT5510 { get; } = new("752871de-0583-4d44-a9ae-c5fadc0144ac"); /// /// The ID of the LEM WPT 5520 device. /// - public static Guid WPT5520 { get; } = new Guid("0b72d289-7645-40b8-946e-c3ce4f1bcd37"); + public static Guid WPT5520 { get; } = new("0b72d289-7645-40b8-946e-c3ce4f1bcd37"); /// /// The ID of the LEM WPT 5530T device. /// - public static Guid WPT5530T { get; } = new Guid("8f88ea9e-1007-4569-ab47-756f292a23ed"); + public static Guid WPT5530T { get; } = new("8f88ea9e-1007-4569-ab47-756f292a23ed"); /// /// The ID of the LEM WPT 5560 device. /// - public static Guid WPT5560 { get; } = new Guid("5fd9c0ff-4432-41b5-9a9e-9a32ba2cf005"); + public static Guid WPT5560 { get; } = new("5fd9c0ff-4432-41b5-9a9e-9a32ba2cf005"); /// /// The ID of the LEM WPT 5590 device. /// - public static Guid WPT5590 { get; } = new Guid("2861d5ca-23ac-4a51-a5a0-498da61d26dd"); + public static Guid WPT5590 { get; } = new("2861d5ca-23ac-4a51-a5a0-498da61d26dd"); /// /// The ID of Electrotek Node Center. /// - public static Guid ETKNodeCenter { get; } = new Guid("c52e8460-58b4-4f1a-8469-69ca3fef9ff1"); + public static Guid ETKNodeCenter { get; } = new("c52e8460-58b4-4f1a-8469-69ca3fef9ff1"); /// /// The ID of WPT Dran View. /// - public static Guid WPTDranView { get; } = new Guid("08d97aa1-1719-11d6-a4b3-444553540000"); + public static Guid WPTDranView { get; } = new("08d97aa1-1719-11d6-a4b3-444553540000"); /// /// The ID of the AdvanTech ADAM 5017 device. /// - public static Guid AdvanTechADAM5017 { get; } = new Guid("2f46263c-92ac-4717-8a08-a6177df3f611"); + public static Guid AdvanTechADAM5017 { get; } = new("2f46263c-92ac-4717-8a08-a6177df3f611"); /// /// The ID of the AdvanTech ADAM 5018 device. /// - public static Guid AdvanTechADAM5018 { get; } = new Guid("cc2d3247-fe65-4db6-8206-500a23151bb2"); + public static Guid AdvanTechADAM5018 { get; } = new("cc2d3247-fe65-4db6-8206-500a23151bb2"); /// /// The ID of the AdvanTech ADAM 5080 device. /// - public static Guid AdvanTechADAM5080 { get; } = new Guid("6c37b63c-e770-4b85-bd32-4739d6eb9846"); + public static Guid AdvanTechADAM5080 { get; } = new("6c37b63c-e770-4b85-bd32-4739d6eb9846"); /// /// The ID of the AdvanTech ADAM 5052 device. /// - public static Guid AdvanTechADAM5052 { get; } = new Guid("e9261dfe-3d44-47e3-ac36-3b097faa8cda"); + public static Guid AdvanTechADAM5052 { get; } = new("e9261dfe-3d44-47e3-ac36-3b097faa8cda"); /// /// The ID of the AdvanTech ADAM 4050 device. /// - public static Guid AdvanTechADAM4050 { get; } = new Guid("9212066d-ea65-477e-bf95-e4a0066d25ce"); + public static Guid AdvanTechADAM4050 { get; } = new("9212066d-ea65-477e-bf95-e4a0066d25ce"); /// /// The ID of the AdvanTech ADAM 4053 device. /// - public static Guid AdvanTechADAM4053 { get; } = new Guid("dc29b83f-bebe-4cf3-b3fb-00dc63626dd9"); + public static Guid AdvanTechADAM4053 { get; } = new("dc29b83f-bebe-4cf3-b3fb-00dc63626dd9"); /// /// The ID of the AdvanTech ADAM 4080 device. /// - public static Guid AdvanTechADAM4080 { get; } = new Guid("64fc42c6-3c90-4633-99df-2c6058214b72"); + public static Guid AdvanTechADAM4080 { get; } = new("64fc42c6-3c90-4633-99df-2c6058214b72"); /// /// The ID of the AdvanTech ADAM 5050 device. /// - public static Guid AdvanTechADAM5050 { get; } = new Guid("c950a2e3-7a35-440c-8660-63f611972519"); + public static Guid AdvanTechADAM5050 { get; } = new("c950a2e3-7a35-440c-8660-63f611972519"); /// /// The ID of the AdvanTech ADAM 5051 device. /// - public static Guid AdvanTechADAM5051 { get; } = new Guid("c8f92334-a69b-4856-b253-ec2471d137d6"); + public static Guid AdvanTechADAM5051 { get; } = new("c8f92334-a69b-4856-b253-ec2471d137d6"); /// /// The ID of the ELCOM BK 550 device. /// - public static Guid ELCOMBK550 { get; } = new Guid("f4380a60-6f1d-11d6-9cb3-0020e010453b"); + public static Guid ELCOMBK550 { get; } = new("f4380a60-6f1d-11d6-9cb3-0020e010453b"); /// /// Gets information about the equipment identified by the given ID. diff --git a/src/Gemstone.PQDIF/Logical/MonitorSettingsRecord.cs b/src/Gemstone.PQDIF/Logical/MonitorSettingsRecord.cs index bff7eecc5..aa56425ef 100644 --- a/src/Gemstone.PQDIF/Logical/MonitorSettingsRecord.cs +++ b/src/Gemstone.PQDIF/Logical/MonitorSettingsRecord.cs @@ -213,8 +213,8 @@ public double NominalFrequency /// New channel setting. public ChannelSetting AddNewChannelSetting(ChannelDefinition channelDefinition) { - CollectionElement channelSettingElement = new CollectionElement { TagOfElement = OneChannelSettingTag }; - ChannelSetting channelSetting = new ChannelSetting(channelSettingElement, this); + CollectionElement channelSettingElement = new() { TagOfElement = OneChannelSettingTag }; + ChannelSetting channelSetting = new(channelSettingElement, this); channelSetting.ChannelDefinitionIndex = (uint)channelDefinition.DataSource.ChannelDefinitions.IndexOf(channelDefinition); CollectionElement? channelSettingsElement = PhysicalRecord.Body.Collection.GetCollectionByTag(ChannelSettingsArrayTag); @@ -245,7 +245,7 @@ public void Remove(ChannelSetting channelSetting) foreach (CollectionElement channelSettingElement in channelSettingElements) { - ChannelSetting setting = new ChannelSetting(channelSettingElement, this); + ChannelSetting setting = new(channelSettingElement, this); if (Equals(channelSetting, setting)) channelSettingsElement.RemoveElement(channelSettingElement); @@ -261,37 +261,37 @@ public void Remove(ChannelSetting channelSetting) /// /// Tag that identifies the time that these settings become effective. /// - public static Guid EffectiveTag { get; } = new Guid("62f28183-f9c4-11cf-9d89-0080c72e70a3"); + public static Guid EffectiveTag { get; } = new("62f28183-f9c4-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the install time. /// - public static Guid TimeInstalledTag { get; } = new Guid("3d786f85-f76e-11cf-9d89-0080c72e70a3"); + public static Guid TimeInstalledTag { get; } = new("3d786f85-f76e-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the flag which determines whether to apply calibration to the series. /// - public static Guid UseCalibrationTag { get; } = new Guid("62f28180-f9c4-11cf-9d89-0080c72e70a3"); + public static Guid UseCalibrationTag { get; } = new("62f28180-f9c4-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the flag which determines whether to apply transducer adjustments to the series. /// - public static Guid UseTransducerTag { get; } = new Guid("62f28181-f9c4-11cf-9d89-0080c72e70a3"); + public static Guid UseTransducerTag { get; } = new("62f28181-f9c4-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the collection of channel settings. /// - public static Guid ChannelSettingsArrayTag { get; } = new Guid("62f28182-f9c4-11cf-9d89-0080c72e70a3"); + public static Guid ChannelSettingsArrayTag { get; } = new("62f28182-f9c4-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies one channel setting in the collection. /// - public static Guid OneChannelSettingTag { get; } = new Guid("3d786f9a-f76e-11cf-9d89-0080c72e70a3"); + public static Guid OneChannelSettingTag { get; } = new("3d786f9a-f76e-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the nominal frequency. /// - public static Guid NominalFrequencyTag { get; } = new Guid("0fa118c3-cb4a-11d2-b30b-fe25cb9a1760"); + public static Guid NominalFrequencyTag { get; } = new("0fa118c3-cb4a-11d2-b30b-fe25cb9a1760"); // Static Properties @@ -310,8 +310,8 @@ public void Remove(ChannelSetting channelSetting) public static MonitorSettingsRecord CreateMonitorSettingsRecord() { Guid recordTypeTag = Record.GetTypeAsTag(RecordType.MonitorSettings); - Record physicalRecord = new Record(recordTypeTag); - MonitorSettingsRecord monitorSettingsRecord = new MonitorSettingsRecord(physicalRecord); + Record physicalRecord = new(recordTypeTag); + MonitorSettingsRecord monitorSettingsRecord = new(physicalRecord); DateTime now = DateTime.UtcNow; monitorSettingsRecord.Effective = now; diff --git a/src/Gemstone.PQDIF/Logical/ObservationRecord.cs b/src/Gemstone.PQDIF/Logical/ObservationRecord.cs index 756fbf054..3e0b64dea 100644 --- a/src/Gemstone.PQDIF/Logical/ObservationRecord.cs +++ b/src/Gemstone.PQDIF/Logical/ObservationRecord.cs @@ -322,8 +322,8 @@ public IList ChannelInstances /// NEw channel instance. public ChannelInstance AddNewChannelInstance(ChannelDefinition channelDefinition) { - CollectionElement channelInstanceElement = new CollectionElement { TagOfElement = OneChannelInstanceTag }; - ChannelInstance channelInstance = new ChannelInstance(channelInstanceElement, this); + CollectionElement channelInstanceElement = new() { TagOfElement = OneChannelInstanceTag }; + ChannelInstance channelInstance = new(channelInstanceElement, this); channelInstance.ChannelDefinitionIndex = (uint)channelDefinition.DataSource.ChannelDefinitions.IndexOf(channelDefinition); channelInstanceElement.AddElement(new CollectionElement { TagOfElement = ChannelInstance.SeriesInstancesTag }); @@ -356,7 +356,7 @@ public void Remove(ChannelInstance channelInstance) foreach (CollectionElement channelSettingElement in channelInstanceElements) { - ChannelInstance instance = new ChannelInstance(channelSettingElement, this); + ChannelInstance instance = new(channelSettingElement, this); if (Equals(channelInstance, instance)) channelInstancesElement.RemoveElement(channelSettingElement); @@ -372,47 +372,47 @@ public void Remove(ChannelInstance channelInstance) /// /// Tag that identifies the name of the observation record. /// - public static Guid ObservationNameTag { get; } = new Guid("3d786f8a-f76e-11cf-9d89-0080c72e70a3"); + public static Guid ObservationNameTag { get; } = new("3d786f8a-f76e-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the time that the observation record was created. /// - public static Guid TimeCreateTag { get; } = new Guid("3d786f8b-f76e-11cf-9d89-0080c72e70a3"); + public static Guid TimeCreateTag { get; } = new("3d786f8b-f76e-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the start time of the data in the observation record. /// - public static Guid TimeStartTag { get; } = new Guid("3d786f8c-f76e-11cf-9d89-0080c72e70a3"); + public static Guid TimeStartTag { get; } = new("3d786f8c-f76e-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the type of trigger that caused the observation. /// - public static Guid TriggerMethodTag { get; } = new Guid("3d786f8d-f76e-11cf-9d89-0080c72e70a3"); + public static Guid TriggerMethodTag { get; } = new("3d786f8d-f76e-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the time the observation was triggered. /// - public static Guid TimeTriggeredTag { get; } = new Guid("3d786f8e-f76e-11cf-9d89-0080c72e70a3"); + public static Guid TimeTriggeredTag { get; } = new("3d786f8e-f76e-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the index into collection within this record. This specifies which channel(s) initiated the observation. /// - public static Guid ChannelTriggerIndexTag { get; } = new Guid("3d786f8f-f76e-11cf-9d89-0080c72e70a3"); + public static Guid ChannelTriggerIndexTag { get; } = new("3d786f8f-f76e-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the channel instances collection. /// - public static Guid ChannelInstancesTag { get; } = new Guid("3d786f91-f76e-11cf-9d89-0080c72e70a3"); + public static Guid ChannelInstancesTag { get; } = new("3d786f91-f76e-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies a single channel instance in the collection. /// - public static Guid OneChannelInstanceTag { get; } = new Guid("3d786f92-f76e-11cf-9d89-0080c72e70a3"); + public static Guid OneChannelInstanceTag { get; } = new("3d786f92-f76e-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the Disturbance Category. /// - public static Guid DisturbanceCategoryTag { get; } = new Guid("b48d8597-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid DisturbanceCategoryTag { get; } = new("b48d8597-f5f5-11cf-9d89-0080c72e70a3"); // Static Methods @@ -426,8 +426,8 @@ public void Remove(ChannelInstance channelInstance) public static ObservationRecord CreateObservationRecord(DataSourceRecord dataSource, MonitorSettingsRecord? settings) { Guid recordTypeTag = Record.GetTypeAsTag(RecordType.Observation); - Record physicalRecord = new Record(recordTypeTag); - ObservationRecord observationRecord = new ObservationRecord(physicalRecord, dataSource, settings); + Record physicalRecord = new(recordTypeTag); + ObservationRecord observationRecord = new(physicalRecord, dataSource, settings); DateTime now = DateTime.UtcNow; observationRecord.Name = now.ToString(); diff --git a/src/Gemstone.PQDIF/Logical/QuantityCharacteristic.cs b/src/Gemstone.PQDIF/Logical/QuantityCharacteristic.cs index e1c7ce70a..160f1573f 100644 --- a/src/Gemstone.PQDIF/Logical/QuantityCharacteristic.cs +++ b/src/Gemstone.PQDIF/Logical/QuantityCharacteristic.cs @@ -35,605 +35,605 @@ public static class QuantityCharacteristic /// /// No quantity characteristic. /// - public static Guid None { get; } = new Guid("a6b31adf-b451-11d1-ae17-0060083a2628"); + public static Guid None { get; } = new("a6b31adf-b451-11d1-ae17-0060083a2628"); /// /// Instantaneous f(t). /// - public static Guid Instantaneous { get; } = new Guid("a6b31add-b451-11d1-ae17-0060083a2628"); + public static Guid Instantaneous { get; } = new("a6b31add-b451-11d1-ae17-0060083a2628"); /// /// Spectra F(F). /// - public static Guid Spectra { get; } = new Guid("a6b31ae9-b451-11d1-ae17-0060083a2628"); + public static Guid Spectra { get; } = new("a6b31ae9-b451-11d1-ae17-0060083a2628"); /// /// Peak value. /// - public static Guid Peak { get; } = new Guid("a6b31ae2-b451-11d1-ae17-0060083a2628"); + public static Guid Peak { get; } = new("a6b31ae2-b451-11d1-ae17-0060083a2628"); /// /// RMS value. /// - public static Guid RMS { get; } = new Guid("a6b31ae5-b451-11d1-ae17-0060083a2628"); + public static Guid RMS { get; } = new("a6b31ae5-b451-11d1-ae17-0060083a2628"); /// /// Harmonic RMS. /// - public static Guid HRMS { get; } = new Guid("a6b31adc-b451-11d1-ae17-0060083a2628"); + public static Guid HRMS { get; } = new("a6b31adc-b451-11d1-ae17-0060083a2628"); /// /// Frequency. /// - public static Guid Frequency { get; } = new Guid("07ef68af-9ff5-11d2-b30b-006008b37183"); + public static Guid Frequency { get; } = new("07ef68af-9ff5-11d2-b30b-006008b37183"); /// /// Total harmonic distortion (%). /// - public static Guid TotalTHD { get; } = new Guid("a6b31aec-b451-11d1-ae17-0060083a2628"); + public static Guid TotalTHD { get; } = new("a6b31aec-b451-11d1-ae17-0060083a2628"); /// /// Even harmonic distortion (%). /// - public static Guid EvenTHD { get; } = new Guid("a6b31ad4-b451-11d1-ae17-0060083a2628"); + public static Guid EvenTHD { get; } = new("a6b31ad4-b451-11d1-ae17-0060083a2628"); /// /// Odd harmonic distortion (%). /// - public static Guid OddTHD { get; } = new Guid("a6b31ae0-b451-11d1-ae17-0060083a2628"); + public static Guid OddTHD { get; } = new("a6b31ae0-b451-11d1-ae17-0060083a2628"); /// /// Crest factor. /// - public static Guid CrestFactor { get; } = new Guid("a6b31ad2-b451-11d1-ae17-0060083a2628"); + public static Guid CrestFactor { get; } = new("a6b31ad2-b451-11d1-ae17-0060083a2628"); /// /// Form factor. /// - public static Guid FormFactor { get; } = new Guid("a6b31adb-b451-11d1-ae17-0060083a2628"); + public static Guid FormFactor { get; } = new("a6b31adb-b451-11d1-ae17-0060083a2628"); /// /// Arithmetic sum. /// - public static Guid ArithSum { get; } = new Guid("a6b31ad0-b451-11d1-ae17-0060083a2628"); + public static Guid ArithSum { get; } = new("a6b31ad0-b451-11d1-ae17-0060083a2628"); /// /// Zero sequence component unbalance (%). /// - public static Guid S0S1 { get; } = new Guid("a6b31ae7-b451-11d1-ae17-0060083a2628"); + public static Guid S0S1 { get; } = new("a6b31ae7-b451-11d1-ae17-0060083a2628"); /// /// Negative sequence component unbalance (%). /// - public static Guid S2S1 { get; } = new Guid("a6b31ae8-b451-11d1-ae17-0060083a2628"); + public static Guid S2S1 { get; } = new("a6b31ae8-b451-11d1-ae17-0060083a2628"); /// /// Positive sequence component. /// - public static Guid SPos { get; } = new Guid("a6b31aea-b451-11d1-ae17-0060083a2628"); + public static Guid SPos { get; } = new("a6b31aea-b451-11d1-ae17-0060083a2628"); /// /// Negative sequence component. /// - public static Guid SNeg { get; } = new Guid("d71a4b91-3c92-11d4-9f2c-002078e0b723"); + public static Guid SNeg { get; } = new("d71a4b91-3c92-11d4-9f2c-002078e0b723"); /// /// Zero sequence component. /// - public static Guid SZero { get; } = new Guid("d71a4b92-3c92-11d4-9f2c-002078e0b723"); + public static Guid SZero { get; } = new("d71a4b92-3c92-11d4-9f2c-002078e0b723"); /// /// Imbalance by max deviation from average. /// - public static Guid AvgImbal { get; } = new Guid("a6b31ad1-b451-11d1-ae17-0060083a2628"); + public static Guid AvgImbal { get; } = new("a6b31ad1-b451-11d1-ae17-0060083a2628"); /// /// Total THD normalized to RMS. /// - public static Guid TotalTHDRMS { get; } = new Guid("f3d216e0-2aa5-11d5-a4b3-444553540000"); + public static Guid TotalTHDRMS { get; } = new("f3d216e0-2aa5-11d5-a4b3-444553540000"); /// /// Odd THD normalized to RMS. /// - public static Guid OddTHDRMS { get; } = new Guid("f3d216e1-2aa5-11d5-a4b3-444553540000"); + public static Guid OddTHDRMS { get; } = new("f3d216e1-2aa5-11d5-a4b3-444553540000"); /// /// Even THD normalized to RMS. /// - public static Guid EvenTHDRMS { get; } = new Guid("f3d216e2-2aa5-11d5-a4b3-444553540000"); + public static Guid EvenTHDRMS { get; } = new("f3d216e2-2aa5-11d5-a4b3-444553540000"); /// /// Total interharmonic distortion. /// - public static Guid TID { get; } = new Guid("f3d216e3-2aa5-11d5-a4b3-444553540000"); + public static Guid TID { get; } = new("f3d216e3-2aa5-11d5-a4b3-444553540000"); /// /// Total interharmonic distortion normalized to RMS. /// - public static Guid TIDRMS { get; } = new Guid("f3d216e4-2aa5-11d5-a4b3-444553540000"); + public static Guid TIDRMS { get; } = new("f3d216e4-2aa5-11d5-a4b3-444553540000"); /// /// Interharmonic RMS. /// - public static Guid IHRMS { get; } = new Guid("f3d216e5-2aa5-11d5-a4b3-444553540000"); + public static Guid IHRMS { get; } = new("f3d216e5-2aa5-11d5-a4b3-444553540000"); /// /// Spectra by harmonic group index. /// - public static Guid SpectraHGroup { get; } = new Guid("53be6ba8-0789-455b-9a95-da128683dda7"); + public static Guid SpectraHGroup { get; } = new("53be6ba8-0789-455b-9a95-da128683dda7"); /// /// Spectra by interharmonic group index. /// - public static Guid SpectraIGroup { get; } = new Guid("5e51e006-9c95-4c5e-878f-7ca87c0d2a0e"); + public static Guid SpectraIGroup { get; } = new("5e51e006-9c95-4c5e-878f-7ca87c0d2a0e"); /// /// TIF. /// - public static Guid TIF { get; } = new Guid("a6b31aeb-b451-11d1-ae17-0060083a2628"); + public static Guid TIF { get; } = new("a6b31aeb-b451-11d1-ae17-0060083a2628"); /// /// Flicker average RMS value. /// - public static Guid FlkrMagAvg { get; } = new Guid("a6b31ad6-b451-11d1-ae17-0060083a2628"); + public static Guid FlkrMagAvg { get; } = new("a6b31ad6-b451-11d1-ae17-0060083a2628"); /// /// dV/V base. /// - public static Guid FlkrMaxDVV { get; } = new Guid("a6b31ad8-b451-11d1-ae17-0060083a2628"); + public static Guid FlkrMaxDVV { get; } = new("a6b31ad8-b451-11d1-ae17-0060083a2628"); /// /// Frequence of maximum flicker harmonic. /// - public static Guid FlkrFreqMax { get; } = new Guid("a6b31ad5-b451-11d1-ae17-0060083a2628"); + public static Guid FlkrFreqMax { get; } = new("a6b31ad5-b451-11d1-ae17-0060083a2628"); /// /// Magnitude of maximum flicker harmonic. /// - public static Guid FlkrMagMax { get; } = new Guid("a6b31ad7-b451-11d1-ae17-0060083a2628"); + public static Guid FlkrMagMax { get; } = new("a6b31ad7-b451-11d1-ae17-0060083a2628"); /// /// Spectrum weighted average. /// - public static Guid FlkrWgtAvg { get; } = new Guid("a6b31ada-b451-11d1-ae17-0060083a2628"); + public static Guid FlkrWgtAvg { get; } = new("a6b31ada-b451-11d1-ae17-0060083a2628"); /// /// Flicker spectrum VRMS(F). /// - public static Guid FlkrSpectrum { get; } = new Guid("a6b31ad9-b451-11d1-ae17-0060083a2628"); + public static Guid FlkrSpectrum { get; } = new("a6b31ad9-b451-11d1-ae17-0060083a2628"); /// /// Short term flicker. /// - public static Guid FlkrPST { get; } = new Guid("515bf320-71ca-11d4-a4b3-444553540000"); + public static Guid FlkrPST { get; } = new("515bf320-71ca-11d4-a4b3-444553540000"); /// /// Long term flicker. /// - public static Guid FlkrPLT { get; } = new Guid("515bf321-71ca-11d4-a4b3-444553540000"); + public static Guid FlkrPLT { get; } = new("515bf321-71ca-11d4-a4b3-444553540000"); /// /// TIF normalized to RMS. /// - public static Guid TIFRMS { get; } = new Guid("f3d216e6-2aa5-11d5-a4b3-444553540000"); + public static Guid TIFRMS { get; } = new("f3d216e6-2aa5-11d5-a4b3-444553540000"); /// /// Sliding PLT. /// - public static Guid FlkrPLTSlide { get; } = new Guid("2257ec05-06ea-4709-b43a-0c00534d554a"); + public static Guid FlkrPLTSlide { get; } = new("2257ec05-06ea-4709-b43a-0c00534d554a"); /// /// Pi LPF. /// - public static Guid FlkrPiLPF { get; } = new Guid("4d693eec-5d1d-4531-993a-793b5356c63d"); + public static Guid FlkrPiLPF { get; } = new("4d693eec-5d1d-4531-993a-793b5356c63d"); /// /// Pi max. /// - public static Guid FlkrPiMax { get; } = new Guid("126de61c-6691-4d16-8fdf-46482bca4694"); + public static Guid FlkrPiMax { get; } = new("126de61c-6691-4d16-8fdf-46482bca4694"); /// /// Pi root. /// - public static Guid FlkrPiRoot { get; } = new Guid("e065b621-ffdb-4598-9330-4d09353988b6"); + public static Guid FlkrPiRoot { get; } = new("e065b621-ffdb-4598-9330-4d09353988b6"); /// /// Pi root LPF. /// - public static Guid FlkrPiRootLPF { get; } = new Guid("7d11f283-1ce7-4e58-8af0-79048793b8a7"); + public static Guid FlkrPiRootLPF { get; } = new("7d11f283-1ce7-4e58-8af0-79048793b8a7"); /// /// IT. /// - public static Guid IT { get; } = new Guid("a6b31ade-b451-11d1-ae17-0060083a2628"); + public static Guid IT { get; } = new("a6b31ade-b451-11d1-ae17-0060083a2628"); /// /// RMS value of current for a demand interval. /// - public static Guid RMSDemand { get; } = new Guid("07ef68a0-9ff5-11d2-b30b-006008b37183"); + public static Guid RMSDemand { get; } = new("07ef68a0-9ff5-11d2-b30b-006008b37183"); /// /// Transformer derating factor. /// - public static Guid ANSITDF { get; } = new Guid("8786ca10-9113-11d3-b930-0050da2b1f4d"); + public static Guid ANSITDF { get; } = new("8786ca10-9113-11d3-b930-0050da2b1f4d"); /// /// Transformer K factor. /// - public static Guid KFactor { get; } = new Guid("8786ca11-9113-11d3-b930-0050da2b1f4d"); + public static Guid KFactor { get; } = new("8786ca11-9113-11d3-b930-0050da2b1f4d"); /// /// Total demand distortion. /// - public static Guid TDD { get; } = new Guid("f3d216e7-2aa5-11d5-a4b3-444553540000"); + public static Guid TDD { get; } = new("f3d216e7-2aa5-11d5-a4b3-444553540000"); /// /// Peak demand current. /// - public static Guid RMSPeakDemand { get; } = new Guid("72e82a44-336c-11d5-a4b3-444553540000"); + public static Guid RMSPeakDemand { get; } = new("72e82a44-336c-11d5-a4b3-444553540000"); /// /// Real power (watts). /// - public static Guid P { get; } = new Guid("a6b31ae1-b451-11d1-ae17-0060083a2628"); + public static Guid P { get; } = new("a6b31ae1-b451-11d1-ae17-0060083a2628"); /// /// Reactive power (VAR). /// - public static Guid Q { get; } = new Guid("a6b31ae4-b451-11d1-ae17-0060083a2628"); + public static Guid Q { get; } = new("a6b31ae4-b451-11d1-ae17-0060083a2628"); /// /// Apparent power (VA). /// - public static Guid S { get; } = new Guid("a6b31ae6-b451-11d1-ae17-0060083a2628"); + public static Guid S { get; } = new("a6b31ae6-b451-11d1-ae17-0060083a2628"); /// /// True power factor - (Vrms * Irms) / P. /// - public static Guid PF { get; } = new Guid("a6b31ae3-b451-11d1-ae17-0060083a2628"); + public static Guid PF { get; } = new("a6b31ae3-b451-11d1-ae17-0060083a2628"); /// /// Displacement factor - Cosine of the phase angle between fundamental frequency voltage and current phasors. /// - public static Guid DF { get; } = new Guid("a6b31ad3-b451-11d1-ae17-0060083a2628"); + public static Guid DF { get; } = new("a6b31ad3-b451-11d1-ae17-0060083a2628"); /// /// Value of active power for a demand interval. /// - public static Guid PDemand { get; } = new Guid("07ef68a1-9ff5-11d2-b30b-006008b37183"); + public static Guid PDemand { get; } = new("07ef68a1-9ff5-11d2-b30b-006008b37183"); /// /// Value of reactive power for a demand interval. /// - public static Guid QDemand { get; } = new Guid("07ef68a2-9ff5-11d2-b30b-006008b37183"); + public static Guid QDemand { get; } = new("07ef68a2-9ff5-11d2-b30b-006008b37183"); /// /// Value of apparent power for a demand interval. /// - public static Guid SDemand { get; } = new Guid("07ef68a3-9ff5-11d2-b30b-006008b37183"); + public static Guid SDemand { get; } = new("07ef68a3-9ff5-11d2-b30b-006008b37183"); /// /// Value of displacement power factor for a demand interval. /// - public static Guid DFDemand { get; } = new Guid("07ef68a4-9ff5-11d2-b30b-006008b37183"); + public static Guid DFDemand { get; } = new("07ef68a4-9ff5-11d2-b30b-006008b37183"); /// /// Value of true power factor for a demand interval. /// - public static Guid PFDemand { get; } = new Guid("07ef68a5-9ff5-11d2-b30b-006008b37183"); + public static Guid PFDemand { get; } = new("07ef68a5-9ff5-11d2-b30b-006008b37183"); /// /// Predicted value of active power for current demand interval. /// - public static Guid PPredDemand { get; } = new Guid("672d0305-7810-11d4-a4b3-444553540000"); + public static Guid PPredDemand { get; } = new("672d0305-7810-11d4-a4b3-444553540000"); /// /// Predicted value of reactive power for current demand interval. /// - public static Guid QPredDemand { get; } = new Guid("672d0306-7810-11d4-a4b3-444553540000"); + public static Guid QPredDemand { get; } = new("672d0306-7810-11d4-a4b3-444553540000"); /// /// Predicted value of apparent power for current demand interval. /// - public static Guid SPredDemand { get; } = new Guid("672d0307-7810-11d4-a4b3-444553540000"); + public static Guid SPredDemand { get; } = new("672d0307-7810-11d4-a4b3-444553540000"); /// /// Value of active power coincident with reactive power demand. /// - public static Guid PCoQDemand { get; } = new Guid("672d030a-7810-11d4-a4b3-444553540000"); + public static Guid PCoQDemand { get; } = new("672d030a-7810-11d4-a4b3-444553540000"); /// /// Value of active power coincident with apparent power demand. /// - public static Guid PCoSDemand { get; } = new Guid("672d030b-7810-11d4-a4b3-444553540000"); + public static Guid PCoSDemand { get; } = new("672d030b-7810-11d4-a4b3-444553540000"); /// /// Value of reactive power coincident with active power demand. /// - public static Guid QCoPDemand { get; } = new Guid("672d030d-7810-11d4-a4b3-444553540000"); + public static Guid QCoPDemand { get; } = new("672d030d-7810-11d4-a4b3-444553540000"); /// /// Value of reactive power coincident with apparent power demand. /// - public static Guid QCoSDemand { get; } = new Guid("672d030e-7810-11d4-a4b3-444553540000"); + public static Guid QCoSDemand { get; } = new("672d030e-7810-11d4-a4b3-444553540000"); /// /// Value of displacement power factor coincident with apparent power demand. /// - public static Guid DFCoSDemand { get; } = new Guid("07ef68ad-9ff5-11d2-b30b-006008b37183"); + public static Guid DFCoSDemand { get; } = new("07ef68ad-9ff5-11d2-b30b-006008b37183"); /// /// Value of true power factor coincident with apparent power demand. /// - public static Guid PFCoSDemand { get; } = new Guid("07ef68ae-9ff5-11d2-b30b-006008b37183"); + public static Guid PFCoSDemand { get; } = new("07ef68ae-9ff5-11d2-b30b-006008b37183"); /// /// Value of true power factor coincident with active power demand. /// - public static Guid PFCoPDemand { get; } = new Guid("672d0308-7810-11d4-a4b3-444553540000"); + public static Guid PFCoPDemand { get; } = new("672d0308-7810-11d4-a4b3-444553540000"); /// /// Value of true power factor coincident with reactive power demand. /// - public static Guid PFCoQDemand { get; } = new Guid("672d0309-7810-11d4-a4b3-444553540000"); + public static Guid PFCoQDemand { get; } = new("672d0309-7810-11d4-a4b3-444553540000"); /// /// Value of the power angle at fundamental frequency. /// - public static Guid AngleFund { get; } = new Guid("672d030f-7810-11d4-a4b3-444553540000"); + public static Guid AngleFund { get; } = new("672d030f-7810-11d4-a4b3-444553540000"); /// /// Value of the reactive power at fundamental frequency. /// - public static Guid QFund { get; } = new Guid("672d0310-7810-11d4-a4b3-444553540000"); + public static Guid QFund { get; } = new("672d0310-7810-11d4-a4b3-444553540000"); /// /// True power factor - IEEE vector calculations. /// - public static Guid PFVector { get; } = new Guid("672d0311-7810-11d4-a4b3-444553540000"); + public static Guid PFVector { get; } = new("672d0311-7810-11d4-a4b3-444553540000"); /// /// Displacement factor - IEEE vector calculations. /// - public static Guid DFVector { get; } = new Guid("672d0312-7810-11d4-a4b3-444553540000"); + public static Guid DFVector { get; } = new("672d0312-7810-11d4-a4b3-444553540000"); /// /// Value of apparent power - IEEE vector calculations. /// - public static Guid SVector { get; } = new Guid("672d0314-7810-11d4-a4b3-444553540000"); + public static Guid SVector { get; } = new("672d0314-7810-11d4-a4b3-444553540000"); /// /// Value of fundamental frequency apparent power - IEEE vector calculations. /// - public static Guid SVectorFund { get; } = new Guid("672d0315-7810-11d4-a4b3-444553540000"); + public static Guid SVectorFund { get; } = new("672d0315-7810-11d4-a4b3-444553540000"); /// /// Value of fundamental frequency apparent power. /// - public static Guid SFund { get; } = new Guid("672d0316-7810-11d4-a4b3-444553540000"); + public static Guid SFund { get; } = new("672d0316-7810-11d4-a4b3-444553540000"); /// /// Apparent power coincident with active power demand. /// - public static Guid SCoPDemand { get; } = new Guid("672d0317-7810-11d4-a4b3-444553540000"); + public static Guid SCoPDemand { get; } = new("672d0317-7810-11d4-a4b3-444553540000"); /// /// Apparent power coincident with reactive power demand. /// - public static Guid SCoQDemand { get; } = new Guid("672d0318-7810-11d4-a4b3-444553540000"); + public static Guid SCoQDemand { get; } = new("672d0318-7810-11d4-a4b3-444553540000"); /// /// True power factor - IEEE arithmetic calculations. /// - public static Guid PFArith { get; } = new Guid("1c39fb00-a6aa-11d4-a4b3-444553540000"); + public static Guid PFArith { get; } = new("1c39fb00-a6aa-11d4-a4b3-444553540000"); /// /// Displacement factor - IEEE arithmetic calculations. /// - public static Guid DFArith { get; } = new Guid("1c39fb01-a6aa-11d4-a4b3-444553540000"); + public static Guid DFArith { get; } = new("1c39fb01-a6aa-11d4-a4b3-444553540000"); /// /// Value of apparent power - IEEE arithmetic calculations. /// - public static Guid SArith { get; } = new Guid("1c39fb02-a6aa-11d4-a4b3-444553540000"); + public static Guid SArith { get; } = new("1c39fb02-a6aa-11d4-a4b3-444553540000"); /// /// Value of fundamental frequency apparent power - IEEE arithmetic calculations. /// - public static Guid SArithFund { get; } = new Guid("1c39fb03-a6aa-11d4-a4b3-444553540000"); + public static Guid SArithFund { get; } = new("1c39fb03-a6aa-11d4-a4b3-444553540000"); /// /// Peak apparent power demand. /// - public static Guid SPeakDemand { get; } = new Guid("72e82a43-336c-11d5-a4b3-444553540000"); + public static Guid SPeakDemand { get; } = new("72e82a43-336c-11d5-a4b3-444553540000"); /// /// Peak reactive power demand. /// - public static Guid QPeakDemand { get; } = new Guid("72e82a42-336c-11d5-a4b3-444553540000"); + public static Guid QPeakDemand { get; } = new("72e82a42-336c-11d5-a4b3-444553540000"); /// /// Peak active power demand. /// - public static Guid PPeakDemand { get; } = new Guid("72e82a41-336c-11d5-a4b3-444553540000"); + public static Guid PPeakDemand { get; } = new("72e82a41-336c-11d5-a4b3-444553540000"); /// /// Net harmonic active power. /// - public static Guid PHarmonic { get; } = new Guid("b82b5c80-55c7-11d5-a4b3-444553540000"); + public static Guid PHarmonic { get; } = new("b82b5c80-55c7-11d5-a4b3-444553540000"); /// /// Arithmetic sum harmonic active power. /// - public static Guid PHarmonicUnsigned { get; } = new Guid("b82b5c81-55c7-11d5-a4b3-444553540000"); + public static Guid PHarmonicUnsigned { get; } = new("b82b5c81-55c7-11d5-a4b3-444553540000"); /// /// Value of fundamental frequency real power. /// - public static Guid PFund { get; } = new Guid("1cdda475-1ebb-42d8-8087-d01b0b5cfa97"); + public static Guid PFund { get; } = new("1cdda475-1ebb-42d8-8087-d01b0b5cfa97"); /// /// Value of active power integrated over time (Energy - watt-hours). /// - public static Guid PIntg { get; } = new Guid("07ef68a6-9ff5-11d2-b30b-006008b37183"); + public static Guid PIntg { get; } = new("07ef68a6-9ff5-11d2-b30b-006008b37183"); /// /// Value of active power integrated over time (Energy - watt-hours) in the positive direction (toward load). /// - public static Guid PIntgPos { get; } = new Guid("07ef68a7-9ff5-11d2-b30b-006008b37183"); + public static Guid PIntgPos { get; } = new("07ef68a7-9ff5-11d2-b30b-006008b37183"); /// /// Value of active fundamental frequency power integrated over time /// (Energy - watt-hours) in the positive direction (toward load). /// - public static Guid PIntgPosFund { get; } = new Guid("672d0300-7810-11d4-a4b3-444553540000"); + public static Guid PIntgPosFund { get; } = new("672d0300-7810-11d4-a4b3-444553540000"); /// /// Value of active power integrated over time (Energy - watt-hours) in the negative direction (away from load). /// - public static Guid PIntgNeg { get; } = new Guid("07ef68a8-9ff5-11d2-b30b-006008b37183"); + public static Guid PIntgNeg { get; } = new("07ef68a8-9ff5-11d2-b30b-006008b37183"); /// /// Value of active fundamental frequency power integrated over time /// (Energy - watt-hours) in the negative direction (away from load). /// - public static Guid PIntgNegFund { get; } = new Guid("672d0301-7810-11d4-a4b3-444553540000"); + public static Guid PIntgNegFund { get; } = new("672d0301-7810-11d4-a4b3-444553540000"); /// /// Value of reactive power integrated over time (var-hours). /// - public static Guid QIntg { get; } = new Guid("07ef68a9-9ff5-11d2-b30b-006008b37183"); + public static Guid QIntg { get; } = new("07ef68a9-9ff5-11d2-b30b-006008b37183"); /// /// Value of reactive power integrated over time (Energy - watt-hours) in the positive direction (toward load). /// - public static Guid QIntgPos { get; } = new Guid("07ef68aa-9ff5-11d2-b30b-006008b37183"); + public static Guid QIntgPos { get; } = new("07ef68aa-9ff5-11d2-b30b-006008b37183"); /// /// Value of fundamental frequency reactive power integrated over time /// (Energy - watt-hours) in the positive direction (toward load). /// - public static Guid QIntgPosFund { get; } = new Guid("672d0303-7810-11d4-a4b3-444553540000"); + public static Guid QIntgPosFund { get; } = new("672d0303-7810-11d4-a4b3-444553540000"); /// /// Value of fundamental frequency reactive power integrated over time /// (Energy - watt-hours) in the negative direction (away from load). /// - public static Guid QIntgNegFund { get; } = new Guid("672d0304-7810-11d4-a4b3-444553540000"); + public static Guid QIntgNegFund { get; } = new("672d0304-7810-11d4-a4b3-444553540000"); /// /// Value of reactive power integrated over time (Energy - watt-hours) in the negative direction (away from load). /// - public static Guid QIntgNeg { get; } = new Guid("07ef68ab-9ff5-11d2-b30b-006008b37183"); + public static Guid QIntgNeg { get; } = new("07ef68ab-9ff5-11d2-b30b-006008b37183"); /// /// Value of apparent power integrated over time (VA-hours). /// - public static Guid SIntg { get; } = new Guid("07ef68ac-9ff5-11d2-b30b-006008b37183"); + public static Guid SIntg { get; } = new("07ef68ac-9ff5-11d2-b30b-006008b37183"); /// /// Value of fundamental frequency apparent power integrated over time (VA-hours). /// - public static Guid SIntgFund { get; } = new Guid("672d0313-7810-11d4-a4b3-444553540000"); + public static Guid SIntgFund { get; } = new("672d0313-7810-11d4-a4b3-444553540000"); /// /// Value of active power integrated over time (Energy - watt-hours). /// - public static Guid PIVLIntg { get; } = new Guid("f098a9a0-3ee4-11d5-a4b3-444553540000"); + public static Guid PIVLIntg { get; } = new("f098a9a0-3ee4-11d5-a4b3-444553540000"); /// /// Value of active power integrated over time (Energy - watt-hours) in the positive direction (toward load). /// - public static Guid PIVLIntgPos { get; } = new Guid("f098a9a1-3ee4-11d5-a4b3-444553540000"); + public static Guid PIVLIntgPos { get; } = new("f098a9a1-3ee4-11d5-a4b3-444553540000"); /// /// Value of active fundamental frequency power integrated over time /// (Energy - watt-hours) in the positive direction (toward load). /// - public static Guid PIVLIntgPosFund { get; } = new Guid("f098a9a2-3ee4-11d5-a4b3-444553540000"); + public static Guid PIVLIntgPosFund { get; } = new("f098a9a2-3ee4-11d5-a4b3-444553540000"); /// /// Value of active power integrated over time (Energy - watt-hours) in the negative direction (away from load). /// - public static Guid PIVLIntgNeg { get; } = new Guid("f098a9a3-3ee4-11d5-a4b3-444553540000"); + public static Guid PIVLIntgNeg { get; } = new("f098a9a3-3ee4-11d5-a4b3-444553540000"); /// /// Value of active fundamental frequency power integrated over time /// (Energy - watt-hours) in the negative direction (away from load). /// - public static Guid PIVLIntgNegFund { get; } = new Guid("f098a9a4-3ee4-11d5-a4b3-444553540000"); + public static Guid PIVLIntgNegFund { get; } = new("f098a9a4-3ee4-11d5-a4b3-444553540000"); /// /// Value of reactive power integrated over time (var-hours). /// - public static Guid QIVLIntg { get; } = new Guid("f098a9a5-3ee4-11d5-a4b3-444553540000"); + public static Guid QIVLIntg { get; } = new("f098a9a5-3ee4-11d5-a4b3-444553540000"); /// /// Value of reactive power integrated over time (Energy - watt-hours) in the positive direction (toward load). /// - public static Guid QIVLIntgPos { get; } = new Guid("f098a9a6-3ee4-11d5-a4b3-444553540000"); + public static Guid QIVLIntgPos { get; } = new("f098a9a6-3ee4-11d5-a4b3-444553540000"); /// /// Value of fundamental frequency reactive power integrated over time /// (Energy - watt-hours) in the positive direction (toward load). /// - public static Guid QIVLIntgPosFund { get; } = new Guid("f098a9a7-3ee4-11d5-a4b3-444553540000"); + public static Guid QIVLIntgPosFund { get; } = new("f098a9a7-3ee4-11d5-a4b3-444553540000"); /// /// Value of fundamental frequency reactive power integrated over time /// (Energy - watt-hours) in the negative direction (away from load). /// - public static Guid QIVLIntgNegFund { get; } = new Guid("f098a9a8-3ee4-11d5-a4b3-444553540000"); + public static Guid QIVLIntgNegFund { get; } = new("f098a9a8-3ee4-11d5-a4b3-444553540000"); /// /// Value of reactive power integrated over time (Energy - watt-hours) in the negative direction (away from load). /// - public static Guid QIVLIntgNeg { get; } = new Guid("f098a9a9-3ee4-11d5-a4b3-444553540000"); + public static Guid QIVLIntgNeg { get; } = new("f098a9a9-3ee4-11d5-a4b3-444553540000"); /// /// Value of apparent power integrated over time (VA-hours). /// - public static Guid SIVLIntg { get; } = new Guid("f098a9aa-3ee4-11d5-a4b3-444553540000"); + public static Guid SIVLIntg { get; } = new("f098a9aa-3ee4-11d5-a4b3-444553540000"); /// /// Value of fundamental frequency apparent power integrated over time (VA-hours). /// - public static Guid SIVLIntgFund { get; } = new Guid("f098a9ab-3ee4-11d5-a4b3-444553540000"); + public static Guid SIVLIntgFund { get; } = new("f098a9ab-3ee4-11d5-a4b3-444553540000"); /// /// D axis components. /// - public static Guid DAxisField { get; } = new Guid("d347ba65-e34c-11d4-82d9-00e09872a094"); + public static Guid DAxisField { get; } = new("d347ba65-e34c-11d4-82d9-00e09872a094"); /// /// Q axis components. /// - public static Guid QAxis { get; } = new Guid("d347ba64-e34c-11d4-82d9-00e09872a094"); + public static Guid QAxis { get; } = new("d347ba64-e34c-11d4-82d9-00e09872a094"); /// /// Rotational position. /// - public static Guid Rotational { get; } = new Guid("d347ba62-e34c-11d4-82d9-00e09872a094"); + public static Guid Rotational { get; } = new("d347ba62-e34c-11d4-82d9-00e09872a094"); /// /// D axis components. /// - public static Guid DAxis { get; } = new Guid("d347ba63-e34c-11d4-82d9-00e09872a094"); + public static Guid DAxis { get; } = new("d347ba63-e34c-11d4-82d9-00e09872a094"); /// /// Linear position. /// - public static Guid Linear { get; } = new Guid("d347ba61-e34c-11d4-82d9-00e09872a094"); + public static Guid Linear { get; } = new("d347ba61-e34c-11d4-82d9-00e09872a094"); /// /// Transfer function. /// - public static Guid TransferFunc { get; } = new Guid("5202bd07-245c-11d5-a4b3-444553540000"); + public static Guid TransferFunc { get; } = new("5202bd07-245c-11d5-a4b3-444553540000"); /// /// Status data. /// - public static Guid Status { get; } = new Guid("b82b5c83-55c7-11d5-a4b3-444553540000"); + public static Guid Status { get; } = new("b82b5c83-55c7-11d5-a4b3-444553540000"); /// /// Gets information about the quantity diff --git a/src/Gemstone.PQDIF/Logical/QuantityType.cs b/src/Gemstone.PQDIF/Logical/QuantityType.cs index ed933874b..85ae4c575 100644 --- a/src/Gemstone.PQDIF/Logical/QuantityType.cs +++ b/src/Gemstone.PQDIF/Logical/QuantityType.cs @@ -38,69 +38,69 @@ public static class QuantityType /// /// Point-on-wave measurements. /// - public static Guid WaveForm { get; } = new Guid("67f6af80-f753-11cf-9d89-0080c72e70a3"); + public static Guid WaveForm { get; } = new("67f6af80-f753-11cf-9d89-0080c72e70a3"); /// /// Time-based logged entries. /// - public static Guid ValueLog { get; } = new Guid("67f6af82-f753-11cf-9d89-0080c72e70a3"); + public static Guid ValueLog { get; } = new("67f6af82-f753-11cf-9d89-0080c72e70a3"); /// /// Time-domain measurements including /// magnitudes and (optionally) phase angle. /// - public static Guid Phasor { get; } = new Guid("67f6af81-f753-11cf-9d89-0080c72e70a3"); + public static Guid Phasor { get; } = new("67f6af81-f753-11cf-9d89-0080c72e70a3"); /// /// Frequency-domain measurements including /// magnitude and (optionally) phase angle. /// - public static Guid Response { get; } = new Guid("67f6af85-f753-11cf-9d89-0080c72e70a3"); + public static Guid Response { get; } = new("67f6af85-f753-11cf-9d89-0080c72e70a3"); /// /// Time, latitude, longitude, value, polarity, ellipse. /// - public static Guid Flash { get; } = new Guid("67f6af83-f753-11cf-9d89-0080c72e70a3"); + public static Guid Flash { get; } = new("67f6af83-f753-11cf-9d89-0080c72e70a3"); /// /// BinLow, BinHigh, BinID, count. /// - public static Guid Histogram { get; } = new Guid("67f6af87-f753-11cf-9d89-0080c72e70a3"); + public static Guid Histogram { get; } = new("67f6af87-f753-11cf-9d89-0080c72e70a3"); /// /// XBinLow, XBinHigh, YBinLow, YBinHigh, BinID, count. /// - public static Guid Histogram3D { get; } = new Guid("67f6af88-f753-11cf-9d89-0080c72e70a3"); + public static Guid Histogram3D { get; } = new("67f6af88-f753-11cf-9d89-0080c72e70a3"); /// /// Probability, value. /// - public static Guid CPF { get; } = new Guid("67f6af89-f753-11cf-9d89-0080c72e70a3"); + public static Guid CPF { get; } = new("67f6af89-f753-11cf-9d89-0080c72e70a3"); /// /// X-values and y-values. /// - public static Guid XY { get; } = new Guid("67f6af8a-f753-11cf-9d89-0080c72e70a3"); + public static Guid XY { get; } = new("67f6af8a-f753-11cf-9d89-0080c72e70a3"); /// /// Magnitude and duration. /// - public static Guid MagDur { get; } = new Guid("67f6af8b-f753-11cf-9d89-0080c72e70a3"); + public static Guid MagDur { get; } = new("67f6af8b-f753-11cf-9d89-0080c72e70a3"); /// /// X-values, y-values, and z-values. /// - public static Guid XYZ { get; } = new Guid("67f6af8c-f753-11cf-9d89-0080c72e70a3"); + public static Guid XYZ { get; } = new("67f6af8c-f753-11cf-9d89-0080c72e70a3"); /// /// Time, magnitude, and duration. /// - public static Guid MagDurTime { get; } = new Guid("67f6af8d-f753-11cf-9d89-0080c72e70a3"); + public static Guid MagDurTime { get; } = new("67f6af8d-f753-11cf-9d89-0080c72e70a3"); /// /// Time, magnitude, duration, and count. /// - public static Guid MagDurCount { get; } = new Guid("67f6af8e-f753-11cf-9d89-0080c72e70a3"); + public static Guid MagDurCount { get; } = new("67f6af8e-f753-11cf-9d89-0080c72e70a3"); /// /// Gets the information about the quantity diff --git a/src/Gemstone.PQDIF/Logical/SeriesDefinition.cs b/src/Gemstone.PQDIF/Logical/SeriesDefinition.cs index 6c5e3c3d7..f95750f72 100644 --- a/src/Gemstone.PQDIF/Logical/SeriesDefinition.cs +++ b/src/Gemstone.PQDIF/Logical/SeriesDefinition.cs @@ -446,7 +446,7 @@ public bool Equals(SeriesDefinition other) => /// The object to compare with the current object. /// true if the specified object is equal to the current object; otherwise, false. /// 2 - public override bool Equals(object obj) => obj is SeriesDefinition other + public override bool Equals(object? obj) => obj is SeriesDefinition other ? Equals(other) : false; @@ -467,32 +467,32 @@ public override int GetHashCode() => /// /// Tag that identifies the value type ID of the series. /// - public static Guid ValueTypeIDTag { get; } = new Guid("b48d859c-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid ValueTypeIDTag { get; } = new("b48d859c-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the quantity units ID of the series. /// - public static Guid QuantityUnitsIDTag { get; } = new Guid("b48d859b-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid QuantityUnitsIDTag { get; } = new("b48d859b-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the characteristic ID of the series. /// - public static Guid QuantityCharacteristicIDTag { get; } = new Guid("3d786f9e-f76e-11cf-9d89-0080c72e70a3"); + public static Guid QuantityCharacteristicIDTag { get; } = new("3d786f9e-f76e-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the storage method ID of the series. /// - public static Guid StorageMethodIDTag { get; } = new Guid("b48d85a1-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid StorageMethodIDTag { get; } = new("b48d85a1-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the value type name of the series. /// - public static Guid ValueTypeNameTag { get; } = new Guid("b48d859d-f5f5-11cf-9d89-0080c72e70a3"); + public static Guid ValueTypeNameTag { get; } = new("b48d859d-f5f5-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the nominal quantity of the series. /// - public static Guid SeriesNominalQuantityTag { get; } = new Guid("0fa118c8-cb4a-11d2-b30b-fe25cb9a1760"); + public static Guid SeriesNominalQuantityTag { get; } = new("0fa118c8-cb4a-11d2-b30b-fe25cb9a1760"); #endregion } diff --git a/src/Gemstone.PQDIF/Logical/SeriesInstance.cs b/src/Gemstone.PQDIF/Logical/SeriesInstance.cs index 9cd60bb4d..85f14622a 100644 --- a/src/Gemstone.PQDIF/Logical/SeriesInstance.cs +++ b/src/Gemstone.PQDIF/Logical/SeriesInstance.cs @@ -302,7 +302,7 @@ public bool Equals(SeriesInstance other) => /// The object to compare with the current object. /// true if the specified object is equal to the current object; otherwise, false. /// 2 - public override bool Equals(object obj) => obj is SeriesInstance other + public override bool Equals(object? obj) => obj is SeriesInstance other ? Equals(other) : false; @@ -421,27 +421,27 @@ private void ApplyTransducerRatio(IList values) /// /// Tag that identifies the scale value to apply to the series. /// - public static Guid SeriesScaleTag { get; } = new Guid("3d786f96-f76e-11cf-9d89-0080c72e70a3"); + public static Guid SeriesScaleTag { get; } = new("3d786f96-f76e-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the offset value to apply to the series. /// - public static Guid SeriesOffsetTag { get; } = new Guid("3d786f97-f76e-11cf-9d89-0080c72e70a3"); + public static Guid SeriesOffsetTag { get; } = new("3d786f97-f76e-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the values contained in the series. /// - public static Guid SeriesValuesTag { get; } = new Guid("3d786f99-f76e-11cf-9d89-0080c72e70a3"); + public static Guid SeriesValuesTag { get; } = new("3d786f99-f76e-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the index of the channel that owns the series to be shared. /// - public static Guid SeriesShareChannelIndexTag { get; } = new Guid("8973861f-f1c3-11cf-9d89-0080c72e70a3"); + public static Guid SeriesShareChannelIndexTag { get; } = new("8973861f-f1c3-11cf-9d89-0080c72e70a3"); /// /// Tag that identifies the index of the series to be shared. /// - public static Guid SeriesShareSeriesIndexTag { get; } = new Guid("89738620-f1c3-11cf-9d89-0080c72e70a3"); + public static Guid SeriesShareSeriesIndexTag { get; } = new("89738620-f1c3-11cf-9d89-0080c72e70a3"); #endregion } diff --git a/src/Gemstone.PQDIF/Logical/SeriesValueType.cs b/src/Gemstone.PQDIF/Logical/SeriesValueType.cs index f129bb946..5f2578769 100644 --- a/src/Gemstone.PQDIF/Logical/SeriesValueType.cs +++ b/src/Gemstone.PQDIF/Logical/SeriesValueType.cs @@ -37,122 +37,122 @@ public static class SeriesValueType /// /// Value type for a measurement. /// - public static Guid Val { get; } = new Guid("67f6af97-f753-11cf-9d89-0080c72e70a3"); + public static Guid Val { get; } = new("67f6af97-f753-11cf-9d89-0080c72e70a3"); /// /// Time. /// - public static Guid Time { get; } = new Guid("c690e862-f755-11cf-9d89-0080c72e70a3"); + public static Guid Time { get; } = new("c690e862-f755-11cf-9d89-0080c72e70a3"); /// /// Minimum. /// - public static Guid Min { get; } = new Guid("67f6af98-f753-11cf-9d89-0080c72e70a3"); + public static Guid Min { get; } = new("67f6af98-f753-11cf-9d89-0080c72e70a3"); /// /// Maximum. /// - public static Guid Max { get; } = new Guid("67f6af99-f753-11cf-9d89-0080c72e70a3"); + public static Guid Max { get; } = new("67f6af99-f753-11cf-9d89-0080c72e70a3"); /// /// Average. /// - public static Guid Avg { get; } = new Guid("67f6af9a-f753-11cf-9d89-0080c72e70a3"); + public static Guid Avg { get; } = new("67f6af9a-f753-11cf-9d89-0080c72e70a3"); /// /// Instantaneous. /// - public static Guid Inst { get; } = new Guid("67f6af9b-f753-11cf-9d89-0080c72e70a3"); + public static Guid Inst { get; } = new("67f6af9b-f753-11cf-9d89-0080c72e70a3"); /// /// Phase angle. /// - public static Guid PhaseAngle { get; } = new Guid("3d786f9d-f76e-11cf-9d89-0080c72e70a3"); + public static Guid PhaseAngle { get; } = new("3d786f9d-f76e-11cf-9d89-0080c72e70a3"); /// /// Phase angle which corresponds to a series. /// - public static Guid PhaseAngleMin { get; } = new Guid("dc762340-3c56-11d2-ae44-0060083a2628"); + public static Guid PhaseAngleMin { get; } = new("dc762340-3c56-11d2-ae44-0060083a2628"); /// /// Phase angle which corresponds to a series. /// - public static Guid PhaseAngleMax { get; } = new Guid("dc762341-3c56-11d2-ae44-0060083a2628"); + public static Guid PhaseAngleMax { get; } = new("dc762341-3c56-11d2-ae44-0060083a2628"); /// /// Phase angle which corresponds to an series. /// - public static Guid PhaseAngleAvg { get; } = new Guid("dc762342-3c56-11d2-ae44-0060083a2628"); + public static Guid PhaseAngleAvg { get; } = new("dc762342-3c56-11d2-ae44-0060083a2628"); /// /// Area under the signal, usually an rms voltage, current, or other quantity. /// - public static Guid Area { get; } = new Guid("c7825ce0-8ace-11d3-b92f-0050da2b1f4d"); + public static Guid Area { get; } = new("c7825ce0-8ace-11d3-b92f-0050da2b1f4d"); /// /// Latitude. /// - public static Guid Latitude { get; } = new Guid("c690e864-f755-11cf-9d89-0080c72e70a3"); + public static Guid Latitude { get; } = new("c690e864-f755-11cf-9d89-0080c72e70a3"); /// /// Duration. /// - public static Guid Duration { get; } = new Guid("c690e863-f755-11cf-9d89-0080c72e70a3"); + public static Guid Duration { get; } = new("c690e863-f755-11cf-9d89-0080c72e70a3"); /// /// Longitude. /// - public static Guid Longitude { get; } = new Guid("c690e865-f755-11cf-9d89-0080c72e70a3"); + public static Guid Longitude { get; } = new("c690e865-f755-11cf-9d89-0080c72e70a3"); /// /// Polarity. /// - public static Guid Polarity { get; } = new Guid("c690e866-f755-11cf-9d89-0080c72e70a3"); + public static Guid Polarity { get; } = new("c690e866-f755-11cf-9d89-0080c72e70a3"); /// /// Ellipse (for lightning flash density). /// - public static Guid Ellipse { get; } = new Guid("c690e867-f755-11cf-9d89-0080c72e70a3"); + public static Guid Ellipse { get; } = new("c690e867-f755-11cf-9d89-0080c72e70a3"); /// /// BinID. /// - public static Guid BinID { get; } = new Guid("c690e869-f755-11cf-9d89-0080c72e70a3"); + public static Guid BinID { get; } = new("c690e869-f755-11cf-9d89-0080c72e70a3"); /// /// BinHigh. /// - public static Guid BinHigh { get; } = new Guid("c690e86a-f755-11cf-9d89-0080c72e70a3"); + public static Guid BinHigh { get; } = new("c690e86a-f755-11cf-9d89-0080c72e70a3"); /// /// BinLow. /// - public static Guid BinLow { get; } = new Guid("c690e86b-f755-11cf-9d89-0080c72e70a3"); + public static Guid BinLow { get; } = new("c690e86b-f755-11cf-9d89-0080c72e70a3"); /// /// XBinHigh. /// - public static Guid XBinHigh { get; } = new Guid("c690e86c-f755-11cf-9d89-0080c72e70a3"); + public static Guid XBinHigh { get; } = new("c690e86c-f755-11cf-9d89-0080c72e70a3"); /// /// XBinLow. /// - public static Guid XBinLow { get; } = new Guid("c690e86d-f755-11cf-9d89-0080c72e70a3"); + public static Guid XBinLow { get; } = new("c690e86d-f755-11cf-9d89-0080c72e70a3"); /// /// YBinHigh. /// - public static Guid YBinHigh { get; } = new Guid("c690e86e-f755-11cf-9d89-0080c72e70a3"); + public static Guid YBinHigh { get; } = new("c690e86e-f755-11cf-9d89-0080c72e70a3"); /// /// YBinLow. /// - public static Guid YBinLow { get; } = new Guid("c690e86f-f755-11cf-9d89-0080c72e70a3"); + public static Guid YBinLow { get; } = new("c690e86f-f755-11cf-9d89-0080c72e70a3"); /// /// Count. /// - public static Guid Count { get; } = new Guid("c690e870-f755-11cf-9d89-0080c72e70a3"); + public static Guid Count { get; } = new("c690e870-f755-11cf-9d89-0080c72e70a3"); /// /// Transition event code series. @@ -162,57 +162,57 @@ public static class SeriesValueType /// series that indicates what kind of transition caused the event /// to be recorded. Used only with VALUELOG data. /// - public static Guid Transition { get; } = new Guid("5369c260-c347-11d2-923f-00104b2b84b1"); + public static Guid Transition { get; } = new("5369c260-c347-11d2-923f-00104b2b84b1"); /// /// Cumulative probability in percent. /// - public static Guid Prob { get; } = new Guid("6763cc71-17d6-11d4-9f1c-002078e0b723"); + public static Guid Prob { get; } = new("6763cc71-17d6-11d4-9f1c-002078e0b723"); /// /// Interval data. /// - public static Guid Interval { get; } = new Guid("72e82a40-336c-11d5-a4b3-444553540000"); + public static Guid Interval { get; } = new("72e82a40-336c-11d5-a4b3-444553540000"); /// /// Status data. /// - public static Guid Status { get; } = new Guid("b82b5c82-55c7-11d5-a4b3-444553540000"); + public static Guid Status { get; } = new("b82b5c82-55c7-11d5-a4b3-444553540000"); /// /// Probability: 1%. /// - public static Guid P1 { get; } = new Guid("67f6af9c-f753-11cf-9d89-0080c72e70a3"); + public static Guid P1 { get; } = new("67f6af9c-f753-11cf-9d89-0080c72e70a3"); /// /// Probability: 5%. /// - public static Guid P5 { get; } = new Guid("67f6af9d-f753-11cf-9d89-0080c72e70a3"); + public static Guid P5 { get; } = new("67f6af9d-f753-11cf-9d89-0080c72e70a3"); /// /// Probability: 10%. /// - public static Guid P10 { get; } = new Guid("67f6af9e-f753-11cf-9d89-0080c72e70a3"); + public static Guid P10 { get; } = new("67f6af9e-f753-11cf-9d89-0080c72e70a3"); /// /// Probability: 90%. /// - public static Guid P90 { get; } = new Guid("67f6af9f-f753-11cf-9d89-0080c72e70a3"); + public static Guid P90 { get; } = new("67f6af9f-f753-11cf-9d89-0080c72e70a3"); /// /// Probability: 95%. /// - public static Guid P95 { get; } = new Guid("c690e860-f755-11cf-9d89-0080c72e70a3"); + public static Guid P95 { get; } = new("c690e860-f755-11cf-9d89-0080c72e70a3"); /// /// Probability: 99%. /// - public static Guid P99 { get; } = new Guid("c690e861-f755-11cf-9d89-0080c72e70a3"); + public static Guid P99 { get; } = new("c690e861-f755-11cf-9d89-0080c72e70a3"); /// /// Frequency. /// - public static Guid Frequency { get; } = new Guid("c690e868-f755-11cf-9d89-0080c72e70a3"); + public static Guid Frequency { get; } = new("c690e868-f755-11cf-9d89-0080c72e70a3"); /// /// Gets information about the series value type identified by the given ID. diff --git a/src/Gemstone.PQDIF/Logical/Vendor.cs b/src/Gemstone.PQDIF/Logical/Vendor.cs index a99207725..b632db2ca 100644 --- a/src/Gemstone.PQDIF/Logical/Vendor.cs +++ b/src/Gemstone.PQDIF/Logical/Vendor.cs @@ -35,162 +35,162 @@ public static class Vendor /// /// The ID for vendor SATEC. /// - public static Guid SATEC { get; } = new Guid("e2da5081-7fdb-11d3-9b39-0040052c2d28"); + public static Guid SATEC { get; } = new("e2da5081-7fdb-11d3-9b39-0040052c2d28"); /// /// The ID for vendor WPT. /// - public static Guid WPT { get; } = new Guid("e2da5082-7fdb-11d3-9b39-0040052c2d28"); + public static Guid WPT { get; } = new("e2da5082-7fdb-11d3-9b39-0040052c2d28"); /// /// The ID representing no vendor. /// - public static Guid None { get; } = new Guid("e6b51701-f747-11cf-9d89-0080c72e70a3"); + public static Guid None { get; } = new("e6b51701-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor BMI. /// - public static Guid BMI { get; } = new Guid("e6b51702-f747-11cf-9d89-0080c72e70a3"); + public static Guid BMI { get; } = new("e6b51702-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor BPA. /// - public static Guid BPA { get; } = new Guid("e6b51702-f747-11cf-9d89-0080c72e70a3"); + public static Guid BPA { get; } = new("e6b51702-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor CESI. /// - public static Guid CESI { get; } = new Guid("e6b51704-f747-11cf-9d89-0080c72e70a3"); + public static Guid CESI { get; } = new("e6b51704-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor Cooper. /// - public static Guid Cooper { get; } = new Guid("e6b51705-f747-11cf-9d89-0080c72e70a3"); + public static Guid Cooper { get; } = new("e6b51705-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor DCG. /// - public static Guid DCG { get; } = new Guid("e6b51706-f747-11cf-9d89-0080c72e70a3"); + public static Guid DCG { get; } = new("e6b51706-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor Dranetz. /// - public static Guid Dranetz { get; } = new Guid("e6b51707-f747-11cf-9d89-0080c72e70a3"); + public static Guid Dranetz { get; } = new("e6b51707-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor EDF. /// - public static Guid EDF { get; } = new Guid("e6b51708-f747-11cf-9d89-0080c72e70a3"); + public static Guid EDF { get; } = new("e6b51708-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor Electric Power Research Institute. /// - public static Guid EPRI { get; } = new Guid("e6b51709-f747-11cf-9d89-0080c72e70a3"); + public static Guid EPRI { get; } = new("e6b51709-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor Electrotek. /// - public static Guid Electrotek { get; } = new Guid("e6b5170a-f747-11cf-9d89-0080c72e70a3"); + public static Guid Electrotek { get; } = new("e6b5170a-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor Fluke. /// - public static Guid Fluke { get; } = new Guid("e6b5170b-f747-11cf-9d89-0080c72e70a3"); + public static Guid Fluke { get; } = new("e6b5170b-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor Hydro-Quebec. /// - public static Guid HydroQuebec { get; } = new Guid("e6b5170c-f747-11cf-9d89-0080c72e70a3"); + public static Guid HydroQuebec { get; } = new("e6b5170c-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor IEEE. /// - public static Guid IEEE { get; } = new Guid("e6b5170d-f747-11cf-9d89-0080c72e70a3"); + public static Guid IEEE { get; } = new("e6b5170d-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor Kreiss Johnson. /// - public static Guid KreissJohnson { get; } = new Guid("e6b5170e-f747-11cf-9d89-0080c72e70a3"); + public static Guid KreissJohnson { get; } = new("e6b5170e-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor Metrosonic. /// - public static Guid Metrosonic { get; } = new Guid("e6b5170f-f747-11cf-9d89-0080c72e70a3"); + public static Guid Metrosonic { get; } = new("e6b5170f-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor PML. /// - public static Guid PML { get; } = new Guid("e6b51710-f747-11cf-9d89-0080c72e70a3"); + public static Guid PML { get; } = new("e6b51710-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor PSI. /// - public static Guid PSI { get; } = new Guid("e6b51711-f747-11cf-9d89-0080c72e70a3"); + public static Guid PSI { get; } = new("e6b51711-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor PTI. /// - public static Guid PTI { get; } = new Guid("e6b51712-f747-11cf-9d89-0080c72e70a3"); + public static Guid PTI { get; } = new("e6b51712-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for public domain hardware. /// - public static Guid PublicDomain { get; } = new Guid("e6b51713-f747-11cf-9d89-0080c72e70a3"); + public static Guid PublicDomain { get; } = new("e6b51713-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor RPM. /// - public static Guid RPM { get; } = new Guid("e6b51714-f747-11cf-9d89-0080c72e70a3"); + public static Guid RPM { get; } = new("e6b51714-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor Square D PowerLogic. /// - public static Guid SquareDPowerLogic { get; } = new Guid("e6b51715-f747-11cf-9d89-0080c72e70a3"); + public static Guid SquareDPowerLogic { get; } = new("e6b51715-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor Telog. /// - public static Guid Telog { get; } = new Guid("e6b51716-f747-11cf-9d89-0080c72e70a3"); + public static Guid Telog { get; } = new("e6b51716-f747-11cf-9d89-0080c72e70a3"); /// /// The ID for vendor PMI. /// - public static Guid PMI { get; } = new Guid("609acec0-993d-11d4-a4b3-444553540000"); + public static Guid PMI { get; } = new("609acec0-993d-11d4-a4b3-444553540000"); /// /// The ID for vendor Met One. /// - public static Guid MetOne { get; } = new Guid("b5b5da61-e2e1-11d4-82d9-00e09872a094"); + public static Guid MetOne { get; } = new("b5b5da61-e2e1-11d4-82d9-00e09872a094"); /// /// The ID for vendor Trinergi. /// - public static Guid Trinergi { get; } = new Guid("0fd5a3a8-d73a-11d2-ac3e-444553540000"); + public static Guid Trinergi { get; } = new("0fd5a3a8-d73a-11d2-ac3e-444553540000"); /// /// The ID for vendor General Electric. /// - public static Guid GE { get; } = new Guid("5202bd00-245c-11d5-a4b3-444553540000"); + public static Guid GE { get; } = new("5202bd00-245c-11d5-a4b3-444553540000"); /// /// The ID for vendor LEM. /// - public static Guid LEM { get; } = new Guid("80c4a722-2816-11d4-8ab4-004005698d26"); + public static Guid LEM { get; } = new("80c4a722-2816-11d4-8ab4-004005698d26"); /// /// The ID for vendor ACTL. /// - public static Guid ACTL { get; } = new Guid("80c4a761-2816-11d4-8ab4-004005698d26"); + public static Guid ACTL { get; } = new("80c4a761-2816-11d4-8ab4-004005698d26"); /// /// The ID for vendor AdvanTech. /// - public static Guid AdvanTech { get; } = new Guid("650f988f-378c-47b8-baed-cccb3f959ad7"); + public static Guid AdvanTech { get; } = new("650f988f-378c-47b8-baed-cccb3f959ad7"); /// /// The ID for vendor ELCOM. /// - public static Guid ELCOM { get; } = new Guid("f7e9eb70-6f1d-11d6-9cb3-0020e010453b"); + public static Guid ELCOM { get; } = new("f7e9eb70-6f1d-11d6-9cb3-0020e010453b"); /// /// Gets information about the vendor identified by the given ID. diff --git a/src/Gemstone.PQDIF/Physical/CollectionElement.cs b/src/Gemstone.PQDIF/Physical/CollectionElement.cs index 01fa7cb55..f579165da 100644 --- a/src/Gemstone.PQDIF/Physical/CollectionElement.cs +++ b/src/Gemstone.PQDIF/Physical/CollectionElement.cs @@ -277,7 +277,7 @@ public VectorElement AddOrUpdateVector(Guid tag, PhysicalType type, byte[] bytes /// A string that represents the collection. public override string ToString() { - StringBuilder builder = new StringBuilder(); + StringBuilder builder = new(); string[] lines; builder.AppendFormat("Collection -- Size: {0}, Tag: {1}", Size, TagOfElement); diff --git a/src/Gemstone.PQDIF/Physical/PhysicalParser.cs b/src/Gemstone.PQDIF/Physical/PhysicalParser.cs index 0a651ef25..dc36755f9 100644 --- a/src/Gemstone.PQDIF/Physical/PhysicalParser.cs +++ b/src/Gemstone.PQDIF/Physical/PhysicalParser.cs @@ -429,8 +429,8 @@ private async Task ReadRecordHeaderAsync() int position = (int)m_stream.Position; byte[] headerData = await ReadBytesAsync(HeaderSize); - using MemoryStream memoryStream = new MemoryStream(headerData); - using BinaryReader reader = new BinaryReader(memoryStream); + using MemoryStream memoryStream = new(headerData); + using BinaryReader reader = new(memoryStream); return new RecordHeader { @@ -461,8 +461,8 @@ private async Task ReadRecordBodyAsync(int byteSize) if (m_compressionAlgorithm == CompressionAlgorithm.Zlib && m_compressionStyle != CompressionStyle.None) bytes = ZlibStream.UncompressBuffer(bytes); - using MemoryStream stream = new MemoryStream(bytes); - using BinaryReader reader = new BinaryReader(stream); + using MemoryStream stream = new(bytes); + using BinaryReader reader = new(stream); CollectionElement root = ReadCollection(reader); return new RecordBody(root) { Checksum = checksum }; } @@ -548,7 +548,7 @@ private Element ReadElement(BinaryReader recordBodyReader) private CollectionElement ReadCollection(BinaryReader recordBodyReader) { int size = recordBodyReader.ReadInt32(); - CollectionElement collection = new CollectionElement(size); + CollectionElement collection = new(size); for (int i = 0; i < size; i++) { @@ -564,7 +564,7 @@ private CollectionElement ReadCollection(BinaryReader recordBodyReader) // Reads a vector element from the PQDIF file. private VectorElement ReadVector(BinaryReader recordBodyReader, PhysicalType typeOfValue) { - VectorElement element = new VectorElement + VectorElement element = new() { Size = recordBodyReader.ReadInt32(), TypeOfValue = typeOfValue @@ -580,7 +580,7 @@ private VectorElement ReadVector(BinaryReader recordBodyReader, PhysicalType typ // Reads a scalar element from the PQDIF file. private ScalarElement ReadScalar(BinaryReader recordBodyReader, PhysicalType typeOfValue) { - ScalarElement element = new ScalarElement + ScalarElement element = new() { TypeOfValue = typeOfValue }; diff --git a/src/Gemstone.PQDIF/Physical/PhysicalType.cs b/src/Gemstone.PQDIF/Physical/PhysicalType.cs index bcaba8df0..5475d89cc 100644 --- a/src/Gemstone.PQDIF/Physical/PhysicalType.cs +++ b/src/Gemstone.PQDIF/Physical/PhysicalType.cs @@ -196,7 +196,7 @@ public static int GetByteSize(this PhysicalType type) /// The physical type that most closely maps to the given type. public static PhysicalType GetPhysicalType(Type type) { - Dictionary physicalTypeLookup = new Dictionary + Dictionary physicalTypeLookup = new() { { typeof(bool), PhysicalType.Boolean4 }, { typeof(sbyte), PhysicalType.Integer1 }, diff --git a/src/Gemstone.PQDIF/Physical/PhysicalWriter.cs b/src/Gemstone.PQDIF/Physical/PhysicalWriter.cs index a3ad2a0c1..5b160f607 100644 --- a/src/Gemstone.PQDIF/Physical/PhysicalWriter.cs +++ b/src/Gemstone.PQDIF/Physical/PhysicalWriter.cs @@ -80,7 +80,7 @@ public PhysicalWriter(Stream stream, bool leaveOpen = false) /// /// Gets or sets the compression style used by the PQDIF file. /// - /// Attempt is made to set . + /// Attempt is made to set . public CompressionStyle CompressionStyle { get @@ -99,7 +99,7 @@ public CompressionStyle CompressionStyle /// /// Gets or sets the compression algorithm used by the PQDIF file. /// - /// Attempt is made to set . + /// Attempt is made to set . public CompressionAlgorithm CompressionAlgorithm { get @@ -134,8 +134,8 @@ public async Task WriteRecordAsync(Record record, bool lastRecord = false) byte[] bodyImage; uint checksum; - using (MemoryStream bodyStream = new MemoryStream()) - using (BinaryWriter bodyWriter = new BinaryWriter(bodyStream)) + using (MemoryStream bodyStream = new()) + await using (BinaryWriter bodyWriter = new(bodyStream)) { // Write the record body to the memory stream if (record.Body != null) @@ -162,8 +162,8 @@ public async Task WriteRecordAsync(Record record, bool lastRecord = false) record.Header.NextRecordPosition = (int)m_stream.Length + record.Header.HeaderSize + record.Header.BodySize; record.Header.Checksum = checksum; - using (MemoryStream headerStream = new MemoryStream()) - using (BinaryWriter headerWriter = new BinaryWriter(headerStream)) + using (MemoryStream headerStream = new()) + await using (BinaryWriter headerWriter = new(headerStream)) { // Write up to the next record position headerWriter.Write(record.Header.RecordSignature.ToByteArray()); diff --git a/src/Gemstone.PQDIF/Physical/Record.cs b/src/Gemstone.PQDIF/Physical/Record.cs index 247314baf..143f1a920 100644 --- a/src/Gemstone.PQDIF/Physical/Record.cs +++ b/src/Gemstone.PQDIF/Physical/Record.cs @@ -126,7 +126,7 @@ public Record(RecordHeader header, RecordBody body) /// A string representation of the record. public override string ToString() { - StringBuilder builder = new StringBuilder(); + StringBuilder builder = new(); builder.Append(Header); builder.AppendLine(); @@ -145,7 +145,7 @@ public override string ToString() /// /// The standard signature used for all PQDIF records. /// - public static Guid Signature { get; } = new Guid("4a111440-e49f-11cf-9900-505144494600"); + public static Guid Signature { get; } = new("4a111440-e49f-11cf-9900-505144494600"); private static Dictionary RecordTypeTagMap { get; } = CreateRecordTypeTagMap(); diff --git a/src/Gemstone.PQDIF/Physical/RecordHeader.cs b/src/Gemstone.PQDIF/Physical/RecordHeader.cs index 7a9418434..2b464c594 100644 --- a/src/Gemstone.PQDIF/Physical/RecordHeader.cs +++ b/src/Gemstone.PQDIF/Physical/RecordHeader.cs @@ -116,7 +116,7 @@ public RecordHeader(Guid recordTypeTag) : this() => /// A string representation of the record header. public override string ToString() { - StringBuilder builder = new StringBuilder(); + StringBuilder builder = new(); builder.AppendFormat("Record type: {0}", TypeOfRecord); builder.AppendLine(); diff --git a/src/Gemstone.PQDIF/Physical/ScalarElement.cs b/src/Gemstone.PQDIF/Physical/ScalarElement.cs index 1a12ee9d9..ac0df41af 100644 --- a/src/Gemstone.PQDIF/Physical/ScalarElement.cs +++ b/src/Gemstone.PQDIF/Physical/ScalarElement.cs @@ -628,7 +628,7 @@ public DateTime GetTimestamp() // timestamps. However, the constant defined in the standard is 25569 days, whereas the actual // number of days between those two dates is 25567 days; a two day difference. That is why we // need to also subtract two days here when parsing PQDIF timestamps. - DateTime epoch = new DateTime(1900, 1, 1); + DateTime epoch = new(1900, 1, 1); return epoch.AddDays(days - 2u).AddSeconds(seconds); } @@ -638,7 +638,7 @@ public DateTime GetTimestamp() /// The new value of this scalar as a . public void SetTimestamp(DateTime value) { - DateTime epoch = new DateTime(1900, 1, 1); + DateTime epoch = new(1900, 1, 1); TimeSpan sinceEpoch = value - epoch; TimeSpan daysSinceEpoch = TimeSpan.FromDays(Math.Floor(sinceEpoch.TotalDays)); TimeSpan secondsSinceMidnight = sinceEpoch - daysSinceEpoch; diff --git a/src/Gemstone.PQDIF/Physical/VectorElement.cs b/src/Gemstone.PQDIF/Physical/VectorElement.cs index 3c21c69aa..884629c2a 100644 --- a/src/Gemstone.PQDIF/Physical/VectorElement.cs +++ b/src/Gemstone.PQDIF/Physical/VectorElement.cs @@ -571,7 +571,7 @@ public DateTime GetTimestamp(int index) // timestamps. However, the constant defined in the standard is 25569 days, whereas the actual // number of days between those two dates is 25567 days; a two day difference. That is why we // need to also subtract two days here when parsing PQDIF timestamps. - DateTime epoch = new DateTime(1900, 1, 1); + DateTime epoch = new(1900, 1, 1); return epoch.AddDays(days - 2u).AddSeconds(seconds); } @@ -582,7 +582,7 @@ public DateTime GetTimestamp(int index) /// The new value of a . public void SetTimestamp(int index, DateTime value) { - DateTime epoch = new DateTime(1900, 1, 1); + DateTime epoch = new(1900, 1, 1); TimeSpan sinceEpoch = value - epoch; TimeSpan daysSinceEpoch = TimeSpan.FromDays(Math.Floor(sinceEpoch.TotalDays)); TimeSpan secondsSinceMidnight = sinceEpoch - daysSinceEpoch;