Fix case sensitivity in enum parsers (#1045)

* Fix case sensitivity in `PrimeMovers` enum parser * Fix case sensitivity in enum parser
NREL-Sienna · Feb 1, 2024 · 38fdb0f · 38fdb0f
1 parent 9d6e1bf
commit 38fdb0f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 31 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "PowerSystems"
 uuid = "bcd98974-b02a-5e2f-9ee0-a103f5c450dd"
 authors = ["Jose Daniel Lara", "Daniel Thom", "Dheepak Krishnamurthy", "Clayton Barrows", "Sourabh Dalvi"]
-version = "3.2.1"
+version = "3.2.2"
 
 [deps]
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"

diff --git a/src/parsers/common.jl b/src/parsers/common.jl
@@ -4,43 +4,44 @@ const GENERATOR_MAPPING_FILE =
 const PSSE_DYR_MAPPING_FILE =
     joinpath(dirname(pathof(PowerSystems)), "parsers", "psse_dynamic_mapping.yaml")
 
-const STRING2FUEL = Dict((string(x) => x) for x in instances(ThermalFuels))
+const STRING2FUEL =
+    Dict((normalize(string(x); casefold = true) => x) for x in instances(ThermalFuels))
 merge!(
     STRING2FUEL,
     Dict(
-        "NG" => ThermalFuels.NATURAL_GAS,
-        "NUC" => ThermalFuels.NUCLEAR,
-        "GAS" => ThermalFuels.NATURAL_GAS,
-        "OIL" => ThermalFuels.DISTILLATE_FUEL_OIL,
-        "DFO" => ThermalFuels.DISTILLATE_FUEL_OIL,
-        "SYNC_COND" => ThermalFuels.OTHER,
-        "GEOTHERMAL " => ThermalFuels.GEOTHERMAL,
-        "AG_BIPRODUCT" => ThermalFuels.AG_BIPRODUCT,
+        "ng" => ThermalFuels.NATURAL_GAS,
+        "nuc" => ThermalFuels.NUCLEAR,
+        "gas" => ThermalFuels.NATURAL_GAS,
+        "oil" => ThermalFuels.DISTILLATE_FUEL_OIL,
+        "dfo" => ThermalFuels.DISTILLATE_FUEL_OIL,
+        "sync_cond" => ThermalFuels.OTHER,
+        "geothermal " => ThermalFuels.GEOTHERMAL,
+        "ag_biproduct" => ThermalFuels.AG_BIPRODUCT,
     ),
 )
 
-const STRING2PRIMEMOVER = Dict((string(x) => x) for x in instances(PrimeMovers))
+const STRING2PRIMEMOVER =
+    Dict((normalize(string(x); casefold = true) => x) for x in instances(PrimeMovers))
 merge!(
     STRING2PRIMEMOVER,
     Dict(
-        "W2" => PrimeMovers.WT,
-        "WIND" => PrimeMovers.WT,
-        "PV" => PrimeMovers.PVe,
-        "PVe" => PrimeMovers.PVe,
-        "SOLAR" => PrimeMovers.PVe,
-        "RTPV" => PrimeMovers.PVe,
-        "NB" => PrimeMovers.ST,
-        "STEAM" => PrimeMovers.ST,
-        "HYDRO" => PrimeMovers.HY,
-        "ROR" => PrimeMovers.HY,
-        "PUMP" => PrimeMovers.PS,
-        "PUMPED_HYDRO" => PrimeMovers.PS,
-        "NUCLEAR" => PrimeMovers.ST,
-        "SYNC_COND" => PrimeMovers.OT,
-        "CSP" => PrimeMovers.CP,
-        "UN" => PrimeMovers.OT,
-        "STORAGE" => PrimeMovers.BA,
-        "ICE" => PrimeMovers.IC,
+        "w2" => PrimeMovers.WT,
+        "wind" => PrimeMovers.WT,
+        "pv" => PrimeMovers.PVe,
+        "solar" => PrimeMovers.PVe,
+        "rtpv" => PrimeMovers.PVe,
+        "nb" => PrimeMovers.ST,
+        "steam" => PrimeMovers.ST,
+        "hydro" => PrimeMovers.HY,
+        "ror" => PrimeMovers.HY,
+        "pump" => PrimeMovers.PS,
+        "pumped_hydro" => PrimeMovers.PS,
+        "nuclear" => PrimeMovers.ST,
+        "sync_cond" => PrimeMovers.OT,
+        "csp" => PrimeMovers.CP,
+        "un" => PrimeMovers.OT,
+        "storage" => PrimeMovers.BA,
+        "ice" => PrimeMovers.IC,
     ),
 )
 
@@ -201,15 +202,15 @@ function convert_units!(
 end
 
 function parse_enum_mapping(::Type{ThermalFuels}, fuel::AbstractString)
-    return STRING2FUEL[uppercase(fuel)]
+    return STRING2FUEL[normalize(fuel; casefold = true)]
 end
 
 function parse_enum_mapping(::Type{ThermalFuels}, fuel::Symbol)
     return parse_enum_mapping(ThermalFuels, string(fuel))
 end
 
 function parse_enum_mapping(::Type{PrimeMovers}, prime_mover::AbstractString)
-    return STRING2PRIMEMOVER[uppercase(prime_mover)]
+    return STRING2PRIMEMOVER[normalize(prime_mover; casefold = true)]
 end
 
 function parse_enum_mapping(::Type{PrimeMovers}, prime_mover::Symbol)