Merge branch 'main' into md_formatter

NREL-Sienna · Sep 27, 2024 · 2c65c3f · 2c65c3f
2 parents f5bc50f + be8eb50
commit 2c65c3f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "InfrastructureSystems"
 uuid = "2cd47ed4-ca9b-11e9-27f2-ab636a7671f1"
 authors = ["Daniel Thom", "Jose Daniel Lara", "Clayton Barrows"]
-version = "2.2.1"
+version = "2.2.2"
 
 [deps]
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"

diff --git a/src/Optimization/Optimization.jl b/src/Optimization/Optimization.jl
@@ -10,6 +10,9 @@ import Dates
 import CSV
 import DataFrames
 
+import ..InfrastructureSystems
+const IS = InfrastructureSystems
+
 import ..InfrastructureSystems:
     @scoped_enum,
     InfrastructureSystemsType,

diff --git a/src/Optimization/optimization_problem_results.jl b/src/Optimization/optimization_problem_results.jl
@@ -178,7 +178,7 @@ end
 function _validate_keys(existing_keys, result_keys)
     diff = setdiff(result_keys, existing_keys)
     if !isempty(diff)
-        throw(IS.InvalidValue("These keys are not stored: $diff"))
+        throw(InvalidValue("These keys are not stored: $diff"))
     end
     return
 end

diff --git a/src/Optimization/optimization_test_utils.jl b/src/Optimization/optimization_test_utils.jl
@@ -69,7 +69,7 @@ function write_optimizer_stats!(
 end
 
 function read_optimizer_stats(store::MockModelStore)
-    stats = [IS.to_namedtuple(x) for x in values(store.optimizer_stats)]
+    stats = [to_namedtuple(x) for x in values(store.optimizer_stats)]
     df = DataFrames.DataFrame(stats)
     DataFrames.insertcols!(df, 1, :DateTime => keys(store.optimizer_stats))
     return df

diff --git a/src/Simulation/Simulation.jl b/src/Simulation/Simulation.jl
@@ -3,6 +3,9 @@
 """
 module Simulation
 
+import ..InfrastructureSystems
+const IS = InfrastructureSystems
+
 import ..InfrastructureSystems:
     @scoped_enum