Consistency refactor

.gitignore

@@ -13,3 +13,4 @@ configurations/*
 */buildoutput/*
 Service/configurations/*
 Service/files/*
+.idea/*

Connector/ConnectorRuntime.cs

@@ -16,6 +16,7 @@
 
 using Cognite.Simulator.Utils;
 using CogniteSdk.Alpha;
+using Connector.Dwsim;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 

Connector/Dwsim/AutomationConfig.cs

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 using Cognite.Simulator.Utils.Automation;
 
-namespace Connector;
+namespace Connector.Dwsim;
 
 public class DwsimAutomationConfig : AutomationConfig
 {
     public string DwsimInstallationPath { get; set; }
 
     public DwsimAutomationConfig()
     {
         ProgramId = "DWSIM.Automation.Automation3";
     }

Connector/Dwsim/DwsimClient.cs

@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-using Cognite.Simulator.Utils;
-using Cognite.Simulator.Utils.Automation;
-using CogniteSdk.Alpha;
-using Microsoft.Extensions.Logging;
+
 using System.Collections;
 using System.Diagnostics;
 using System.Globalization;
 using System.Reflection;
 using System.Resources;
 using System.Runtime.InteropServices;
+using Cognite.Simulator.Utils;
+using Cognite.Simulator.Utils.Automation;
+using CogniteSdk.Alpha;
+using Microsoft.Extensions.Logging;
 
-namespace Connector
+namespace Connector.Dwsim
 {
     /// <summary>
     /// Wrapper class that 
@@ -40,7 +40,7 @@
         private readonly UnitConverter _unitConverter;
 
         // Lock to prevent concurrent access to simulator resources
-        private readonly object simulatorLock = new object();
+        private readonly object _simulatorLock = new object();
 
         public DwsimClient(
             ILogger<DwsimClient> logger, DefaultConfig<DwsimAutomationConfig> config)
@@ -54,8 +54,8 @@
             string propsDll = Path.Combine(config.Automation.DwsimInstallationPath, "DWSIM.FlowsheetBase.dll");
             Assembly assembly = Assembly.LoadFrom(propsDll);
             ResourceManager rm = new ResourceManager("DWSIM.FlowsheetBase.Properties", assembly);
             _propMap = rm.GetResourceSet(CultureInfo.InvariantCulture, true, false)
                 .Cast<DictionaryEntry>().ToDictionary(x => x.Key.ToString(), x => x.Value.ToString());
             _unitConverter = new UnitConverter(config.Automation.DwsimInstallationPath);
         }
 
@@ -72,7 +72,7 @@
         {
             _logger.LogInformation("Testing DWSIM connection...");
 
-            lock (simulatorLock)
+            lock (_simulatorLock)
             {
                 try
                 {
@@ -91,7 +91,7 @@
         public bool CanOpenModel(string path)
         {
             _logger.LogDebug("Attempting to open file {Path}", path);
-            lock (simulatorLock)
+            lock (_simulatorLock)
             {
                 try
                 {
@@ -118,7 +118,7 @@
         public Task<Dictionary<string, SimulatorValueItem>> RunSimulation(DefaultModelFilestate modelState, SimulatorRoutineRevision routineRev, Dictionary<string, SimulatorValueItem> inputData)
         {
             _logger.LogDebug($"- Started running {routineRev.ExternalId} in DWSIM");
-            lock (simulatorLock)
+            lock (_simulatorLock)
             {
                 try
                 {