From 5e7965ce47f54dfb7203781e36d2392c32b86d87 Mon Sep 17 00:00:00 2001 From: "Chakrabarti, Sambuddha (Sam)" Date: Wed, 21 Feb 2024 16:50:03 -0500 Subject: [PATCH] Changed the name of the folder Policies to Policies_Slack, gotten rid of Gurobi optimizer from all Run.jl files --- examples/SmallNewEngland_ThreeZones/CO2_capture/Run.jl | 5 +---- examples/SmallNewEngland_ThreeZones/Electrolyzer/Run.jl | 5 +---- examples/SmallNewEngland_ThreeZones/MultiStage/Run.jl | 5 +---- examples/SmallNewEngland_ThreeZones/PWFuel/Run.jl | 5 +---- examples/SmallNewEngland_ThreeZones/Policies/Run.jl | 6 ------ .../{Policies => Policies_Slack}/Policies/CO2_cap.csv | 0 .../{Policies => Policies_Slack}/Policies/CO2_cap_slack.csv | 0 .../Policies/Capacity_reserve_margin.csv | 0 .../Policies/Capacity_reserve_margin_slack.csv | 0 .../Policies/Energy_share_requirement.csv | 0 .../Policies/Energy_share_requirement_slack.csv | 0 .../Policies/Maximum_capacity_requirement.csv | 0 .../Policies/Minimum_capacity_requirement.csv | 0 .../{Policies => Policies_Slack}/README.md | 0 .../Policy_assignments/Resource_capacity_reserve_margin.csv | 0 .../Resource_energy_share_requirement.csv | 0 .../Resource_maximum_capacity_requirement.csv | 0 .../Resource_minimum_capacity_requirement.csv | 0 .../{Policies => Policies_Slack}/Resources/Storage.csv | 0 .../{Policies => Policies_Slack}/Resources/Thermal.csv | 0 .../{Policies => Policies_Slack}/Resources/Vre.csv | 0 examples/SmallNewEngland_ThreeZones/Policies_Slack/Run.jl | 3 +++ .../{Policies => Policies_Slack}/Settings/clp_settings.yml | 0 .../Settings/cplex_settings.yml | 0 .../{Policies => Policies_Slack}/Settings/genx_settings.yml | 0 .../Settings/gurobi_settings.yml | 0 .../Settings/highs_settings.yml | 0 .../Settings/time_domain_reduction_settings.yml | 0 .../{Policies => Policies_Slack}/System/Demand_data.csv | 0 .../{Policies => Policies_Slack}/System/Fuels_data.csv | 0 .../System/Generators_variability.csv | 0 .../{Policies => Policies_Slack}/System/Network.csv | 0 examples/SmallNewEngland_ThreeZones/SimpleCase/Run.jl | 5 +---- 33 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 examples/SmallNewEngland_ThreeZones/Policies/Run.jl rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Policies/CO2_cap.csv (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Policies/CO2_cap_slack.csv (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Policies/Capacity_reserve_margin.csv (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Policies/Capacity_reserve_margin_slack.csv (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Policies/Energy_share_requirement.csv (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Policies/Energy_share_requirement_slack.csv (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Policies/Maximum_capacity_requirement.csv (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Policies/Minimum_capacity_requirement.csv (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/README.md (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Resources/Policy_assignments/Resource_capacity_reserve_margin.csv (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Resources/Policy_assignments/Resource_energy_share_requirement.csv (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Resources/Policy_assignments/Resource_maximum_capacity_requirement.csv (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Resources/Policy_assignments/Resource_minimum_capacity_requirement.csv (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Resources/Storage.csv (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Resources/Thermal.csv (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Resources/Vre.csv (100%) create mode 100644 examples/SmallNewEngland_ThreeZones/Policies_Slack/Run.jl rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Settings/clp_settings.yml (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Settings/cplex_settings.yml (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Settings/genx_settings.yml (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Settings/gurobi_settings.yml (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Settings/highs_settings.yml (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/Settings/time_domain_reduction_settings.yml (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/System/Demand_data.csv (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/System/Fuels_data.csv (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/System/Generators_variability.csv (100%) rename examples/SmallNewEngland_ThreeZones/{Policies => Policies_Slack}/System/Network.csv (100%) diff --git a/examples/SmallNewEngland_ThreeZones/CO2_capture/Run.jl b/examples/SmallNewEngland_ThreeZones/CO2_capture/Run.jl index 0af68e2ee3..b44ca23ec1 100644 --- a/examples/SmallNewEngland_ThreeZones/CO2_capture/Run.jl +++ b/examples/SmallNewEngland_ThreeZones/CO2_capture/Run.jl @@ -1,6 +1,3 @@ using GenX -using Gurobi -optim = Gurobi.Optimizer - -run_genx_case!(dirname(@__FILE__), optim) +run_genx_case!(dirname(@__FILE__)) diff --git a/examples/SmallNewEngland_ThreeZones/Electrolyzer/Run.jl b/examples/SmallNewEngland_ThreeZones/Electrolyzer/Run.jl index 0af68e2ee3..b44ca23ec1 100644 --- a/examples/SmallNewEngland_ThreeZones/Electrolyzer/Run.jl +++ b/examples/SmallNewEngland_ThreeZones/Electrolyzer/Run.jl @@ -1,6 +1,3 @@ using GenX -using Gurobi -optim = Gurobi.Optimizer - -run_genx_case!(dirname(@__FILE__), optim) +run_genx_case!(dirname(@__FILE__)) diff --git a/examples/SmallNewEngland_ThreeZones/MultiStage/Run.jl b/examples/SmallNewEngland_ThreeZones/MultiStage/Run.jl index 0af68e2ee3..b44ca23ec1 100644 --- a/examples/SmallNewEngland_ThreeZones/MultiStage/Run.jl +++ b/examples/SmallNewEngland_ThreeZones/MultiStage/Run.jl @@ -1,6 +1,3 @@ using GenX -using Gurobi -optim = Gurobi.Optimizer - -run_genx_case!(dirname(@__FILE__), optim) +run_genx_case!(dirname(@__FILE__)) diff --git a/examples/SmallNewEngland_ThreeZones/PWFuel/Run.jl b/examples/SmallNewEngland_ThreeZones/PWFuel/Run.jl index 0af68e2ee3..b44ca23ec1 100644 --- a/examples/SmallNewEngland_ThreeZones/PWFuel/Run.jl +++ b/examples/SmallNewEngland_ThreeZones/PWFuel/Run.jl @@ -1,6 +1,3 @@ using GenX -using Gurobi -optim = Gurobi.Optimizer - -run_genx_case!(dirname(@__FILE__), optim) +run_genx_case!(dirname(@__FILE__)) diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Run.jl b/examples/SmallNewEngland_ThreeZones/Policies/Run.jl deleted file mode 100644 index 0af68e2ee3..0000000000 --- a/examples/SmallNewEngland_ThreeZones/Policies/Run.jl +++ /dev/null @@ -1,6 +0,0 @@ -using GenX -using Gurobi - -optim = Gurobi.Optimizer - -run_genx_case!(dirname(@__FILE__), optim) diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Policies/CO2_cap.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Policies/CO2_cap.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Policies/CO2_cap.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Policies/CO2_cap.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Policies/CO2_cap_slack.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Policies/CO2_cap_slack.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Policies/CO2_cap_slack.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Policies/CO2_cap_slack.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Policies/Capacity_reserve_margin.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Policies/Capacity_reserve_margin.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Policies/Capacity_reserve_margin.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Policies/Capacity_reserve_margin.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Policies/Capacity_reserve_margin_slack.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Policies/Capacity_reserve_margin_slack.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Policies/Capacity_reserve_margin_slack.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Policies/Capacity_reserve_margin_slack.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Policies/Energy_share_requirement.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Policies/Energy_share_requirement.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Policies/Energy_share_requirement.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Policies/Energy_share_requirement.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Policies/Energy_share_requirement_slack.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Policies/Energy_share_requirement_slack.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Policies/Energy_share_requirement_slack.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Policies/Energy_share_requirement_slack.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Policies/Maximum_capacity_requirement.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Policies/Maximum_capacity_requirement.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Policies/Maximum_capacity_requirement.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Policies/Maximum_capacity_requirement.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Policies/Minimum_capacity_requirement.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Policies/Minimum_capacity_requirement.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Policies/Minimum_capacity_requirement.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Policies/Minimum_capacity_requirement.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies/README.md b/examples/SmallNewEngland_ThreeZones/Policies_Slack/README.md similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/README.md rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/README.md diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Resources/Policy_assignments/Resource_capacity_reserve_margin.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Resources/Policy_assignments/Resource_capacity_reserve_margin.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Resources/Policy_assignments/Resource_capacity_reserve_margin.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Resources/Policy_assignments/Resource_capacity_reserve_margin.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Resources/Policy_assignments/Resource_energy_share_requirement.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Resources/Policy_assignments/Resource_energy_share_requirement.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Resources/Policy_assignments/Resource_energy_share_requirement.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Resources/Policy_assignments/Resource_energy_share_requirement.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Resources/Policy_assignments/Resource_maximum_capacity_requirement.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Resources/Policy_assignments/Resource_maximum_capacity_requirement.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Resources/Policy_assignments/Resource_maximum_capacity_requirement.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Resources/Policy_assignments/Resource_maximum_capacity_requirement.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Resources/Policy_assignments/Resource_minimum_capacity_requirement.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Resources/Policy_assignments/Resource_minimum_capacity_requirement.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Resources/Policy_assignments/Resource_minimum_capacity_requirement.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Resources/Policy_assignments/Resource_minimum_capacity_requirement.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Resources/Storage.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Resources/Storage.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Resources/Storage.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Resources/Storage.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Resources/Thermal.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Resources/Thermal.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Resources/Thermal.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Resources/Thermal.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Resources/Vre.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Resources/Vre.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Resources/Vre.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Resources/Vre.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies_Slack/Run.jl b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Run.jl new file mode 100644 index 0000000000..b44ca23ec1 --- /dev/null +++ b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Run.jl @@ -0,0 +1,3 @@ +using GenX + +run_genx_case!(dirname(@__FILE__)) diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Settings/clp_settings.yml b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Settings/clp_settings.yml similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Settings/clp_settings.yml rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Settings/clp_settings.yml diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Settings/cplex_settings.yml b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Settings/cplex_settings.yml similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Settings/cplex_settings.yml rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Settings/cplex_settings.yml diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Settings/genx_settings.yml b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Settings/genx_settings.yml similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Settings/genx_settings.yml rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Settings/genx_settings.yml diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Settings/gurobi_settings.yml b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Settings/gurobi_settings.yml similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Settings/gurobi_settings.yml rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Settings/gurobi_settings.yml diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Settings/highs_settings.yml b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Settings/highs_settings.yml similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Settings/highs_settings.yml rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Settings/highs_settings.yml diff --git a/examples/SmallNewEngland_ThreeZones/Policies/Settings/time_domain_reduction_settings.yml b/examples/SmallNewEngland_ThreeZones/Policies_Slack/Settings/time_domain_reduction_settings.yml similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/Settings/time_domain_reduction_settings.yml rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/Settings/time_domain_reduction_settings.yml diff --git a/examples/SmallNewEngland_ThreeZones/Policies/System/Demand_data.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/System/Demand_data.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/System/Demand_data.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/System/Demand_data.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies/System/Fuels_data.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/System/Fuels_data.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/System/Fuels_data.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/System/Fuels_data.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies/System/Generators_variability.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/System/Generators_variability.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/System/Generators_variability.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/System/Generators_variability.csv diff --git a/examples/SmallNewEngland_ThreeZones/Policies/System/Network.csv b/examples/SmallNewEngland_ThreeZones/Policies_Slack/System/Network.csv similarity index 100% rename from examples/SmallNewEngland_ThreeZones/Policies/System/Network.csv rename to examples/SmallNewEngland_ThreeZones/Policies_Slack/System/Network.csv diff --git a/examples/SmallNewEngland_ThreeZones/SimpleCase/Run.jl b/examples/SmallNewEngland_ThreeZones/SimpleCase/Run.jl index 0af68e2ee3..b44ca23ec1 100644 --- a/examples/SmallNewEngland_ThreeZones/SimpleCase/Run.jl +++ b/examples/SmallNewEngland_ThreeZones/SimpleCase/Run.jl @@ -1,6 +1,3 @@ using GenX -using Gurobi -optim = Gurobi.Optimizer - -run_genx_case!(dirname(@__FILE__), optim) +run_genx_case!(dirname(@__FILE__))