From bd918f82d620b6d7bb2c9e15210abe7670cc40ba Mon Sep 17 00:00:00 2001 From: Kalle Edstroem Date: Tue, 17 Oct 2023 14:01:17 +0100 Subject: [PATCH 1/5] Moved warning message out of loop and simplified it --- Lusas_Adapter/Private Helpers/GetFeatureResults.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Lusas_Adapter/Private Helpers/GetFeatureResults.cs b/Lusas_Adapter/Private Helpers/GetFeatureResults.cs index ad3cfc5b..80e3375b 100644 --- a/Lusas_Adapter/Private Helpers/GetFeatureResults.cs +++ b/Lusas_Adapter/Private Helpers/GetFeatureResults.cs @@ -23,6 +23,7 @@ using System.Collections.Generic; using System; using Lusas.LPI; +using System.ComponentModel; namespace BH.Adapter.Lusas { @@ -45,6 +46,7 @@ public partial class LusasV17Adapter private Dictionary GetFeatureResults(List components, Dictionary resultsSets, IFUnitSet unitSet, int id, string suffix, int resultType = 6) { Dictionary featureResults = new Dictionary(); + bool recordedWarning = false; IFResultsComponentSet resultsSet = null; foreach (string component in components) @@ -99,12 +101,17 @@ private Dictionary GetFeatureResults(List components, Di if (!(resultsSet.isValidValue(featureResult))) { featureResult = 0; - Engine.Base.Compute.RecordWarning($"{suffix}{id} {component} is an invalid result and will be set to zero"); + recordedWarning = true; } featureResults.Add(component, featureResult); } + if (recordedWarning) + { + Engine.Base.Compute.RecordWarning($"Invalid results (i.e. where DOF is released) will be set to zero"); + } + return featureResults; } From ededec18d3d05775bca6cd7085ab9116519b0520 Mon Sep 17 00:00:00 2001 From: Kalle Edstroem Date: Tue, 17 Oct 2023 15:05:29 +0100 Subject: [PATCH 2/5] Deleting import of namespace that appeared to be accidentally added --- Lusas_Adapter/Private Helpers/GetFeatureResults.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Lusas_Adapter/Private Helpers/GetFeatureResults.cs b/Lusas_Adapter/Private Helpers/GetFeatureResults.cs index 80e3375b..d40d0c56 100644 --- a/Lusas_Adapter/Private Helpers/GetFeatureResults.cs +++ b/Lusas_Adapter/Private Helpers/GetFeatureResults.cs @@ -23,7 +23,6 @@ using System.Collections.Generic; using System; using Lusas.LPI; -using System.ComponentModel; namespace BH.Adapter.Lusas { From 0f40beb50ef717b542ea196e9498e3bad3722465 Mon Sep 17 00:00:00 2001 From: Kalle Edstroem Date: Wed, 18 Oct 2023 09:04:39 +0100 Subject: [PATCH 3/5] Update Lusas_Adapter/Private Helpers/GetFeatureResults.cs Added punctuation to warning message. Co-authored-by: Peter Nugent --- Lusas_Adapter/Private Helpers/GetFeatureResults.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lusas_Adapter/Private Helpers/GetFeatureResults.cs b/Lusas_Adapter/Private Helpers/GetFeatureResults.cs index d40d0c56..6394dc7d 100644 --- a/Lusas_Adapter/Private Helpers/GetFeatureResults.cs +++ b/Lusas_Adapter/Private Helpers/GetFeatureResults.cs @@ -108,7 +108,7 @@ private Dictionary GetFeatureResults(List components, Di if (recordedWarning) { - Engine.Base.Compute.RecordWarning($"Invalid results (i.e. where DOF is released) will be set to zero"); + Engine.Base.Compute.RecordWarning($"Invalid results (i.e. where DOF is released) will be set to zero."); } return featureResults; From 31db5b3c5de68e2cbb9585870ead42d552933edd Mon Sep 17 00:00:00 2001 From: Kalle Edstroem Date: Wed, 18 Oct 2023 09:11:47 +0100 Subject: [PATCH 4/5] Update Lusas_Adapter/Private Helpers/GetFeatureResults.cs Change in object naming Co-authored-by: Peter Nugent --- Lusas_Adapter/Private Helpers/GetFeatureResults.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lusas_Adapter/Private Helpers/GetFeatureResults.cs b/Lusas_Adapter/Private Helpers/GetFeatureResults.cs index 6394dc7d..adf99e73 100644 --- a/Lusas_Adapter/Private Helpers/GetFeatureResults.cs +++ b/Lusas_Adapter/Private Helpers/GetFeatureResults.cs @@ -45,7 +45,7 @@ public partial class LusasV17Adapter private Dictionary GetFeatureResults(List components, Dictionary resultsSets, IFUnitSet unitSet, int id, string suffix, int resultType = 6) { Dictionary featureResults = new Dictionary(); - bool recordedWarning = false; + bool invalidResult = false; IFResultsComponentSet resultsSet = null; foreach (string component in components) From 6b0f72e945099817799ab0b3c6b4f480d9fab1f4 Mon Sep 17 00:00:00 2001 From: Kalle Edstroem Date: Wed, 18 Oct 2023 09:27:56 +0100 Subject: [PATCH 5/5] Changed object naming --- Lusas_Adapter/Private Helpers/GetFeatureResults.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lusas_Adapter/Private Helpers/GetFeatureResults.cs b/Lusas_Adapter/Private Helpers/GetFeatureResults.cs index adf99e73..8a6a79e5 100644 --- a/Lusas_Adapter/Private Helpers/GetFeatureResults.cs +++ b/Lusas_Adapter/Private Helpers/GetFeatureResults.cs @@ -100,13 +100,13 @@ private Dictionary GetFeatureResults(List components, Di if (!(resultsSet.isValidValue(featureResult))) { featureResult = 0; - recordedWarning = true; + invalidResult = true; } featureResults.Add(component, featureResult); } - if (recordedWarning) + if (invalidResult) { Engine.Base.Compute.RecordWarning($"Invalid results (i.e. where DOF is released) will be set to zero."); }