IOconfInput/Output: Refactored GetExpandedSensorNames and GetExpanded…

…Conf. (#365)
copenhagenatomics · Mar 3, 2025 · 04b4ddc · 04b4ddc
1 parent 79d3826
commit 04b4ddc
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 29 deletions.
diff --git a/CA_DataUploaderLib/IOconf/IOconfFile.cs b/CA_DataUploaderLib/IOconf/IOconfFile.cs
@@ -134,7 +134,7 @@ IEnumerable<string> GetBoardStateNamesForSensors(IEnumerable<string> sensors, Ha
                 sensorsChecked.UnionWith(sensors);
                 foreach (var input in GetEntries<IOconfRow>().Where(e => e is IIOconfRowWithBoardState))
                 {
-                    if (newSensors.Intersect(input.GetExpandedSensorNames(this)).Any())
+                    if (newSensors.Intersect(input.GetExpandedSensorNames()).Any())
                         yield return ((IIOconfRowWithBoardState)input).BoardStateName;
                 }
 

diff --git a/CA_DataUploaderLib/IOconf/IOconfFilter.cs b/CA_DataUploaderLib/IOconf/IOconfFilter.cs
@@ -69,7 +69,7 @@ public IOconfFilter(string row, int lineNum) : base(row, lineNum, "Filter")
         public static List<LegacyFilter> LegacyFilters(IEnumerable<IOconfFilter> filters) => filters.Select(f => f._legacyFilter).OfType<LegacyFilter>().ToList();
         public static List<DecisionFilter> DecisionFilters(IEnumerable<IOconfFilter> filters) => filters.Select(f => f._decisionFilter).OfType<DecisionFilter>().ToList();
 
-        public override IEnumerable<string> GetExpandedSensorNames(IIOconf ioconf)
+        public override IEnumerable<string> GetExpandedSensorNames()
         {
             yield return NameInVector;
         }

diff --git a/CA_DataUploaderLib/IOconf/IOconfInput.cs b/CA_DataUploaderLib/IOconf/IOconfInput.cs
@@ -36,7 +36,7 @@ public override void ValidateDependencies(IIOconf ioconf)
             Map = GetMap(ioconf, BoxName, _boardSettings, Skip);
         }
 
-        public override IEnumerable<string> GetExpandedSensorNames(IIOconf ioconf)
+        public override IEnumerable<string> GetExpandedSensorNames()
         {
             yield return Name;
         }
@@ -107,12 +107,11 @@ public override void ValidateDependencies(IIOconf ioconf)
                 Map = GetMap(ioconf, BoxName, _boardSettings, false);
             }
 
-            public virtual IEnumerable<IOconfInput> GetExpandedConf() => [];
-
-            public override IEnumerable<string> GetExpandedSensorNames(IIOconf ioconf)
+            public virtual IEnumerable<IOconfInput> GetExpandedConf()
             {
-                foreach (var input in GetExpandedConf())
-                    yield return input.Name;
+                var portNumber = PortNumber;
+                foreach (var input in GetExpandedSensorNames())
+                    yield return NewInput(input, portNumber++);
             }
 
             public string BoxName { get; }

