Renamed GetValueOrDefault --> GetVECTOValueOrDefault due to nameclash with DataExtensions Library

VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs

@@ -240,7 +240,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 				}
 			}
 
-			return mission.BusParameter.ElectricalConsumers.GetValueOrDefault(consumer.ConsumerName, 0);
+			return mission.BusParameter.ElectricalConsumers.GetVECTOValueOrDefault(consumer.ConsumerName, 0);
 		}
 
 		protected virtual Dictionary<string, ElectricConsumerEntry> GetElectricAuxConsumers(Mission mission, IVehicleDeclarationInputData vehicleData, VehicleClass vehicleClass, IBusAuxiliariesDeclarationData busAux)

VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/ElectricalConsumer.cs

@@ -135,7 +135,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
 
 		public Ampere NominalCurrent(MissionType mission)
 		{
-			return _missions.GetValueOrDefault(mission, 0.SI<Ampere>());
+			return _missions.GetVECTOValueOrDefault(mission, 0.SI<Ampere>());
 		}
 
 		public Ampere this[MissionType mission]

VectoCore/VectoCore/Models/Declaration/Fan.cs

@@ -109,7 +109,7 @@ namespace TUGraz.VectoCore.Models.Declaration
 		public override AuxDemandEntry Lookup(MissionType mission, string technology, bool electrical)
 		{
 			var lookup = Tuple.Create(mission, technology, electrical);
-			return Data.GetValueOrDefault(lookup, new AuxDemandEntry { PowerDemand = 0.SI<Watt>() });
+			return Data.GetVECTOValueOrDefault(lookup, new AuxDemandEntry { PowerDemand = 0.SI<Watt>() });
 		}
 		
 		public string[] FullyElectricTechnologies() => Data.Keys.Where(x => x.Item3).Select(x => x.Item2).Distinct().ToArray();

VectoCore/VectoCore/OutputData/XML/AbstractXMLWriter.cs

@@ -89,7 +89,7 @@ namespace TUGraz.IVT.VectoXML.Writer
 						table.Columns.Cast<DataColumn>()
 							.Where(c => mapping.ContainsKey(c.ColumnName))
 							.Select(c => new XAttribute(mapping[c.ColumnName], 
-								row.Field<string>(c).ToDouble().ToXMLFormat(precision?.GetValueOrDefault(c.ColumnName, 2u) ?? 2u)))))
+								row.Field<string>(c).ToDouble().ToXMLFormat(precision?.GetVECTOValueOrDefault(c.ColumnName, 2u) ?? 2u)))))
 				.Cast<object>().ToArray();
 		}
 	}

VectoCore/VectoCore/OutputData/XML/Engineering/Writer/AbstractComponentWriter.cs

@@ -90,7 +90,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
 							table.Columns.Cast<DataColumn>()
 								.Where(c => mapping.ContainsKey(c.ColumnName))
 								.Select(c => new XAttribute(mapping[c.ColumnName], 
-									row.Field<string>(c).ToDouble().ToXMLFormat(precision?.GetValueOrDefault(c.ColumnName, 2u) ?? 2u)))))
+									row.Field<string>(c).ToDouble().ToXMLFormat(precision?.GetVECTOValueOrDefault(c.ColumnName, 2u) ?? 2u)))))
 				.Cast<object>().ToArray();
 		}
 

VectoCore/VectoCore/Utils/DictionaryExtensionMethods.cs

@@ -64,7 +64,8 @@ namespace TUGraz.VectoCore.Utils
 		public static TValue GetVECTOValueOrDefault<TKey, TValue>(this IDictionary<TKey, TValue> self, TKey key) => 
 			self.TryGetValue(key, out var value) ? value : default;
 
-		public static TValue GetValueOrDefault<TKey, TValue>(this IDictionary<TKey, TValue> self, TKey key, TValue defaultValue) =>
+
+		public static TValue GetVECTOValueOrDefault<TKey, TValue>(this IDictionary<TKey, TValue> self, TKey key, TValue defaultValue) =>
 			self.TryGetValue(key, out var value) ? value : defaultValue;
 	}
 }
\ No newline at end of file

VectoCore/VectoCore/Utils/IterationStatistics.cs

@@ -66,7 +66,7 @@ namespace TUGraz.VectoCore.Utils
 		{
 			var t = typeof(T).Name;
 			var c = Current.GetOrAdd(t, _ => new Dictionary<string, double>());
-			c[key] = c.GetValueOrDefault(key, 0) + value ?? 1;
+			c[key] = c.GetVECTOValueOrDefault(key, 0) + value ?? 1;
 		}
 
 		[Conditional("TRACE")]