more null handling hijinks

BHoM · Dec 1, 2022 · 66f7a44 · 66f7a44
1 parent 2ba80e5
commit 66f7a44
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 1 deletion.
diff --git a/LadybugTools_Engine/Compute/EPWtoCSV.cs b/LadybugTools_Engine/Compute/EPWtoCSV.cs
@@ -39,11 +39,13 @@ public static string EPWtoCSV(string epwFile)
             if (epwFile == null)
             {
                 BH.Engine.Base.Compute.RecordError("epwFile input cannot be null.");
+                return null;
             }
 
             if (!System.IO.File.Exists(epwFile))
             {
                 BH.Engine.Base.Compute.RecordError($"{epwFile} doesn't appear to exist!");
+                return null;
             }
 
             BH.oM.Python.PythonEnvironment env = Compute.InstallPythonEnv_LBT(true);

diff --git a/LadybugTools_Engine/Compute/EPWtoCustomObject.cs b/LadybugTools_Engine/Compute/EPWtoCustomObject.cs
@@ -41,11 +41,13 @@ public static CustomObject EPWtoCustomObject(string epwFile)
             if (epwFile == null)
             {
                 BH.Engine.Base.Compute.RecordError("epwFile input cannot be null.");
+                return null;
             }
 
             if (!System.IO.File.Exists(epwFile))
             {
                 BH.Engine.Base.Compute.RecordError($"{epwFile} doesn't appear to exist!");
+                return null;
             }
 
             BH.oM.Python.PythonEnvironment env = Compute.InstallPythonEnv_LBT(true);

diff --git a/LadybugTools_Engine/Compute/ExternalComfort.cs b/LadybugTools_Engine/Compute/ExternalComfort.cs
@@ -46,11 +46,13 @@ public static ExternalComfort ExternalComfort(SimulationResult simulationResult,
             if (simulationResult == null)
             {
                 BH.Engine.Base.Compute.RecordError("simulationResult input cannot be null.");
+                return null;
             }
 
             if (typology == null)
             {
                 BH.Engine.Base.Compute.RecordError("typology input cannot be null.");
+                return null;
             }
 
             // construct the base object

diff --git a/LadybugTools_Engine/Compute/GEMtoHBJSON.cs b/LadybugTools_Engine/Compute/GEMtoHBJSON.cs
@@ -39,11 +39,13 @@ public static string GEMtoHBJSON(string gem)
             if (gem == null)
             {
                 BH.Engine.Base.Compute.RecordError("gem input cannot be null.");
+                return null;
             }
 
             if (!System.IO.File.Exists(gem))
             {
                 BH.Engine.Base.Compute.RecordError($"{gem} doesn't appear to exist!");
+                return null;
             }
 
             BH.oM.Python.PythonEnvironment env = Compute.InstallPythonEnv_LBT(true);

diff --git a/LadybugTools_Engine/Compute/HBJSONtoGEM.cs b/LadybugTools_Engine/Compute/HBJSONtoGEM.cs
@@ -39,11 +39,13 @@ public static string HBJSONtoGEM(string hbjson)
             if (hbjson == null)
             {
                 BH.Engine.Base.Compute.RecordError("hbjson input cannot be null.");
+                return null;
             }
 
             if (!System.IO.File.Exists(hbjson))
             {
                 BH.Engine.Base.Compute.RecordError($"{hbjson} doesn't appear to exist!");
+                return null;
             }
 
             BH.oM.Python.PythonEnvironment env = Compute.InstallPythonEnv_LBT(true);

diff --git a/LadybugTools_Engine/Compute/SimulationId.cs b/LadybugTools_Engine/Compute/SimulationId.cs
@@ -41,21 +41,25 @@ public static string SimulationId(string epwFile, ILBTMaterial groundMaterial, I
             if (epwFile == null)
             {
                 BH.Engine.Base.Compute.RecordError("epwFile input cannot be null.");
+                return null;
             }
 
             if (groundMaterial == null)
             {
                 BH.Engine.Base.Compute.RecordError("groundMaterial input cannot be null.");
+                return null;
             }
 
             if (shadeMaterial == null)
             {
                 BH.Engine.Base.Compute.RecordError("shadeMaterial input cannot be null.");
+                return null;
             }
 
             if (!System.IO.File.Exists(epwFile))
             {
                 BH.Engine.Base.Compute.RecordError($"{epwFile} doesn't appear to exist!");
+                return null;
             }
 
             string epwId = Convert.SanitiseString(Path.GetFileNameWithoutExtension(epwFile));

diff --git a/LadybugTools_Engine/Compute/SimulationResult.cs b/LadybugTools_Engine/Compute/SimulationResult.cs
@@ -46,21 +46,25 @@ public static SimulationResult SimulationResult(string epwFile, ILBTMaterial gro
             if (epwFile == null)
             {
                 BH.Engine.Base.Compute.RecordError("epwFile input cannot be null.");
+                return null;
             }
 
             if (groundMaterial == null)
             {
-                BH.Engine.Base.Compute.RecordError("groundMaterial) input cannot be null.");
+                BH.Engine.Base.Compute.RecordError("groundMaterial input cannot be null.");
+                return null;
             }
 
             if (shadeMaterial == null)
             {
                 BH.Engine.Base.Compute.RecordError("shadeMaterial input cannot be null.");
+                return null;
             }
 
             if (!System.IO.File.Exists(epwFile))
             {
                 BH.Engine.Base.Compute.RecordError($"{epwFile} doesn't appear to exist!");
+                return null;
             }
 
             // construct the base object