diff --git a/CA_DataUploaderLib/IOconf/IOconfMath.cs b/CA_DataUploaderLib/IOconf/IOconfMath.cs
@@ -9,9 +9,9 @@ namespace CA_DataUploaderLib.IOconf
 {
     public class IOconfMath : IOconfRow
     {
-        /// <summary>gets the sources (other vector values) listed explicitely in the math expression</summary>
+        /// <summary>gets the sources (other vector values) listed explicitly in the math expression</summary>
         /// <remarks>
-        /// Note the sources may include the math expression itself, which is the expression refering to its value in the previous cycle.
+        /// Note the sources may include the math expression itself, which is the expression referring to its value in the previous cycle.
         /// Also note that the sources returned may also refer to the math expression.
         /// </remarks>
         public List<string> SourceNames { get; }
@@ -42,7 +42,7 @@ public static (LogicalExpression expression, List<string> sources) CompileExpres
             return (compiledExpression, sourceNames);
         }
 
-        public override IEnumerable<string> GetExpandedSensorNames(IIOconf ioconf)
+        public override IEnumerable<string> GetExpandedSensorNames()
         {
             yield return Name;
         }

diff --git a/CA_DataUploaderLib/IOconf/IOconfOut230Vac.cs b/CA_DataUploaderLib/IOconf/IOconfOut230Vac.cs
@@ -12,15 +12,16 @@ public IOconfOut230Vac(string row, int lineNum, string type) : base(row, lineNum
 
         public string CurrentSensorName { get; }
         public bool IsSwitchboardControllerOutput { get; }
-        public override IEnumerable<IOconfInput> GetExpandedInputConf()
-        { // note "_onoff" is not included as its not an input but the current expected on/off state as seen by the control loop.
-            yield return NewPortInput(CurrentSensorName, 0 + PortNumber);
+
+        public override IEnumerable<string> GetExpandedSensorNames()
+        {
+            yield return CurrentSensorName;
         }
 
-        public override IEnumerable<string> GetExpandedSensorNames(IIOconf ioconf)
+        public override IEnumerable<string> GetExpandedNames(IIOconf ioconf)
         {
             yield return Name;
-            foreach (var name in base.GetExpandedSensorNames(ioconf))
+            foreach (var name in base.GetExpandedNames(ioconf))
                 yield return name;
         }
 

diff --git a/CA_DataUploaderLib/IOconf/IOconfOutput.cs b/CA_DataUploaderLib/IOconf/IOconfOutput.cs
@@ -20,14 +20,11 @@ public IOconfOutput(string row, int lineNum, string type, bool parsePort, BoardS
             if (PortNumber < 1) throw new Exception($"{type}: port numbers must start at 1 {row}");
         }
 
-        public virtual IEnumerable<IOconfInput> GetExpandedInputConf() => [];
-        protected IEnumerable<IOconfInput> GetExpandedInputConf(IEnumerable<string> suffixes) => 
-            suffixes.Select((s, i) => NewPortInput($"{Name}_{s}", PortNumber + i));
-
-        public override IEnumerable<string> GetExpandedSensorNames(IIOconf ioconf)
+        public virtual IEnumerable<IOconfInput> GetExpandedInputConf()
         {
-            foreach (var input in GetExpandedInputConf())
-                yield return input.Name;
+            var portNumber = PortNumber;
+            foreach (var input in GetExpandedSensorNames())
+                yield return NewPortInput(input, portNumber++);
         }
 
         public override void ValidateDependencies(IIOconf ioconf)

diff --git a/CA_DataUploaderLib/IOconf/IOconfRow.cs b/CA_DataUploaderLib/IOconf/IOconfRow.cs
@@ -76,17 +76,14 @@ protected virtual void ValidateName(string name)
         /// <summary>
         /// Returns the list of expanded vector field names from this class.
         /// </summary>
-        public virtual IEnumerable<string> GetExpandedSensorNames(IIOconf ioconf)
-        {
-            return [];
-        }
+        public virtual IEnumerable<string> GetExpandedSensorNames() => [];
 
         /// <summary>
         /// Returns the full list of expanded vector field names from this class and it's associated decisions.
         /// </summary>
         public virtual IEnumerable<string> GetExpandedNames(IIOconf ioconf) 
         {
-            foreach (var name in GetExpandedSensorNames(ioconf))
+            foreach (var name in GetExpandedSensorNames())
                 yield return name;
             if (this is IIOconfRowWithDecision entryWithDecision)
             {

diff --git a/CA_DataUploaderLib/Redundancy.cs b/CA_DataUploaderLib/Redundancy.cs
@@ -30,6 +30,8 @@ public class IOconfRedundant : IOconfRow
         {
             protected IOconfRedundant(string row, int lineNum, string type) : base(row, lineNum, type) { }
 
+            public override IEnumerable<string> GetExpandedSensorNames() => [Name];
+
             public static IEnumerable<Decision.Config> ToDecisionConfigs(IEnumerable<IOconfRedundant> redundants, IIOconf ioconf)
             {
                 var invalidValueDelay = redundants.OfType<IOconfRedundantInvalidValueDelay>().SingleOrDefault()?.InvalidValueDelay ?? 0;
@@ -63,7 +65,7 @@ public IOconfRedundantSensors(string row, int lineNum) : base(row, lineNum, RowT
             public override void ValidateDependencies(IIOconf ioconf)
             {
                 foreach (var sensor in Sensors)
-                    if (!ioconf.GetEntries<IOconfRow>().Any(e => e.GetExpandedSensorNames(ioconf).Contains(sensor)))
+                    if (!ioconf.GetEntries<IOconfRow>().Any(e => e.GetExpandedSensorNames().Contains(sensor)))
                         throw new FormatException($"Failed to find {sensor} for {RowType}: {Row}");
             }