git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C2028

VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb

@@ -80,33 +80,20 @@ Public Class AuxiliaryConfig
     'Set Default Values
     Private Sub setDefaults()
 
-        '.CycleDurationMinutes=51.9,
-
         VectoInputs = New VectoInputs With {.Cycle = "Urban", .VehicleWeightKG = 16500, .PowerNetVoltage = 28.3, .FuelMap = "testFuelGoodMap.vmap"}
+        Signals = New Signals With {.EngineSpeed = 2000, .TotalCycleTimeSeconds = 3114, .ClutchEngaged = False}
 
-        'Pneumatics
+        'Pneumatics set deault values
         PneumaticUserInputsConfig = New PneumaticUserInputsConfig(True)
         PneumaticAuxillariesConfig = New PneumaticsAuxilliariesConfig(True)
 
-        'testAlternatorMap.aalt
-        ElectricalUserInputsConfig = New ElectricsUserInputsConfig() With {.DoorActuationTimeSecond = 4,
-                                                                            .StoredEnergyEfficiency = 0.935,
-                                                                            .AlternatorGearEfficiency = 0.92,
-                                                                            .PowerNetVoltage = VectoInputs.PowerNetVoltage,
-                                                                            .ResultCardIdle = New ResultCard(New List(Of SmartResult)),
-                                                                            .ResultCardOverrun = New ResultCard(New List(Of SmartResult)),
-                                                                            .ResultCardTraction = New ResultCard(New List(Of SmartResult)),
-                                                                            .SmartElectrical = False,
-                                                                            .AlternatorMap = String.Empty
-                                                                            }
+        'Electrical set deault values
+        ElectricalUserInputsConfig = New ElectricsUserInputsConfig(True, VectoInputs)
+        ElectricalUserInputsConfig.ElectricalConsumers = New ElectricalConsumerList(28.3, 0.096, True)
 
+        'HVAC set deault values
         HvacUserInputsConfig = New HVACUserInputsConfig(String.Empty, String.Empty, False)
 
-
-        Signals = New Signals With {.EngineSpeed = 2000, .TotalCycleTimeSeconds = 3114, .ClutchEngaged = False}
-
-        ElectricalUserInputsConfig.ElectricalConsumers = New ElectricalConsumerList(28.3, 0.096, True)
-
     End Sub
 
     Private Function GetDoorActuationTimeFraction() As Single

VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb

@@ -15,7 +15,6 @@ Namespace Electrics
 Public Class ElectricsUserInputsConfig
 Implements IElectricsUserInputsConfig
 
-
         Public Property PowerNetVoltage As Single Implements IElectricsUserInputsConfig.PowerNetVoltage
         Public Property AlternatorMap As String Implements IElectricsUserInputsConfig.AlternatorMap
         Public Property AlternatorGearEfficiency As Single Implements IElectricsUserInputsConfig.AlternatorGearEfficiency
@@ -29,7 +28,25 @@ Implements IElectricsUserInputsConfig
 
         Public Property SmartElectrical As Boolean Implements IElectricsUserInputsConfig.SmartElectrical
 
+        Public Sub New(Optional setToDefaults As Boolean = False, Optional vectoInputs As VectoInputs = Nothing)
+
+            If setToDefaults Then SetPropertiesToDefaults(vectoInputs)
+
+        End Sub
+
+        Public Sub SetPropertiesToDefaults(vectoInputs As VectoInputs)
+
+            DoorActuationTimeSecond = 4
+            StoredEnergyEfficiency = 0.935
+            AlternatorGearEfficiency = 0.92
+            PowerNetVoltage = vectoInputs.PowerNetVoltage
+            ResultCardIdle = New ResultCard(New List(Of SmartResult))
+            ResultCardOverrun = New ResultCard(New List(Of SmartResult))
+            ResultCardTraction = New ResultCard(New List(Of SmartResult))
+            SmartElectrical = False
+            AlternatorMap = String.Empty
 
+        End Sub
 End Class
 
 End Namespace